feat: Support Elecrow ThinkNode M9

platformio.ini

@@ -137,7 +137,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/e1de01e0b3c4a6b149c00e95d59cfb0cca7ad49e.zip
+	https://github.com/meshtastic/device-ui/archive/adfbd3811a53b6aed0649c8d8f078118c042a407.zip
 custom_sdkconfig =
 	# CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC is not set
 	CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y

src/PowerFSM.cpp

@@ -173,23 +173,25 @@ static void lsIdle()
                 powerFSM.trigger(EVENT_SERIAL_CONNECTED);
                 break;
 
-            default:
-                // We woke for some other reason (button press, device IRQ interrupt)
-
-#ifdef BUTTON_PIN
-                bool pressed = !digitalRead(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN);
-#else
+            case ESP_SLEEP_WAKEUP_GPIO: {
                 bool pressed = false;
+#if defined(BUTTON_PIN)
+                pressed = !digitalRead(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN);
+#elif defined(KB_INT)
+                // keyboard press (probably) triggered GPIO interrupt
+                pressed = true;
 #endif
-                if (pressed) { // If we woke because of press, instead generate a PRESS event.
+                if (pressed) {
                     powerFSM.trigger(EVENT_PRESS);
-                } else {
-                    // Otherwise let the NB state handle the IRQ (and that state will handle stuff like IRQs etc)
-                    // we lie and say "wake timer" because the interrupt will be handled by the regular IRQ code
-                    powerFSM.trigger(EVENT_WAKE_TIMER);
                 }
                 break;
             }
+            default:
+                // Otherwise let the NB state handle the IRQ (and that state will handle stuff like IRQs etc)
+                // we lie and say "wake timer" because the interrupt will be handled by the regular IRQ code
+                powerFSM.trigger(EVENT_WAKE_TIMER);
+                break;
+            }
         } else {
             // Someone says we can't sleep now, so just save some power by sleeping the CPU for 100ms or so
             delay(100);

src/concurrency/Lock.cpp

@@ -26,6 +26,11 @@ void Lock::lock()
     }
 }
 
