Fix #8899 [Bug]: [TloraPager] RotaryEncoder crash (#8933)

* Fix #8899 [Bug]: [TloraPager] RotaryEncoder crash

* Apply Copilot review

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

.github/actions/build-variant/action.yml

@@ -76,7 +76,7 @@ runs:
         done
 
     - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.platformio/.cache
         key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}

.trunk/trunk.yaml

@@ -9,16 +9,16 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.495
-    - renovate@42.42.2
+    - renovate@42.44.0
     - prettier@3.7.4
-    - trufflehog@3.92.1
+    - trufflehog@3.92.2
     - yamllint@1.37.1
     - bandit@1.9.2
     - trivy@0.68.1
     - taplo@0.10.0
     - ruff@0.14.8
     - isort@7.0.0
-    - markdownlint@0.46.0
+    - markdownlint@0.47.0
     - oxipng@10.0.0
     - svgo@4.0.0
     - actionlint@1.7.9

platformio.ini

@@ -123,7 +123,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/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip
+	https://github.com/meshtastic/device-ui/archive/2746a1ce3804998460a2cb319b8ea8a238dfd8c9.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/input/InputBroker.h

@@ -53,6 +53,7 @@ typedef struct _InputEvent {
 class InputPollable
 {
   public:
+    virtual ~InputPollable() = default;
     virtual void pollOnce() = 0;
 };
 

src/input/RotaryEncoderImpl.cpp

@@ -3,6 +3,9 @@
 #include "RotaryEncoderImpl.h"
 #include "InputBroker.h"
 #include "RotaryEncoder.h"
+#ifdef ARCH_ESP32
+#include "sleep.h"
+#endif
 
 #define ORIGIN_NAME "RotaryEncoder"
 
@@ -11,6 +14,20 @@ RotaryEncoderImpl *rotaryEncoderImpl;
 RotaryEncoderImpl::RotaryEncoderImpl()
 {
     rotary = nullptr;
+#ifdef ARCH_ESP32
+    isFirstInit = true;
+#endif
+}
+
+RotaryEncoderImpl::~RotaryEncoderImpl()
+{
+    LOG_DEBUG("RotaryEncoderImpl destructor");
+    detachRotaryEncoderInterrupts();
+
+    if (rotary != nullptr) {
+        delete rotary;
+        rotary = nullptr;
+    }
 }
 
 bool RotaryEncoderImpl::init()
@@ -25,15 +42,22 @@ bool RotaryEncoderImpl::init()
     eventCcw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_ccw);
     eventPressed = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_press);
 
-    rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
-                               moduleConfig.canned_message.inputbroker_pin_press);
-    rotary->resetButton();
+    if (rotary == nullptr) {
+        rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
+                                   moduleConfig.canned_message.inputbroker_pin_press);
+    }
 
-    interruptInstance = this;
-    auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
-    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
-    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
-    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
+    attachRotaryEncoderInterrupts();
+
+#ifdef ARCH_ESP32
+    // Register callbacks for before and after lightsleep
+    // Used to detach and reattach interrupts
+    if (isFirstInit) {
+        lsObserver.observe(&notifyLightSleep);
+        lsEndObserver.observe(&notifyLightSleepEnd);
+        isFirstInit = false;
+    }
+#endif
 
     LOG_INFO("RotaryEncoder initialized pins(%d, %d, %d), events(%d, %d, %d)", moduleConfig.canned_message.inputbroker_pin_a,
              moduleConfig.canned_message.inputbroker_pin_b, moduleConfig.canned_message.inputbroker_pin_press, eventCw, eventCcw,
@@ -71,6 +95,50 @@ void RotaryEncoderImpl::pollOnce()
     }
 }
 
+void RotaryEncoderImpl::detachRotaryEncoderInterrupts()
+{
+    LOG_DEBUG("RotaryEncoderImpl detach button interrupts");
+    if (interruptInstance == this) {
+        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_a);
+        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_b);
+        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_press);
+        interruptInstance = nullptr;
+    } else {
+        LOG_WARN("RotaryEncoderImpl: interrupts already detached");
+    }
+}
+
+void RotaryEncoderImpl::attachRotaryEncoderInterrupts()
+{
+    LOG_DEBUG("RotaryEncoderImpl attach button interrupts");
+    if (rotary != nullptr && interruptInstance == nullptr) {
+        rotary->resetButton();
+
+        interruptInstance = this;
+        auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
+        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
+        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
+        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
+    } else {
+        LOG_WARN("RotaryEncoderImpl: interrupts already attached");
+    }
+}
+
+#ifdef ARCH_ESP32
+
+int RotaryEncoderImpl::beforeLightSleep(void *unused)
+{
+    detachRotaryEncoderInterrupts();
+    return 0; // Indicates success;
+}
+
+int RotaryEncoderImpl::afterLightSleep(esp_sleep_wakeup_cause_t cause)
+{
+    attachRotaryEncoderInterrupts();
+    return 0; // Indicates success;
+}
+#endif
+
 RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;
 
 #endif

