Merge branch 'master' into esp-idf5

src/platform/nrf52/architecture.h

@@ -54,7 +54,7 @@
 #elif defined(TTGO_T_ECHO)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(ELECROW_ThinkNode_M1)
-#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN // HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
+#define HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)
@@ -133,4 +133,4 @@
 #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
 // No serial ports on this board - ONLY use segger in memory console
 #define USE_SEGGER
-#endif
+#endif

variants/seeed-sensecap-indicator/platformio.ini

@@ -25,7 +25,9 @@ build_flags = ${esp32_base.build_flags}
   -DUSE_ARDUINO_HAL_GPIO
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX#4c76238c1344162a234ae917b27651af146d6fb2
+  ; https://github.com/mverch67/LovyanGFX#4c76238c1344162a234ae917b27651af146d6fb2
+  ; TODO Check 1.2.0 has the fix
+  https://github.com/lovyan03/LovyanGFX@1.2.0
   earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1
 

variants/seeed-sensecap-indicator/variant.h

@@ -4,7 +4,7 @@
 // This board has a serial coprocessor for sensor readings
 #define SENSOR_RP2040_TXD 19
 #define SENSOR_RP2040_RXD 20
-#define SENSOR_PORT_NUM 2
+#define SENSOR_PORT_NUM UART_NUM_2
 #define SENSOR_BAUD_RATE 115200
 
 #if !HAS_TFT