Merge branch 'master' into picomputer-s3

variants/heltec_wireless_tracker/platformio.ini

@@ -8,4 +8,4 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  lovyan03/LovyanGFX@^1.1.7
+  lovyan03/LovyanGFX@^1.1.8

variants/heltec_wireless_tracker/variant.h

@@ -21,6 +21,7 @@
 #define TFT_OFFSET_Y 0
 #define VTFT_CTRL 46                  // Heltec Tracker needs this pulled low for TFT
 #define SCREEN_TRANSITION_FRAMERATE 1 // fps
+#define DISPLAY_FORCE_SMALL_FONTS
 
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0

variants/m5stack_core/platformio.ini

@@ -2,8 +2,6 @@
 extends = esp32_base
 board = m5stack-core-esp32
 board_level = extra
-upload_port = COM8
-monitor_port = COM8
 monitor_filters = esp32_exception_decoder
 build_src_filter = 
   ${esp32_base.build_src_filter}
@@ -28,4 +26,4 @@ lib_ignore =
   m5stack-core
 lib_deps = 
   ${esp32_base.lib_deps}
-  bodmer/TFT_eSPI@^2.4.76
+  lovyan03/LovyanGFX@^1.1.8

variants/m5stack_core/variant.h

@@ -34,8 +34,13 @@
 #define GPS_RX_PIN 16
 #define GPS_TX_PIN 17
 
-// Define if screen should be mirrored left to right
-#define SCREEN_ROTATE
+#define TFT_HEIGHT 240
+#define TFT_WIDTH 320
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define TFT_BUSY -1
 
 // LCD screens are slow, so slowdown the wipe so it looks better
 #define SCREEN_TRANSITION_FRAMERATE 1 // fps
+
+#define ILI9341_SPI_HOST VSPI_HOST // VSPI_HOST or HSPI_HOST

variants/m5stack_coreink/variant.h

@@ -39,7 +39,9 @@
 #undef RF95_MOSI
 #undef RF95_NSS
 #define USE_RF95
+//#define USE_SX1280
 
+#ifdef USE_RF95
 #define RF95_SCK 18
 #define RF95_MISO 34
 #define RF95_MOSI 23
@@ -48,6 +50,22 @@
 #define LORA_RESET 26
 #define LORA_DIO1 RADIOLIB_NC
 #define LORA_DIO2 RADIOLIB_NC
+#endif
+
+#ifdef USE_SX1280
+#define RF95_SCK 18
+#define RF95_MISO 34
+#define RF95_MOSI 23
+#define RF95_NSS 14
+#define LORA_RESET 26
+#define LORA_DIO1 25
+#define LORA_DIO2 13
+#define SX128X_CS RF95_NSS
+#define SX128X_DIO1 LORA_DIO1
+#define SX128X_BUSY LORA_DIO2
+#define SX128X_RESET LORA_RESET
+#define SX128X_MAX_POWER 13 // 10
+#endif
 
 #define USE_EINK
 // https://docs.m5stack.com/en/core/coreink
@@ -59,3 +77,18 @@
 #define PIN_EINK_RES -1  // Connected but not needed
 #define PIN_EINK_SCLK 18 // EPD_SCLK
 #define PIN_EINK_MOSI 23 // EPD_MOSI
+
+#define BATTERY_PIN 35
+#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+// https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/m5paper/M5_PAPER_SCH.pdf
+// https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
+//  VBAT
+//   |
+//  R83 (3K)
+//   +
+//  R86 (11K)
+//   |
+//  GND
+// https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
+#define ADC_MULTIPLIER 5 // Just a guess for now... more detailed getBatVoltage above
+// https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/

variants/nano-g2-ultra/platformio.ini

@@ -4,10 +4,6 @@ extends = nrf52840_base
 board = nano-g2-ultra
 debug_tool = jlink
 
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
-# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>

variants/nano-g2-ultra/variant.h

@@ -114,9 +114,8 @@ External serial flash W25Q16JV_IQ
 #define SX126X_CS (32 + 13) // FIXME - we really should define LORA_CS instead
 #define SX126X_DIO1 (32 + 10)
 // Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
-//#define SX1262_DIO3 \
-    (0 + 21) // This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the main
-// CPU?
+//#define SX1262_DIO3 (0 + 21)
+// This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the main CPU?
 #define SX126X_BUSY (32 + 11)
 #define SX126X_RESET (32 + 15)
 #define SX126X_E22 //  DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3

variants/t-deck/platformio.ini

@@ -11,4 +11,4 @@ build_flags = ${esp32_base.build_flags}
   -Ivariants/t-deck
 
 lib_deps = ${esp32s3_base.lib_deps}
-	lovyan03/LovyanGFX@^1.1.7
+	lovyan03/LovyanGFX@^1.1.8

variants/t-echo/platformio.ini

@@ -4,9 +4,6 @@ extends = nrf52840_base
 board = t-echo
 debug_tool = jlink
 
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
-# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"

variants/t-watch-s3/platformio.ini

@@ -12,6 +12,6 @@ build_flags = ${esp32_base.build_flags}
   -DPCF8563_RTC=0x51
 
 lib_deps = ${esp32s3_base.lib_deps}
-	lovyan03/LovyanGFX@^1.1.7
+	lovyan03/LovyanGFX@^1.1.8
   lewisxhe/PCF8563_Library@1.0.1
   adafruit/Adafruit DRV2605 Library@^1.2.2