Bugfix.

Debugging info added.

wled00/FX_fcn.cpp

@@ -1092,10 +1092,7 @@ void WS2812FX::deserializeMap(uint8_t n) {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(5)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   DEBUG_PRINT(F("Reading LED map from "));

wled00/cfg.cpp

@@ -428,10 +428,7 @@ void deserializeConfigFromFS() {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(1)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   DEBUG_PRINTLN(F("Reading settings from /cfg.json..."));
@@ -459,10 +456,7 @@ void serializeConfig() {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(2)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   JsonArray rev = doc.createNestedArray("rev");
@@ -780,10 +774,7 @@ bool deserializeConfigSec() {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(3)) return false;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return false;
-  }
   #endif
 
   bool success = readObjectFromFile("/wsec.json", nullptr, &doc);
@@ -832,10 +823,7 @@ void serializeConfigSec() {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(4)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   JsonObject nw = doc.createNestedObject("nw");

wled00/data/index.js

@@ -1066,6 +1066,7 @@ function updateSelectedFx()
 	var parent = gId('fxlist');
 	var selEffectInput = parent.querySelector(`input[name="fx"][value="${selectedFx}"]`);
 	if (selEffectInput) selEffectInput.checked = true;
+console.log(selEffectInput);
 
 	var selElement = parent.querySelector('.selected');
 	if (selElement) selElement.classList.remove('selected');

wled00/fcn_declare.h

@@ -272,7 +272,7 @@ void sappends(char stype, const char* key, char* val);
 void prepareHostname(char* hostname);
 void _setRandomColor(bool _sec, bool fromButton);
 bool isAsterisksOnly(const char* str, byte maxLen);
-bool requestJSONBufferLock();
+bool requestJSONBufferLock(uint8_t module=255);
 void releaseJSONBufferLock();
 
 //wled_eeprom.cpp

wled00/ir.cpp

@@ -579,10 +579,7 @@ void decodeIRJson(uint32_t code)
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(6)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   sprintf_P(objKey, PSTR("\"0x%lX\":"), (unsigned long)code);

wled00/json.cpp

@@ -920,10 +920,7 @@ void serveJson(AsyncWebServerRequest* request)
   #ifdef WLED_USE_DYNAMIC_JSON
   AsyncJsonResponse* response = new AsyncJsonResponse(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(7)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   AsyncJsonResponse *response = new AsyncJsonResponse(&doc);
   #endif
 

wled00/mqtt.cpp

@@ -94,10 +94,7 @@ void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(JSON_BUFFER_SIZE);
     #else
-      if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(8)) return;
-        DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-        return;
-      }
     #endif
     if (payload[0] == '{') { //JSON API
       deserializeJson(doc, payloadStr);

wled00/presets.cpp

@@ -25,10 +25,7 @@ bool applyPreset(byte index, byte callMode)
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(JSON_BUFFER_SIZE);
     #else
-    if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(9)) return false;
-      DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-      return false;
-    }
     #endif
 
     errorFlag = readObjectFromFileUsingId(filename, index, &doc) ? ERR_NONE : ERR_FS_PLOAD;
@@ -60,10 +57,7 @@ void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj)
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(JSON_BUFFER_SIZE);
     #else
-    if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(10)) return;
-      DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-      return;
-    }
     #endif
 
     sObj = doc.to<JsonObject>();

wled00/set.cpp

@@ -418,10 +418,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(JSON_BUFFER_SIZE);
     #else
-    if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(11)) return;
-      DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-      return;
-    }
     #endif
 
     JsonObject um = doc.createNestedObject("um");

wled00/util.cpp

@@ -131,15 +131,20 @@ bool isAsterisksOnly(const char* str, byte maxLen)
 }
 
 
