From d556ae762c208cc0e30cc410b6ed761bf439949c Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Wed, 21 Aug 2024 13:04:03 +0200 Subject: [PATCH 1/4] Update ScanI2CTwoWire.cpp (#4520) --- src/detect/ScanI2CTwoWire.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp index b831b0e71..1183d0ddc 100644 --- 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 \ No newline at end of file +#endif From 6ddee795d6c8742e317759ce330a8a91bd37b8ff Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 21 Aug 2024 17:24:56 -0500 Subject: [PATCH 2/4] Poetry --- .github/actions/setup-base/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-base/action.yml b/.github/actions/setup-base/action.yml index 61466655d..929c1df38 100644 --- 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 From 1e655052fc66be1876d2d4e87b5a99da407f08e6 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 22 Aug 2024 14:00:19 +0200 Subject: [PATCH 3/4] Fixes for ME25LS01_4Y10TD and ESP32-PICO (#4522) * Update platformio.ini * Update variant.h * Update architecture.h * Update variant.h --- src/platform/nrf52/architecture.h | 4 ++-- variants/ME25LS01-4Y10TD_e-ink/variant.h | 4 ++-- variants/esp32-s3-pico/platformio.ini | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h index 895525f5a..834ff6f0c 100644 --- 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 index 9006d5a63..60996d468 100644 --- 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 index ff77c30e0..916f623bd 100644 --- 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 \ No newline at end of file + adafruit/Adafruit NeoPixel @ ^1.12.0 From 734f36589dd54f60e9a07e3dbbb368716642235d Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 22 Aug 2024 17:44:49 +0200 Subject: [PATCH 4/4] Update variant.h (#4534) --- variants/wio-e5/variant.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/variants/wio-e5/variant.h b/variants/wio-e5/variant.h index b4345a530..ac92915bb 100644 --- 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 \ No newline at end of file +#define LED_PIN PB5 +#define LED_STATE_ON 1 + +#endif