+bool Lock::lock(uint32_t timeout)
+{
+    return xSemaphoreTake(handle, pdMS_TO_TICKS(timeout)) == pdTRUE;
+}
+
 void Lock::unlock()
 {
     if (xSemaphoreGive(handle) == false) {
@@ -39,6 +44,11 @@ Lock::~Lock() {}
 
 void Lock::lock() {}
 
+bool Lock::lock(uint32_t)
+{
+    return true;
+}
+
 void Lock::unlock() {}
 #endif
 

src/concurrency/Lock.h

@@ -22,6 +22,11 @@ class Lock
     // Must not be called from an ISR.
     void lock();
 
+    /// Locks the lock with timeout.
+    //
+    // Must not be called from an ISR.
+    bool lock(uint32_t timeout);
+
     // Unlocks the lock.
     //
     // Must not be called from an ISR.

src/configuration.h

@@ -253,6 +253,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BBQ10_KB_ADDR 0x1F
 #define MPR121_KB_ADDR 0x5A
 #define TCA8418_KB_ADDR 0x34
+#define TSTC8_KB_ADDR 0x6C // STC8H companion-MCU keypad on the ThinkNode-M9
 
 // -----------------------------------------------------------------------------
 // SENSOR
@@ -270,6 +271,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QMC5883L_ADDR 0x0D
 #define HMC5883L_ADDR 0x1E
 #define MMC5983MA_ADDR 0x30
+#define QMC6309_ADDR 0x7C
 #define SHTC3_ADDR 0x70
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D

src/detect/ScanI2C.cpp

@@ -31,21 +31,21 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
-    return firstOfOrNONE(6, types);
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB, STC8HKB};
+    return firstOfOrNONE(7, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 {
-    ScanI2C::DeviceType types[] = {MPU6050,  LIS3DH, SC7A20, BMA423,    LSM6DS3,    BMX160,  STK8BAXX,
-                                   ICM20948, BMM150, BMI270, ICM42607P, ISM330DHCX, QMA6100P};
-    return firstOfOrNONE(13, types);
+    ScanI2C::DeviceType types[] = {MPU6050,  LIS3DH, SC7A20, BMA423,    LSM6DS3,    BMX160,   STK8BAXX,
+                                   ICM20948, BMM150, BMI270, ICM42607P, ISM330DHCX, QMA6100P, QMI8658};
+    return firstOfOrNONE(14, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstMagnetometer() const
 {
-    ScanI2C::DeviceType types[] = {MMC5983MA, IIS2MDCTR};
-    return firstOfOrNONE(2, types);
+    ScanI2C::DeviceType types[] = {MMC5983MA, IIS2MDCTR, QMC6309};
+    return firstOfOrNONE(3, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAQI() const

src/detect/ScanI2C.h

@@ -42,6 +42,7 @@ class ScanI2C
         QMC5883L,
         HMC5883L,
         MMC5983MA,
+        QMC6309,
         PMSA003I,
         QMA6100P,
         MPU6050,
@@ -105,6 +106,7 @@ class ScanI2C
         IIS2MDCTR,
         ISM330DHCX,
         SPA06,
+        STC8HKB, // STC8H companion-MCU keypad (ThinkNode-M9)
         DS248X,
         HM330X
     } DeviceType;

src/detect/ScanI2CTwoWire.cpp

@@ -444,6 +444,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 type = BBQ10KB;
                 logFoundDevice("BB Q10", (uint8_t)addr.address);
                 break;
+                SCAN_SIMPLE_CASE(TSTC8_KB_ADDR, STC8HKB, "STC8H KB", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "ST7567", (uint8_t)addr.address);
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
@@ -1093,6 +1094,20 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
             foundDevices[addr] = type;
         }
     }
+
+    // The QMC6309 magnetometer sits at 0x7C, above the general scan ceiling (the loop above stops at 0x77 to
+    // avoid the reserved 0x78-0x7F block). Probe it explicitly. Gated on the SensorLib driver being present so
+    // only boards that can actually drive the chip poke this reserved address.
+#if __has_include(<SensorQMC6309.hpp>)
+    addr.address = QMC6309_ADDR;
+    i2cBus->beginTransmission(addr.address);
+    if (i2cBus->endTransmission() == 0 &&
+        getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1) == 0x90 /* QMC6309 chip id */) {
+        deviceAddresses[QMC6309] = addr;
+        foundDevices[addr] = QMC6309;
+        logFoundDevice("QMC6309", (uint8_t)addr.address);
+    }
+#endif
 }
 
 void ScanI2CTwoWire::scanPort(I2CPort port)

src/gps/GPS.cpp

@@ -1686,7 +1686,7 @@ GnssModel_t GPS::probe(int serialSpeed)
             {"AG3335", "$PAIR021,AG3335", GNSS_MODEL_AG3335},
             {"AG3352", "$PAIR021,AG3352", GNSS_MODEL_AG3352},
             {"RYS3520", "$PAIR021,REYAX_RYS3520_V2", GNSS_MODEL_AG3352},
-            {"UC6580", "UC6580", GNSS_MODEL_UC6580},
+            {"UC6580", "UC6580", GNSS_MODEL_UC6580}
             // as L76K is sort of a last ditch effort, we won't attempt to detect it by startup messages for now.
             /*{"L76K", "SW=URANUS", GNSS_MODEL_MTK}*/};
         GnssModel_t detectedDriver = getProbeResponse(500, passive_detect, serialSpeed);