src/input/RotaryEncoderImpl.h

@@ -8,12 +8,18 @@
 
 class RotaryEncoder;
 
-class RotaryEncoderImpl : public InputPollable
+class RotaryEncoderImpl final : public InputPollable
 {
   public:
     RotaryEncoderImpl();
-    bool init(void);
+    ~RotaryEncoderImpl() override;
+    bool init();
     virtual void pollOnce() override;
+    // Disconnect and reconnect interrupts for light sleep
+#ifdef ARCH_ESP32
+    int beforeLightSleep(void *unused);
+    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
+#endif
 
   protected:
     static RotaryEncoderImpl *interruptInstance;
@@ -23,6 +29,21 @@ class RotaryEncoderImpl : public InputPollable
     input_broker_event eventPressed = INPUT_BROKER_NONE;
 
     RotaryEncoder *rotary;
+
+  private:
+#ifdef ARCH_ESP32
+    bool isFirstInit;
+#endif
+    void detachRotaryEncoderInterrupts();
+    void attachRotaryEncoderInterrupts();
+
+#ifdef ARCH_ESP32
+    // Get notified when lightsleep begins and ends
+    CallbackObserver<RotaryEncoderImpl, void *> lsObserver =
+        CallbackObserver<RotaryEncoderImpl, void *>(this, &RotaryEncoderImpl::beforeLightSleep);
+    CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t> lsEndObserver =
+        CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t>(this, &RotaryEncoderImpl::afterLightSleep);
+#endif
 };
 
 extern RotaryEncoderImpl *rotaryEncoderImpl;

variants/esp32/diy/dr-dev/platformio.ini

@@ -2,6 +2,7 @@
 [env:meshtastic-dr-dev]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 board_upload.maximum_size = 4194304
 board_upload.maximum_ram_size = 532480
 build_flags =

variants/esp32/tbeam/platformio.ini

@@ -2,7 +2,7 @@
 [env:tbeam]
 extends = esp32_base
 board = ttgo-t-beam
-board_level = pr
+board_level = extra
 board_check = true
 lib_deps = ${esp32_base.lib_deps}
 build_flags = ${esp32_base.build_flags}

variants/esp32s3/link32_s3_v1/platformio.ini

@@ -1,6 +1,7 @@
 [env:link32-s3-v1]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags}
   -D LINK_32

variants/nrf52840/ELECROW-ThinkNode-M3/variant.cpp

@@ -63,9 +63,20 @@ void initVariant()
 // called from main-nrf52.cpp during the cpuDeepSleep() function
 void variant_shutdown()
 {
+    digitalWrite(red_LED_PIN, HIGH);
+    digitalWrite(green_LED_PIN, HIGH);
+    digitalWrite(LED_BLUE, HIGH);
+
+    digitalWrite(PIN_EN1, LOW);
+    digitalWrite(PIN_EN2, LOW);
     digitalWrite(EEPROM_POWER, LOW);
     digitalWrite(KEY_POWER, LOW);
+    digitalWrite(DHT_POWER, LOW);
+    digitalWrite(ACC_POWER, LOW);
+    digitalWrite(Battery_POWER, LOW);
+    digitalWrite(GPS_POWER, LOW);
 
+    // This sets the pin to OUTPUT and LOW for the pins *not* in the if block.
     for (int pin = 0; pin < 48; pin++) {
         if (pin == PIN_POWER_USB || pin == BUTTON_PIN || pin == PIN_EN1 || pin == PIN_EN2 || pin == DHT_POWER ||
             pin == ACC_POWER || pin == Battery_POWER || pin == GPS_POWER || pin == LR1110_SPI_MISO_PIN ||

variants/rp2040/feather_rp2040_rfm95/platformio.ini

@@ -1,6 +1,7 @@
 [env:feather_rp2040_rfm95]
 extends = rp2040_base
 board = adafruit_feather
+board_level = extra
 upload_protocol = picotool
 # add our variants files to the include and src paths
 build_flags =