-bool requestJSONBufferLock()
+bool requestJSONBufferLock(uint8_t module)
 {
   unsigned long now = millis();
 
   while (jsonBufferLock && millis()-now < 1000) delay(1); // wait for a second for buffer lock
 
-  if (millis()-now >= 1000) return false; // waiting time-outed
+  if (millis()-now >= 1000) {
+    DEBUG_PRINT(F("ERROR: Locking JSON buffer failed! ("));
+    DEBUG_PRINT(jsonBufferLock);
+    DEBUG_PRINTLN(")");
+    return false; // waiting time-outed
+  }
 
-  jsonBufferLock = true;
+  jsonBufferLock = module ? module : 255;
   fileDoc = &doc;  // used for applying presets (presets.cpp)
   doc.clear();
   return true;
@@ -148,8 +153,11 @@ bool requestJSONBufferLock()
 
 void releaseJSONBufferLock()
 {
-#ifndef WLED_USE_DYNAMIC_JSON
+  DEBUG_PRINT(F("JSON buffer released. ("));
+  DEBUG_PRINT(jsonBufferLock);
+  DEBUG_PRINTLN(")");
   fileDoc = nullptr;
-  jsonBufferLock = false;
+  #ifndef WLED_USE_DYNAMIC_JSON
+  jsonBufferLock = 0;
   #endif
 }

wled00/wled.h

@@ -606,7 +606,7 @@ WLED_GLOBAL UsermodManager usermods _INIT(UsermodManager());
 #ifndef WLED_USE_DYNAMIC_JSON
 WLED_GLOBAL StaticJsonDocument<JSON_BUFFER_SIZE> doc;
 #endif
-WLED_GLOBAL volatile bool jsonBufferLock _INIT(false);
+WLED_GLOBAL volatile uint8_t jsonBufferLock _INIT(0);
 
 // enable additional debug output
 #ifdef WLED_DEBUG

wled00/wled_eeprom.cpp

@@ -385,10 +385,7 @@ void deEEP() {
   #ifdef WLED_USE_DYNAMIC_JSON
   DynamicJsonDocument doc(JSON_BUFFER_SIZE);
   #else
-  if (!requestJSONBufferLock()) {
+  if (!requestJSONBufferLock(12)) return;
-    DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-    return;
-  }
   #endif
 
   JsonObject sObj = doc.to<JsonObject>();
@@ -469,6 +466,7 @@ void deEEP() {
   File f = WLED_FS.open("/presets.json", "w");
   if (!f) {
     errorFlag = ERR_FS_GENERAL;
+    releaseJSONBufferLock();
     return;
   }
   serializeJson(doc, f);

wled00/wled_serial.cpp

@@ -47,10 +47,7 @@ void handleSerial()
           #ifdef WLED_USE_DYNAMIC_JSON
           DynamicJsonDocument doc(JSON_BUFFER_SIZE);
           #else
-          if (!requestJSONBufferLock()) {
+          if (!requestJSONBufferLock(13)) return;
-            DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-            return;
-          }
           #endif
           Serial.setTimeout(100);
           DeserializationError error = deserializeJson(doc, Serial);

wled00/wled_server.cpp

@@ -114,16 +114,15 @@ void initServer()
       #ifdef WLED_USE_DYNAMIC_JSON
       DynamicJsonDocument doc(JSON_BUFFER_SIZE);
       #else
-      if (!requestJSONBufferLock()) {
+      if (!requestJSONBufferLock(14)) return;
-        DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-        return;
-      }
       #endif
 
       DeserializationError error = deserializeJson(doc, (uint8_t*)(request->_tempObject));
       JsonObject root = doc.as<JsonObject>();
       if (error || root.isNull()) {
-        request->send(400, "application/json", F("{\"error\":9}")); return;
+        releaseJSONBufferLock();
+        request->send(400, "application/json", F("{\"error\":9}"));
+        return;
       }
       const String& url = request->url();
       isConfig = url.indexOf("cfg") > -1;

wled00/ws.cpp

@@ -40,10 +40,7 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
           #ifdef WLED_USE_DYNAMIC_JSON
           DynamicJsonDocument doc(JSON_BUFFER_SIZE);
           #else
-          if (!requestJSONBufferLock()) {
+          if (!requestJSONBufferLock(15)) return;
-            DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-            return;
-          }
           #endif
 
           DeserializationError error = deserializeJson(doc, data, len);
@@ -120,10 +117,7 @@ void sendDataWs(AsyncWebSocketClient * client)
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(JSON_BUFFER_SIZE);
     #else
-    if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(16)) return;
-      DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-      return;
-    }
     #endif
 
     JsonObject state = doc.createNestedObject("state");

wled00/xml.cpp

@@ -256,10 +256,7 @@ void getSettingsJS(byte subPage, char* dest)
     #ifdef WLED_USE_DYNAMIC_JSON
     DynamicJsonDocument doc(2048); // 2k is enough for usermods
     #else
-    if (!requestJSONBufferLock()) {
+    if (!requestJSONBufferLock(17)) return;
-      DEBUG_PRINTLN(F("ERROR: Locking JSON buffer failed!"));
-      return;
-    }
     #endif
   
     JsonObject mods = doc.createNestedObject(F("um"));