From e59a53c5ec1b32accae6d3145f8fb2befe1578db Mon Sep 17 00:00:00 2001
From: WillyJL <me@willyjl.dev>
Date: Fri, 19 Sep 2025 22:06:09 +0200
Subject: [PATCH] InputPollable: System for polling after interrupts

---
 src/input/InputBroker.cpp | 46 +++++++++++++++++++++++++++++++++++++--
 src/input/InputBroker.h   | 22 +++++++++++++++++++
 src/main.cpp              |  3 +++
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/input/InputBroker.cpp b/src/input/InputBroker.cpp
index ef6d8df91..5ca890b43 100644
--- a/src/input/InputBroker.cpp
+++ b/src/input/InputBroker.cpp
@@ -3,16 +3,58 @@
 
 InputBroker *inputBroker = nullptr;
 
-InputBroker::InputBroker(){};
+InputBroker::InputBroker()
+{
+#ifdef HAS_FREE_RTOS
+    inputEventQueue = xQueueCreate(5, sizeof(InputEvent));
+    pollSoonQueue = xQueueCreate(5, sizeof(InputPollable *));
+    xTaskCreate(pollSoonWorker, "input-pollSoon", 2 * 1024, this, 10, &pollSoonTask);
+#endif
+}
 
 void InputBroker::registerSource(Observable<const InputEvent *> *source)
 {
     this->inputEventObserver.observe(source);
 }
 
+#ifdef HAS_FREE_RTOS
+void InputBroker::pollSoonRequestFromIsr(InputPollable *pollable)
+{
+    xQueueSendFromISR(pollSoonQueue, &pollable, NULL);
+}
+
+void InputBroker::queueInputEvent(const InputEvent *event)
+{
+    xQueueSend(inputEventQueue, event, portMAX_DELAY);
+}
+
+void InputBroker::processInputEventQueue()
+{
+    InputEvent event;
+    while (xQueueReceive(inputEventQueue, &event, 0)) {
+        handleInputEvent(&event);
+    }
+}
+#endif
+
 int InputBroker::handleInputEvent(const InputEvent *event)
 {
     powerFSM.trigger(EVENT_INPUT); // todo: not every input should wake, like long hold release
     this->notifyObservers(event);
     return 0;
-}
\ No newline at end of file
+}
+
+#ifdef HAS_FREE_RTOS
+void InputBroker::pollSoonWorker(void *p)
+{
+    InputBroker *instance = (InputBroker *)p;
+    while (true) {
+        InputPollable *pollable = NULL;
+        xQueueReceive(instance->pollSoonQueue, &pollable, portMAX_DELAY);
+        if (pollable) {
+            pollable->pollOnce();
+        }
+    }
+    vTaskDelete(NULL);
+}
+#endif
diff --git a/src/input/InputBroker.h b/src/input/InputBroker.h
index 2cdfa2ae2..82af184f3 100644
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include "Observer.h"
+#include "freertosinc.h"
 
 enum input_broker_event {
     INPUT_BROKER_NONE = 0,
@@ -41,6 +43,13 @@ typedef struct _InputEvent {
     uint16_t touchX;
     uint16_t touchY;
 } InputEvent;
+
+class InputPollable
+{
+  public:
+    virtual void pollOnce() = 0;
+};
+
 class InputBroker : public Observable<const InputEvent *>
 {
     CallbackObserver<InputBroker, const InputEvent *> inputEventObserver =
@@ -50,9 +59,22 @@ class InputBroker : public Observable<const InputEvent *>
     InputBroker();
     void registerSource(Observable<const InputEvent *> *source);
     void injectInputEvent(const InputEvent *event) { handleInputEvent(event); }
+#ifdef HAS_FREE_RTOS
+    void pollSoonRequestFromIsr(InputPollable *pollable);
+    void queueInputEvent(const InputEvent *event);
+    void processInputEventQueue();
+#endif
 
   protected:
     int handleInputEvent(const InputEvent *event);
+
+  private:
+#ifdef HAS_FREE_RTOS
+    QueueHandle_t inputEventQueue;
+    QueueHandle_t pollSoonQueue;
+    TaskHandle_t pollSoonTask;
+    static void pollSoonWorker(void *p);
+#endif
 };
 
 extern InputBroker *inputBroker;
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 3f84a5e66..bc84b7fc5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1595,6 +1595,9 @@ void loop()
 #endif
 
     service->loop();
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
+    inputBroker->processInputEventQueue();
+#endif
 #if defined(LGFX_SDL)
     if (screen) {
         auto dispdev = screen->getDisplayDevice();