From 3d86c99c259a91da4c32d832b8f290a9ee6534b8 Mon Sep 17 00:00:00 2001
From: WillyJL <me@willyjl.dev>
Date: Fri, 12 Sep 2025 05:53:35 +0200
Subject: [PATCH] T-Lora Pager: Interrupt based rotary encoder

---
 src/input/RotaryEncoderImpl.cpp             | 65 +++++++++++++++------
 src/input/RotaryEncoderImpl.h               |  7 +++
 variants/esp32s3/tlora-pager/platformio.ini |  4 +-
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/input/RotaryEncoderImpl.cpp b/src/input/RotaryEncoderImpl.cpp
index 7d638dd71..cede1b87c 100644
--- a/src/input/RotaryEncoderImpl.cpp
+++ b/src/input/RotaryEncoderImpl.cpp
@@ -6,6 +6,8 @@
 
 #define ORIGIN_NAME "RotaryEncoder"
 
+#define ROTARY_INTERRUPT_FLAG _BV(0)
+
 RotaryEncoderImpl *rotaryEncoderImpl;
 
 RotaryEncoderImpl::RotaryEncoderImpl() : concurrency::OSThread(ORIGIN_NAME), originName(ORIGIN_NAME)
@@ -30,6 +32,17 @@ bool RotaryEncoderImpl::init()
                                moduleConfig.canned_message.inputbroker_pin_press);
     rotary->resetButton();
 
+    inputQueue = xQueueCreate(5, sizeof(input_broker_event));
+    interruptFlag = xEventGroupCreate();
+    interruptInstance = this;
+    auto interruptHandler = []() {
+        xEventGroupSetBits(interruptInstance->interruptFlag, ROTARY_INTERRUPT_FLAG);
+    };
+    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);
+    xTaskCreate(inputWorker, "rotary", 2 * 1024, this, 10, &inputWorkerTask);
+
     inputBroker->registerSource(this);
 
     LOG_INFO("RotaryEncoder initialized pins(%d, %d, %d), events(%d, %d, %d)", moduleConfig.canned_message.inputbroker_pin_a,
@@ -38,35 +51,49 @@ bool RotaryEncoderImpl::init()
     return true;
 }
 
-int32_t RotaryEncoderImpl::runOnce()
+void RotaryEncoderImpl::dispatchInputs()
 {
-    InputEvent e{originName, INPUT_BROKER_NONE, 0, 0, 0};
     static uint32_t lastPressed = millis();
     if (rotary->readButton() == RotaryEncoder::ButtonState::BUTTON_PRESSED) {
         if (lastPressed + 200 < millis()) {
-            LOG_DEBUG("Rotary event Press");
+            // LOG_DEBUG("Rotary event Press");
             lastPressed = millis();
-            e.inputEvent = this->eventPressed;
-        }
-    } else {
-        switch (rotary->process()) {
-        case RotaryEncoder::DIRECTION_CW:
-            LOG_DEBUG("Rotary event CW");
-            e.inputEvent = this->eventCw;
-            break;
-        case RotaryEncoder::DIRECTION_CCW:
-            LOG_DEBUG("Rotary event CCW");
-            e.inputEvent = this->eventCcw;
-            break;
-        default:
-            break;
+            xQueueSend(inputQueue, &this->eventPressed, portMAX_DELAY);
         }
     }
 
-    if (e.inputEvent != INPUT_BROKER_NONE) {
+    switch (rotary->process()) {
+    case RotaryEncoder::DIRECTION_CW:
+        // LOG_DEBUG("Rotary event CW");
+        xQueueSend(inputQueue, &this->eventCw, portMAX_DELAY);
+        break;
+    case RotaryEncoder::DIRECTION_CCW:
+        // LOG_DEBUG("Rotary event CCW");
+        xQueueSend(inputQueue, &this->eventCcw, portMAX_DELAY);
+        break;
+    default:
+        break;
+    }
+}
+
+void RotaryEncoderImpl::inputWorker(void *p)
+{
+    RotaryEncoderImpl* instance = (RotaryEncoderImpl*)p;
+    while (true) {
+        xEventGroupWaitBits(instance->interruptFlag, ROTARY_INTERRUPT_FLAG, pdTRUE, pdTRUE, portMAX_DELAY);
+        instance->dispatchInputs();
+    }
+    vTaskDelete(NULL);
+}
+
+RotaryEncoderImpl* RotaryEncoderImpl::interruptInstance;
+
+int32_t RotaryEncoderImpl::runOnce()
+{
+    InputEvent e{originName, INPUT_BROKER_NONE, 0, 0, 0};
+    while(xQueueReceive(inputQueue, &e.inputEvent, 0) == pdPASS) {
         this->notifyObservers(&e);
     }
-
     return 10;
 }
 
diff --git a/src/input/RotaryEncoderImpl.h b/src/input/RotaryEncoderImpl.h
index ae2a7c6fd..1d92617d5 100644
--- a/src/input/RotaryEncoderImpl.h
+++ b/src/input/RotaryEncoderImpl.h
@@ -17,6 +17,13 @@ class RotaryEncoderImpl : public Observable<const InputEvent *>, public concurre
   protected:
     virtual int32_t runOnce() override;
 
+    QueueHandle_t inputQueue;
+    void dispatchInputs(void);
+    TaskHandle_t inputWorkerTask;
+    static void inputWorker(void *p);
+    EventGroupHandle_t  interruptFlag;
+    static RotaryEncoderImpl* interruptInstance;
+
     input_broker_event eventCw = INPUT_BROKER_NONE;
     input_broker_event eventCcw = INPUT_BROKER_NONE;
     input_broker_event eventPressed = INPUT_BROKER_NONE;
diff --git a/variants/esp32s3/tlora-pager/platformio.ini b/variants/esp32s3/tlora-pager/platformio.ini
index 312d46259..9800161bb 100644
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -15,7 +15,7 @@ build_flags = ${esp32s3_base.build_flags}
   -D SDCARD_USE_SPI1
   -D ENABLE_ROTARY_PULLUP
   -D ENABLE_BUTTON_PULLUP
-  -D HALF_STEP
+  -D ROTARY_BUXTRONICS
 
 lib_deps = ${esp32s3_base.lib_deps}
   lovyan03/LovyanGFX@1.2.7
@@ -26,7 +26,7 @@ lib_deps = ${esp32s3_base.lib_deps}
   lewisxhe/SensorLib@0.3.1
   https://github.com/pschatzmann/arduino-audio-driver/archive/refs/tags/v0.1.3.zip
   https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip
-  https://github.com/mverch67/RotaryEncoder/archive/25a59d5745a6645536f921427d80b08e78f886d4.zip
+  https://github.com/mverch67/RotaryEncoder/archive/da958a21389cbcd485989705df602a33e092dd88.zip
 
 [env:tlora-pager-tft]
 board_level = extra