mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-07 02:18:09 +00:00
Merge remote-tracking branch 'remotes/origin/master' into develop
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
#define LED_PIN LED
|
||||
|
||||
#define HAS_GPS 0
|
||||
|
||||
#define RESET_OLED RST_OLED
|
||||
#define I2C_SDA SDA_OLED // I2C pins for this board
|
||||
#define I2C_SCL SCL_OLED
|
||||
@@ -29,4 +27,4 @@
|
||||
#define SX126X_DIO1 LORA_DIO1
|
||||
#define SX126X_BUSY LORA_DIO2
|
||||
#define SX126X_RESET LORA_RESET
|
||||
#define SX126X_E22
|
||||
#define SX126X_E22
|
||||
|
||||
@@ -127,7 +127,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
* eink display pins
|
||||
*/
|
||||
|
||||
#define PIN_EINK_EN (0 + 2) // (0 + 2) Note: this is really just backlight power
|
||||
#define PIN_EINK_EN (32 + 2) // (0 + 2) Note: this is really just backlight power
|
||||
#define PIN_EINK_CS (0 + 26)
|
||||
#define PIN_EINK_BUSY (0 + 4)
|
||||
#define PIN_EINK_DC (0 + 17)
|
||||
|
||||
@@ -127,7 +127,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
|
||||
* eink display pins
|
||||
*/
|
||||
|
||||
#define PIN_EINK_EN (0 + 2) // (0 + 2) Note: this is really just backlight power
|
||||
#define PIN_EINK_EN (32 + 2) // (0 + 2) Note: this is really just backlight power
|
||||
#define PIN_EINK_CS (0 + 26)
|
||||
#define PIN_EINK_BUSY (0 + 4)
|
||||
#define PIN_EINK_DC (0 + 17)
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
[env:tlora-v2-1-1.8]
|
||||
extends = esp32_base
|
||||
board = ttgo-lora32-v21
|
||||
lib_deps =
|
||||
${esp32_base.lib_deps}
|
||||
caveman99/ESP32 Codec2@^1.0.1
|
||||
|
||||
; the RADIOLIB_GODMODE flag can be removed once the next version of RadioLib is released. (>5.5.0)
|
||||
|
||||
build_flags =
|
||||
${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18 -D RADIOLIB_GODMODE
|
||||
Reference in New Issue
Block a user