@alteriom/painlessmesh 1.7.3 → 1.7.5

package/src/painlessmesh/scheduler_queue.cpp

@@ -0,0 +1,77 @@
+#include "painlessmesh/scheduler_queue.hpp"
+
+#ifdef ESP32
+
+namespace painlessmesh {
+namespace scheduler {
+
+// Global queue handle for TaskScheduler thread-safe operations
+QueueHandle_t tsQueue = NULL;
+
+bool initQueue() {
+    if (tsQueue != NULL) {
+        return true;  // Already initialized
+    }
+    
+    tsQueue = xQueueCreate(TS_QUEUE_LEN, sizeof(_task_request_t));
+    return (tsQueue != NULL);
+}
+
+}  // namespace scheduler
+}  // namespace painlessmesh
+
+/**
+ * Enqueue a task request (called from any thread/ISR)
+ * This function is required when _TASK_THREAD_SAFE is enabled
+ * 
+ * Overrides the weak default implementation in TaskScheduler.h
+ */
+bool _task_enqueue_request(_task_request_t* req) {
+    using namespace painlessmesh::scheduler;
+    
+    if (tsQueue == NULL) {
+        return false;  // Queue not initialized
+    }
+    
+    if (xPortInIsrContext()) {
+        // Called from ISR context
+        BaseType_t xHigherPriorityTaskWokenByPost = pdFALSE;
+        BaseType_t rc = xQueueSendFromISR(tsQueue, req, &xHigherPriorityTaskWokenByPost);
+        if (xHigherPriorityTaskWokenByPost) {
+            portYIELD_FROM_ISR();
+        }
+        return (rc == pdTRUE);
+    } else {
+        // Called from normal task context
+        return (xQueueSend(tsQueue, req, pdMS_TO_TICKS(TS_ENQUEUE_WAIT_MS)) == pdTRUE);
+    }
+}
+
+/**
+ * Dequeue a task request (called by scheduler)
+ * This function is required when _TASK_THREAD_SAFE is enabled
+ * 
+ * Overrides the weak default implementation in TaskScheduler.h
+ */
+bool _task_dequeue_request(_task_request_t* req) {
+    using namespace painlessmesh::scheduler;
+    
+    if (tsQueue == NULL) {
+        return false;  // Queue not initialized
+    }
+    
+    if (xPortInIsrContext()) {
+        // Called from ISR context (shouldn't normally happen)
+        BaseType_t xHigherPriorityTaskWokenByPost = pdFALSE;
+        BaseType_t rc = xQueueReceiveFromISR(tsQueue, req, &xHigherPriorityTaskWokenByPost);
+        if (xHigherPriorityTaskWokenByPost) {
+            portYIELD_FROM_ISR();
+        }
+        return (rc == pdTRUE);
+    } else {
+        // Called from normal task context
+        return (xQueueReceive(tsQueue, req, TS_DEQUEUE_WAIT_MS) == pdTRUE);
+    }
+}
+
+#endif  // ESP32

package/src/painlessmesh/scheduler_queue.hpp

@@ -0,0 +1,34 @@
+#ifndef _PAINLESSMESH_SCHEDULER_QUEUE_HPP_
+#define _PAINLESSMESH_SCHEDULER_QUEUE_HPP_
+
+#ifdef ESP32
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/queue.h>
+#include <TaskSchedulerDeclarations.h>
+
+namespace painlessmesh {
+namespace scheduler {
+
+// Configuration constants
+constexpr size_t TS_QUEUE_LEN = 16;           // Task request queue length
+constexpr TickType_t TS_ENQUEUE_WAIT_MS = 10; // Max wait for enqueue (ms)
+constexpr TickType_t TS_DEQUEUE_WAIT_MS = 0;  // No wait for dequeue
+
+// Global queue handle (initialized in mesh init)
+extern QueueHandle_t tsQueue;
+
+/**
+ * Initialize the TaskScheduler request queue
+ * Must be called during mesh initialization on ESP32
+ * 
+ * @return true if queue created successfully, false otherwise
+ */
+bool initQueue();
+
+}  // namespace scheduler
+}  // namespace painlessmesh
+
+#endif  // ESP32
+
+#endif  // _PAINLESSMESH_SCHEDULER_QUEUE_HPP_