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

geeksville · Aug 22, 2024 · 02c34e6 · 02c34e6
2 parents 5570b6b + 734f365
commit 02c34e6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/.github/actions/setup-base/action.yml b/.github/actions/setup-base/action.yml
@@ -35,6 +35,7 @@ runs:
         python -m pip install --upgrade pip
         pip install -U --no-build-isolation --no-cache-dir "setuptools<72"
         pip install -U platformio adafruit-nrfutil --no-build-isolation
+        pip install -U poetry --no-build-isolation
         pip install -U meshtastic --pre --no-build-isolation
 
     - name: Upgrade platformio

diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
@@ -315,7 +315,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 
             case SHT31_4x_ADDR:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
-                if (registerValue == 0x11a2 || registerValue == 0x11da) {
+                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
                     type = SHT4X;
                     LOG_INFO("SHT4X sensor found\n");
                 } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
@@ -404,4 +404,4 @@ size_t ScanI2CTwoWire::countDevices() const
 {
     return foundDevices.size();
 }
-#endif
+#endif
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
@@ -65,8 +65,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_WIO_WM1110
 #elif defined(TRACKER_T1000_E)
 #define HW_VENDOR meshtastic_HardwareModel_TRACKER_T1000_E
-#elif defined(ME25LS01)
-#define HW_VENDOR meshtastic_HardwareModel_ME25LS01
+#elif defined(ME25LS01_4Y10TD)
+#define HW_VENDOR meshtastic_HardwareModel_ME25LS01_4Y10TD
 #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #else

diff --git a/variants/ME25LS01-4Y10TD_e-ink/variant.h b/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

diff --git a/variants/esp32-s3-pico/platformio.ini b/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
diff --git a/variants/wio-e5/variant.h b/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