@alteriom/painlessmesh 1.7.3 → 1.7.5

package/examples/alteriomImproved/platformio.ini

@@ -6,6 +6,13 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
+
+; Enable painlessMesh improvement features
+build_flags =
+    -DPAINLESSMESH_ENABLE_VALIDATION
+    -DPAINLESSMESH_ENABLE_METRICS
+    -DPAINLESSMESH_ENABLE_MEMORY_OPTIMIZATION
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/alteriomPhase1/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/alteriomPhase2/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/alteriomSensorNode/alteriom_sensor_node.ino

@@ -5,6 +5,8 @@
 // sensor node using custom packages with painlessMesh
 //************************************************************
 
+#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
+#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
 #include "alteriom_sensor_package.hpp"
 #include "painlessMesh.h"
 

package/examples/alteriomSensorNode/platformio.ini

@@ -2,6 +2,7 @@
 src_dir = .
 
 [env]
+lib_ldf_mode = deep+
 lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler

package/examples/basic/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/bridge/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/echoNode/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/logClient/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/logServer/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/meshCommandNode/meshCommandNode.ino

@@ -1,3 +1,5 @@
+#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
+#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
 #include "painlessMesh.h"
 #include "alteriom_sensor_package.hpp"
 

package/examples/meshCommandNode/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/mqttBridge/platformio.ini

@@ -7,6 +7,7 @@ lib_deps =
     arkhipenko/TaskScheduler
     PubSubClient
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/mqttCommandBridge/mesh_event_publisher.hpp

