Cleanup, set Pinetime as default
This commit is contained in:
parent
b7aa04e1f5
commit
b3e6da7514
3 changed files with 18 additions and 42 deletions
|
@ -1,4 +1,5 @@
|
||||||
#include "BatteryController.h"
|
#include "BatteryController.h"
|
||||||
|
#include "drivers/PinMap.h"
|
||||||
#include <hal/nrf_gpio.h>
|
#include <hal/nrf_gpio.h>
|
||||||
#include <nrfx_saadc.h>
|
#include <nrfx_saadc.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include <drivers/include/nrfx_saadc.h>
|
#include <drivers/include/nrfx_saadc.h>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <drivers/PinMap.h>
|
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Controllers {
|
namespace Controllers {
|
||||||
|
|
|
@ -2,61 +2,37 @@
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace PinMap {
|
namespace PinMap {
|
||||||
#define WATCH_P8
|
|
||||||
#ifdef WATCH_P8
|
#ifdef WATCH_P8
|
||||||
|
// COLMI P8
|
||||||
static constexpr uint8_t Charging = 19;
|
static constexpr uint8_t Charging = 19;
|
||||||
static constexpr uint8_t Cst816sReset = 13;
|
static constexpr uint8_t Cst816sReset = 13;
|
||||||
static constexpr uint8_t Button = 17;
|
static constexpr uint8_t Button = 17;
|
||||||
#else
|
#else
|
||||||
|
// Pinetime
|
||||||
static constexpr uint8_t Charging = 12;
|
static constexpr uint8_t Charging = 12;
|
||||||
static constexpr uint8_t Cst816sReset = 10;
|
static constexpr uint8_t Cst816sReset = 10;
|
||||||
static constexpr uint8_t Button = 13;
|
static constexpr uint8_t Button = 13;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static constexpr uint8_t Cst816sIrq = 28;
|
static constexpr uint8_t Cst816sIrq = 28;
|
||||||
static constexpr uint8_t PowerPresent = 19;
|
static constexpr uint8_t PowerPresent = 19;
|
||||||
|
|
||||||
static constexpr uint8_t Motor = 16;
|
static constexpr uint8_t Motor = 16;
|
||||||
|
|
||||||
static constexpr uint8_t LcdBacklight1 = 14;
|
static constexpr uint8_t LcdBacklight1 = 14;
|
||||||
static constexpr uint8_t LcdBacklight2 = 22;
|
static constexpr uint8_t LcdBacklight2 = 22;
|
||||||
static constexpr uint8_t LcdBacklight3 = 23;
|
static constexpr uint8_t LcdBacklight3 = 23;
|
||||||
|
|
||||||
static constexpr uint8_t SpiSck = 2;
|
static constexpr uint8_t SpiSck = 2;
|
||||||
static constexpr uint8_t SpiMosi = 3;
|
static constexpr uint8_t SpiMosi = 3;
|
||||||
static constexpr uint8_t SpiMiso = 4;
|
static constexpr uint8_t SpiMiso = 4;
|
||||||
|
|
||||||
static constexpr uint8_t SpiFlashCsn = 5;
|
static constexpr uint8_t SpiFlashCsn = 5;
|
||||||
static constexpr uint8_t SpiLcdCsn = 25;
|
static constexpr uint8_t SpiLcdCsn = 25;
|
||||||
static constexpr uint8_t LcdDataCommand = 18;
|
static constexpr uint8_t LcdDataCommand = 18;
|
||||||
|
|
||||||
static constexpr uint8_t TwiScl = 7;
|
|
||||||
static constexpr uint8_t TwiSda = 6;
|
|
||||||
|
|
||||||
|
static constexpr uint8_t TwiScl = 7;
|
||||||
|
static constexpr uint8_t TwiSda = 6;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef WATCH_P8
|
|
||||||
|
|
||||||
// BatteryController.h
|
|
||||||
#define PINMAP_CHARGING_PIN 19
|
|
||||||
|
|
||||||
// Cst816s.h
|
|
||||||
#define PINMAP_CST816S_RESET_PIN 13
|
|
||||||
|
|
||||||
// SystemTask.h
|
|
||||||
#define PINMAP_BUTTON_PIN 17
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// BatteryController.h
|
|
||||||
#define PINMAP_CHARGING_PIN 12
|
|
||||||
|
|
||||||
// Cst816s.h
|
|
||||||
#define PINMAP_CST816S_RESET_PIN 10
|
|
||||||
|
|
||||||
// SystemTask.h
|
|
||||||
#define PINMAP_BUTTON_PIN 13
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Reference in a new issue