mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-22 11:17:49 +10:00
Merge branch 'master' into eink-async
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#define LED_PIN 18 // LED
|
||||
#define LED_INVERTED 1
|
||||
|
||||
#define HAS_SCREEN 0
|
||||
#define HAS_SCREEN 1
|
||||
#define HAS_GPS 0
|
||||
#undef GPS_RX_PIN
|
||||
#undef GPS_TX_PIN
|
||||
|
||||
@@ -133,10 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
#define PIN_EINK_SCLK (0 + 3)
|
||||
#define PIN_EINK_MOSI (0 + 30) // also called SDI
|
||||
|
||||
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
|
||||
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
|
||||
// #define PIN_EINK_PWR_ON (-1)
|
||||
|
||||
// #define USE_EINK
|
||||
|
||||
// RAKRGB
|
||||
|
||||
@@ -133,10 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
#define PIN_EINK_SCLK (0 + 3)
|
||||
#define PIN_EINK_MOSI (0 + 30) // also called SDI
|
||||
|
||||
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
|
||||
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
|
||||
// #define PIN_EINK_PWR_ON (-1)
|
||||
|
||||
// #define USE_EINK
|
||||
|
||||
// RAKRGB
|
||||
|
||||
@@ -133,10 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
#define PIN_EINK_SCLK (0 + 3)
|
||||
#define PIN_EINK_MOSI (0 + 30) // also called SDI
|
||||
|
||||
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
|
||||
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
|
||||
// #define PIN_EINK_PWR_ON (-1)
|
||||
|
||||
#define USE_EINK
|
||||
|
||||
// RAKRGB
|
||||
|
||||
@@ -119,10 +119,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
#define PIN_EINK_SCLK (0 + 14) // SCL
|
||||
#define PIN_EINK_MOSI (0 + 13) // SDA
|
||||
|
||||
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
|
||||
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
|
||||
// #define PIN_EINK_PWR_ON (-1)
|
||||
|
||||
// RAKRGB
|
||||
#define HAS_NCP5623
|
||||
|
||||
|
||||
@@ -156,9 +156,9 @@ External serial flash WP25R1635FZUIL0
|
||||
#define PIN_EINK_SCLK (0 + 31)
|
||||
#define PIN_EINK_MOSI (0 + 29) // also called SDI
|
||||
|
||||
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
|
||||
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
|
||||
#define PIN_EINK_PWR_ON (0 + 12)
|
||||
// Controls power for all peripherals (eink + GPS + LoRa + Sensor)
|
||||
#define PIN_POWER_EN (0 + 12)
|
||||
#define PIN_POWER_EN1 (0 + 13)
|
||||
|
||||
#define USE_EINK
|
||||
|
||||
|
||||
Reference in New Issue
Block a user