@@ -1713,8 +1713,10 @@ GnssModel_t GPS::probe(int serialSpeed)
     case 1: {
 
         // Unicore UFirebirdII Series: UC6580, UM620, UM621, UM670A, UM680A, or UM681A,or CM121
-        std::vector<ChipInfo> unicore = {
-            {"UC6580", "UC6580", GNSS_MODEL_UC6580}, {"UM600", "UM600", GNSS_MODEL_UC6580}, {"CM121", "CM121", GNSS_MODEL_CM121}};
+        std::vector<ChipInfo> unicore = {{"UC6580", "UC6580", GNSS_MODEL_UC6580},
+                                         {"UM600", "UM600", GNSS_MODEL_UC6580},
+                                         {"CM121", "CM121", GNSS_MODEL_CM121},
+                                         {"CC1167Q", "CC1167Q", GNSS_MODEL_CM121}};
         PROBE_FAMILY("Unicore Family", "$PDTINFO", unicore, 500);
         currentDelay = 20;
         currentStep = 2;

src/graphics/draw/UIRenderer.cpp

@@ -23,6 +23,9 @@
 #include "graphics/images.h"
 #include "main.h"
 #include "target_specific.h"
+#ifdef COMPASS_SENSOR_DEBUG
+#include "motion/MotionSensor.h"
+#endif
 #include <OLEDDisplay.h>
 #include <cstring>
 #include <gps/RTC.h>
@@ -1776,6 +1779,26 @@ void UIRenderer::drawCompassAndLocationScreen(OLEDDisplay *display, OLEDDisplayU
     const int *textPos = getTextPositions(display);
     const bool compactPanel = graphics::isCompactPanel(display);
 
+#ifdef COMPASS_SENSOR_DEBUG
+    // Optional raw IMU accel + magnetometer x/y/z readout for on-device axis/sign tuning.
+    {
+        char dbg[40];
+        float sx = 0, sy = 0, sz = 0;
+        uint32_t age = 0;
+        if (MotionSensor::getLatestCompassAccelSample(sx, sy, sz, age))
+            snprintf(dbg, sizeof(dbg), "A %.2f %.2f %.2f", sx, sy, sz);
+        else
+            snprintf(dbg, sizeof(dbg), "A ---");
+        display->drawString(x, textPos[line++], dbg);
+
+        if (MotionSensor::getLatestCompassMagSample(sx, sy, sz, age))
+            snprintf(dbg, sizeof(dbg), "M %.2f %.2f %.2f", sx, sy, sz);
+        else
+            snprintf(dbg, sizeof(dbg), "M ---");
+        display->drawString(x, textPos[line++], dbg);
+    }
+#endif
+
     // === First Row: My Location ===
 #if HAS_GPS
     bool origBold = config.display.heading_bold;

src/graphics/tftSetup.cpp

@@ -235,10 +235,8 @@ DeviceScreen *deviceScreen = nullptr;
 
 #ifdef ARCH_ESP32
 // Get notified when the system is entering light sleep
-CallbackObserver<DeviceScreen, void *> tftSleepObserver =
-    CallbackObserver<DeviceScreen, void *>(deviceScreen, &DeviceScreen::prepareSleep);
-CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t> endSleepObserver =
-    CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t>(deviceScreen, &DeviceScreen::wakeUp);
+static CallbackObserver<DeviceScreen, void *> *tftSleepObserver = nullptr;
+static CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t> *endSleepObserver = nullptr;
 #endif
 
 /**
@@ -277,6 +275,19 @@ class ReentrantSpiLock : public ISpiLock
         depth = 1;
     }
 
+    bool lock(uint32_t timeout) override
+    {
+        ThreadId self = currentThread();
+        if (depth && owner == self) {
+            depth++;
+            return true;
+        }
+        bool result = spiLock->lock(timeout);
+        owner = self;
+        depth = 1;
+        return result;
+    }
+
     void unlock(void) override
     {
         if (--depth == 0) {
@@ -413,8 +424,14 @@ void tftSetup(void)
 
     if (deviceScreen) {
 #ifdef ARCH_ESP32
-        tftSleepObserver.observe(&notifyLightSleep);
-        endSleepObserver.observe(&notifyLightSleepEnd);
+        if (!tftSleepObserver) {
+            tftSleepObserver = new CallbackObserver<DeviceScreen, void *>(deviceScreen, &DeviceScreen::prepareSleep);
+        }
+        if (!endSleepObserver) {
+            endSleepObserver = new CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t>(deviceScreen, &DeviceScreen::wakeUp);
+        }
+        tftSleepObserver->observe(&notifyLightSleep);
+        endSleepObserver->observe(&notifyLightSleepEnd);
         xTaskCreatePinnedToCore(tft_task_handler, "tft", TFT_TASK_STACK_SIZE, NULL, 1, NULL, 0);
 #elif defined(ARCH_PORTDUINO)
         std::thread *tft_task = new std::thread([] { tft_task_handler(); });