Merge branch '0_15' into blending-styles

2024-06-16 18:22:21 +02:00
parent da484b07f5 ed0e73803f
commit 296df2660a
14 changed files with 347 additions and 649 deletions
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -215,7 +215,7 @@ bool requestJSONBufferLock(uint8_t module)
  }
  unsigned long now = millis();

-  while (jsonBufferLock && millis()-now < 100) delay(1); // wait for fraction for buffer lock
+  while (jsonBufferLock && millis()-now < 250) delay(1); // wait for fraction for buffer lock

  if (jsonBufferLock) {
    DEBUG_PRINT(F("ERROR: Locking JSON buffer failed! (still locked by "));