@@ -40,7 +40,7 @@ public:
    * Called when a new node connects to the mesh
    */
   void publishNodeJoin(uint32_t nodeId) {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     // Envelope
     doc["schema_version"] = 1;
@@ -54,10 +54,10 @@ public:
     doc["event_type"] = "node_join";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     affected.add(generateDeviceId(nodeId));
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["total_nodes"] = mesh.getNodeList().size() + 1;
     details["timestamp"] = getISO8601Timestamp();
     
@@ -69,7 +69,7 @@ public:
    * Called when a node disconnects from the mesh
    */
   void publishNodeLeave(uint32_t nodeId) {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     // Envelope
     doc["schema_version"] = 1;
@@ -83,10 +83,10 @@ public:
     doc["event_type"] = "node_leave";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     affected.add(generateDeviceId(nodeId));
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["reason"] = "connection_lost";
     details["last_seen"] = getISO8601Timestamp();
     details["total_nodes"] = mesh.getNodeList().size() + 1;
@@ -99,7 +99,7 @@ public:
    * Called when a direct connection fails
    */
   void publishConnectionLost(uint32_t nodeId) {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     doc["schema_version"] = 1;
     doc["device_id"] = generateDeviceId(mesh.getNodeId());
@@ -111,10 +111,10 @@ public:
     doc["event_type"] = "connection_lost";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     affected.add(generateDeviceId(nodeId));
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["reason"] = "timeout";
     details["timestamp"] = getISO8601Timestamp();
     
@@ -126,7 +126,7 @@ public:
    * Called when a connection is re-established
    */
   void publishConnectionRestored(uint32_t nodeId) {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     doc["schema_version"] = 1;
     doc["device_id"] = generateDeviceId(mesh.getNodeId());
@@ -138,10 +138,10 @@ public:
     doc["event_type"] = "connection_restored";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     affected.add(generateDeviceId(nodeId));
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["timestamp"] = getISO8601Timestamp();
     
     publishEvent(doc, "Connection Restored");
@@ -152,7 +152,7 @@ public:
    * Called when mesh partitions into separate segments
    */
   void publishNetworkSplit() {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     doc["schema_version"] = 1;
     doc["device_id"] = generateDeviceId(mesh.getNodeId());
@@ -164,10 +164,10 @@ public:
     doc["event_type"] = "network_split";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     // TODO: Detect which nodes are in different partitions
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["timestamp"] = getISO8601Timestamp();
     details["partition_count"] = 2;  // TODO: Calculate actual partitions
     
@@ -179,7 +179,7 @@ public:
    * Called when mesh partitions rejoin
    */
   void publishNetworkMerged() {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     doc["schema_version"] = 1;
     doc["device_id"] = generateDeviceId(mesh.getNodeId());
@@ -191,10 +191,10 @@ public:
     doc["event_type"] = "network_merged";
     doc["mesh_id"] = meshId;
     
-    JsonArray affected = doc.createNestedArray("affected_nodes");
+    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
     // TODO: List nodes that rejoined
     
-    JsonObject details = doc.createNestedObject("details");
+    JsonObject details = doc["details"].to<JsonObject>();
     details["timestamp"] = getISO8601Timestamp();
     
     publishEvent(doc, "Network Merged");
@@ -204,7 +204,7 @@ private:
   /**
    * Internal method to publish event to MQTT
    */
-  void publishEvent(const DynamicJsonDocument& doc, const char* eventName) {
+  void publishEvent(const JsonDocument& doc, const char* eventName) {
     if (!mqttClient.connected()) {
       Serial.printf("[Event] ⚠️ MQTT not connected, cannot publish %s\n", eventName);
       return;

package/examples/mqttCommandBridge/mesh_topology_reporter.hpp

@@ -37,7 +37,7 @@ public:
    * alteriom/mesh/{mesh_id}/topology
    */
   String generateFullTopology() {
-    DynamicJsonDocument doc(8192);  // Large buffer for full topology
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     // Envelope fields (from @alteriom/mqtt-schema)
     doc["schema_version"] = 1;
@@ -53,8 +53,8 @@ public:
     doc["mesh_id"] = meshId;
     doc["gateway_node_id"] = generateDeviceId(mesh.getNodeId());
     
-    // Nodes array
-    JsonArray nodes = doc.createNestedArray("nodes");
+    // Nodes array - ArduinoJson v7 syntax
+    JsonArray nodes = doc["nodes"].to<JsonArray>();
     addNodeInfo(nodes, mesh.getNodeId(), "gateway");  // Self
     
     auto nodeList = mesh.getNodeList(false);
@@ -62,12 +62,12 @@ public:
       addNodeInfo(nodes, nodeId, "sensor");  // Assume sensor role
     }
     
-    // Connections array
-    JsonArray connections = doc.createNestedArray("connections");
+    // Connections array - ArduinoJson v7 syntax
+    JsonArray connections = doc["connections"].to<JsonArray>();
     addConnectionInfo(connections);
     
-    // Network metrics
-    JsonObject metrics = doc.createNestedObject("metrics");
+    // Network metrics - ArduinoJson v7 syntax
+    JsonObject metrics = doc["metrics"].to<JsonObject>();
     metrics["total_nodes"] = nodeList.size() + 1;  // +1 for gateway
     metrics["online_nodes"] = nodeList.size() + 1;
     metrics["network_diameter"] = calculateNetworkDiameter();
@@ -88,7 +88,7 @@ public:
    * @param joined true if node joined, false if left
    */
   String generateIncrementalUpdate(uint32_t nodeId, bool joined) {
-    DynamicJsonDocument doc(2048);
+    JsonDocument doc;  // ArduinoJson v7: automatic sizing
     
     // Envelope fields
     doc["schema_version"] = 1;
@@ -101,25 +101,25 @@ public:
     doc["mesh_id"] = meshId;
     doc["gateway_node_id"] = generateDeviceId(mesh.getNodeId());
     
-    // Node that changed
-    JsonArray nodes = doc.createNestedArray("nodes");
+    // Node that changed - ArduinoJson v7 syntax
+    JsonArray nodes = doc["nodes"].to<JsonArray>();
     if (joined) {
       addNodeInfo(nodes, nodeId, "sensor");
     } else {
       // For node leaving, mark as offline
-      JsonObject node = nodes.createNestedObject();
+      JsonObject node = nodes.add<JsonObject>();
       node["node_id"] = generateDeviceId(nodeId);
       node["status"] = "offline";
     }
     
-    // Update connections
-    JsonArray connections = doc.createNestedArray("connections");
+    // Update connections - ArduinoJson v7 syntax
+    JsonArray connections = doc["connections"].to<JsonArray>();
     // Add connections related to this node
     addConnectionInfoForNode(connections, nodeId);
     
-    // Updated metrics
+    // Updated metrics - ArduinoJson v7 syntax
     auto nodeList = mesh.getNodeList(false);
-    JsonObject metrics = doc.createNestedObject("metrics");
+    JsonObject metrics = doc["metrics"].to<JsonObject>();
     metrics["total_nodes"] = nodeList.size() + 1;
     metrics["online_nodes"] = nodeList.size() + 1;
     
@@ -148,7 +148,7 @@ private:
    * Add node information to JSON array
    */
   void addNodeInfo(JsonArray& nodes, uint32_t nodeId, const char* role) {
-    JsonObject node = nodes.createNestedObject();
+    JsonObject node = nodes.add<JsonObject>();  // ArduinoJson v7 syntax
     node["node_id"] = generateDeviceId(nodeId);
     node["role"] = role;
     node["status"] = "online";
@@ -184,7 +184,7 @@ private:
     String gatewayId = generateDeviceId(mesh.getNodeId());
     
     for (auto& conn : connDetails) {
-      JsonObject connObj = connections.createNestedObject();
+      JsonObject connObj = connections.add<JsonObject>();  // ArduinoJson v7 syntax
       connObj["from_node"] = gatewayId;
       connObj["to_node"] = generateDeviceId(conn.nodeId);
       connObj["quality"] = conn.quality;
@@ -207,7 +207,7 @@ private:
     
     for (auto& conn : connDetails) {
       if (conn.nodeId == nodeId) {
-        JsonObject connObj = connections.createNestedObject();
+        JsonObject connObj = connections.add<JsonObject>();  // ArduinoJson v7 syntax
         connObj["from_node"] = gatewayId;
         connObj["to_node"] = targetId;
         connObj["quality"] = conn.quality;

package/examples/mqttCommandBridge/mqttCommandBridge.ino

@@ -1,4 +1,6 @@
 #include <Arduino.h>
+#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
+#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
 #include "painlessMesh.h"
 #include <PubSubClient.h>
 #include "mqtt_command_bridge.hpp"
@@ -43,7 +45,7 @@ Task taskMqttReconnect(TASK_SECOND * 5, TASK_FOREVER, []() {
 // Task for periodic gateway status
 Task taskGatewayStatus(TASK_MINUTE, TASK_FOREVER, []() {
   if (mqttClient.connected()) {
-    DynamicJsonDocument status(512);
+    JsonDocument status;  // ArduinoJson v7: automatic sizing
     status["gateway_id"] = mesh.getNodeId();
     status["status"] = "online";
     status["uptime"] = millis() / 1000;

package/examples/mqttCommandBridge/mqtt_command_bridge.hpp

@@ -203,7 +203,10 @@ public:
         bool state = params["state"];
         uint8_t brightness = params["brightness"] | 255;
         
-        // Control LED
+        // Control LED (use GPIO2 if LED_BUILTIN not defined on ESP32)
+        #ifndef LED_BUILTIN
+        #define LED_BUILTIN 2
+        #endif
         digitalWrite(LED_BUILTIN, state ? LOW : HIGH);
         
         response.responseMessage = "LED " + String(state ? "ON" : "OFF");
@@ -253,8 +256,8 @@ public:
         break;
         
       case 202: // StatusPackage
-        // Check if it's a command response
-        if (doc.containsKey("respTo") && doc["respTo"] > 0) {
+        // Check if it's a command response (ArduinoJson v7 compatible)
+        if (doc["respTo"].is<uint32_t>() && doc["respTo"].as<uint32_t>() > 0) {
           publishToMqtt("mesh/response/" + String(from), msg);
         } else {
           publishToMqtt("mesh/status/" + String(from), msg);
@@ -397,14 +400,14 @@ public:
   void handleConfigUpdate(JsonDocument& doc) {
     JsonObject config = doc["config"];
     
-    // Apply configuration updates
-    if (config.containsKey("deviceName")) {
+    // Apply configuration updates (ArduinoJson v7 compatible)
+    if (config["deviceName"].is<const char*>()) {
       String newName = config["deviceName"];
       Serial.printf("Config update: deviceName=%s\n", newName.c_str());
       // Store to preferences/EEPROM in production
     }
     
-    if (config.containsKey("meshPrefix")) {
+    if (config["meshPrefix"].is<const char*>()) {
       String newPrefix = config["meshPrefix"];
       Serial.printf("Config update: meshPrefix=%s (requires restart)\n", newPrefix.c_str());
     }

package/examples/mqttCommandBridge/platformio.ini

@@ -7,6 +7,7 @@ lib_deps =
     arkhipenko/TaskScheduler
     knolleary/PubSubClient
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/mqttStatusBridge/mqttStatusBridge.ino

@@ -24,6 +24,8 @@
 //************************************************************
 
 #include <Arduino.h>
+#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
+#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
 #include <painlessMesh.h>
 #include <PubSubClient.h>
 #include <WiFiClient.h>

package/examples/mqttStatusBridge/platformio.ini

@@ -7,6 +7,7 @@ lib_deps =
     arkhipenko/TaskScheduler
     knolleary/PubSubClient
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/mqttTopologyTest/mqttTopologyTest.ino

@@ -51,6 +51,8 @@
  * @version 1.0.0
  */
 
+#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
+#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
 #include "painlessMesh.h"
 #ifdef ESP8266
 #include <ESP8266WiFi.h>

package/examples/mqttTopologyTest/platformio.ini

@@ -7,6 +7,7 @@ lib_deps =
     arkhipenko/TaskScheduler
     knolleary/PubSubClient
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/namedMesh/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/otaReceiver/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/otaSender/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/startHere/platformio.ini

@@ -6,6 +6,7 @@ lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/examples/webServer/platformio.ini

@@ -7,6 +7,7 @@ lib_deps =
     arkhipenko/TaskScheduler
     esp32async/ESPAsyncWebServer
 
+lib_ldf_mode = deep+
 [env:esp8266]
 platform = espressif8266
 board = nodemcuv2

package/library.json

@@ -6,7 +6,7 @@
         "type": "git",
         "url": "https://github.com/Alteriom/painlessMesh"
     },
-    "version": "1.7.3",
+    "version": "1.7.5",
     "frameworks": ["arduino"],
     "platforms": ["espressif8266", "espressif32"],
     "srcDir": "src",

package/library.properties

@@ -1,5 +1,5 @@
 name=AlteriomPainlessMesh
-version=1.7.3
+version=1.7.5
 author=Coopdis,Scotty Franzyshen,Edwin van Leeuwen,Germán Martín,Maximilian Schwarz,Doanh Doanh,Alteriom
 maintainer=Alteriom
 sentence=A painless way to setup a mesh with ESP8266 and ESP32 devices with Alteriom extensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteriom/painlessmesh",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "painlessMesh is a user-friendly library for creating mesh networks with ESP8266 and ESP32 devices. This Alteriom fork includes additional packages for sensor data (SensorPackage), device commands (CommandPackage), and status monitoring (StatusPackage). It handles routing and network management automatically, so you can focus on your application. The library uses JSON-based messaging and syncs time across all nodes, making it ideal for coordinated behaviour like synchronized light displays or sensor networks reporting to a central node.",
   "keywords": [
     "arduino",

package/src/painlessTaskOptions.h

@@ -1,4 +1,19 @@
-//  The following two complie options are required for painlessMesh
+//  The following compile options are required for painlessMesh
 #define _TASK_PRIORITY      // Support for layered scheduling priority
-#define _TASK_STD_FUNCTION  // Support for std::function (ESP8266 and ESP32
-                            // ONLY)
+#define _TASK_STD_FUNCTION  // Support for std::function (ESP8266 and ESP32)
+                            // Required for painlessMesh lambda callbacks
+
+// NOTE: _TASK_THREAD_SAFE is currently DISABLED due to incompatibility
+// with _TASK_STD_FUNCTION in TaskScheduler v4.0.x
+// 
+// The thread-safe mode would prevent FreeRTOS assertion failures on ESP32,
+// but TaskScheduler's implementation has bugs when trying to cast function
+// pointers to std::function objects in processRequests().
+//
+// Workaround: Use semaphore timeout increase (mesh.hpp line 544: 10ms -> 100ms)
+// See: docs/troubleshooting/SENSOR_NODE_CONNECTION_CRASH.md
+//
+// #ifdef ESP32
+// #define _TASK_THREAD_SAFE   // DISABLED - Incompatible with _TASK_STD_FUNCTION
+// #endif
+

package/src/painlessmesh/mesh.hpp

@@ -16,6 +16,10 @@
 #include "painlessmesh/ota.hpp"
 #endif
 
+#if defined(ESP32) && defined(_TASK_THREAD_SAFE)
+#include "painlessmesh/scheduler_queue.hpp"
+#endif
+
 namespace painlessmesh {
 typedef std::function<void(uint32_t nodeId)> newConnectionCallback_t;
 typedef std::function<void(uint32_t nodeId)> droppedConnectionCallback_t;
@@ -41,6 +45,13 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
 
 #ifdef ESP32
     xSemaphore = xSemaphoreCreateMutex();
+    
+#ifdef _TASK_THREAD_SAFE
+    // Initialize the TaskScheduler request queue for thread-safe operations
+    if (!scheduler::initQueue()) {
+      Log(ERROR, "Failed to create TaskScheduler request queue\n");
+    }
+#endif
 #endif
 
     // Add package handlers
@@ -541,7 +552,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
    */
   bool semaphoreTake() {
 #ifdef ESP32
-    return xSemaphoreTake(xSemaphore, (TickType_t)10) == pdTRUE;
+    return xSemaphoreTake(xSemaphore, (TickType_t)100) == pdTRUE;  // Was 10
 #else
     return true;
 #endif