Merge remote-tracking branch 'root/master' into pr-fix4154

variants/ME25LS01-4Y10TD_e-ink/variant.h

@@ -110,8 +110,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_BUSY (0 + 19) // EPD_BUSY
 #define PIN_EINK_DC (0 + 24)   // EPD_D/C
 #define PIN_EINK_RES (0 + 23)  // EPD_RESET
-#define PIN_EINK_SCLK (0 + 9)  // EPD_SCLK
-#define PIN_EINK_MOSI (0 + 10) // EPD_MOSI
+#define PIN_EINK_SCLK PIN_SPI1_SCK
+#define PIN_EINK_MOSI PIN_SPI1_MOSI
 
 // supported modules list
 #define USE_LR1110

variants/esp32-s3-pico/platformio.ini

@@ -11,7 +11,7 @@ board_upload.require_upload_port = yes
 
 ;upload_port = /dev/ttyACM0
 
-build_flags = ${esp32_base.build_flags}
+build_flags = ${esp32s3_base.build_flags}
   -DESP32_S3_PICO
   ;-DPRIVATE_HW
   -Ivariants/esp32-s3-pico
@@ -22,4 +22,4 @@ build_flags = ${esp32_base.build_flags}
 
 lib_deps = ${esp32s3_base.lib_deps}
   zinggjm/GxEPD2@^1.5.3
-  adafruit/Adafruit NeoPixel @ ^1.12.0
+  adafruit/Adafruit NeoPixel @ ^1.12.0

variants/wio-e5/variant.h

@@ -15,4 +15,7 @@ Do not expect a working Meshtastic device with this target.
 #define USE_STM32WLx
 #define MAX_NUM_NODES 10
 
-#endif
+#define LED_PIN PB5
+#define LED_STATE_ON 1
+
+#endif