Merge pull request #295 from toblum/develop

v 2.1.10

Arduino/McLighting/request_handlers.h

@@ -277,7 +277,7 @@ void handleSetWS2812FXMode(uint8_t * mypayload) {
 String listStatusJSON(void) {
   uint8_t tmp_mode = (mode == SET_MODE) ? (uint8_t) ws2812fx_mode : strip.getMode();
 
-  const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6);
+  const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6) + 500;
   DynamicJsonDocument jsonBuffer(bufferSize);
   JsonObject root = jsonBuffer.to<JsonObject>();
   root["mode"] = (uint8_t) mode;
@@ -302,7 +302,7 @@ void getStatusJSON() {
 }
 
 String listModesJSON(void) {
-  const size_t bufferSize = JSON_ARRAY_SIZE(strip.getModeCount()+1) + strip.getModeCount()*JSON_OBJECT_SIZE(2);
+  const size_t bufferSize = JSON_ARRAY_SIZE(strip.getModeCount()+1) + strip.getModeCount()*JSON_OBJECT_SIZE(2) + 1000;
   DynamicJsonDocument jsonBuffer(bufferSize);
   JsonArray json = jsonBuffer.to<JsonArray>();
   for (uint8_t i = 0; i < strip.getModeCount(); i++) {

Arduino/McLighting/version.h

@@ -1 +1 @@
-#define SKETCH_VERSION "2.1.9" 
+#define SKETCH_VERSION "2.1.10" 

Arduino/McLighting/version_info.ino

@@ -41,4 +41,7 @@
  * - Bump ArduinoJson library requirment for v6.7.0-beta (better memory management)
  * - sendState() needs extra memory for jsonBuffer
  * - sensState() effect can be sent directly instead of copying from PROGMEM
+ * 
+ * 16 Dec 2018 v 1.1.10
+ * - more ArduinoJson library memory managment fixes
  */

platformio.ini

@@ -44,12 +44,10 @@ monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_resetmethod = ${common.upload_resetmethod}
 
-
-
 lib_deps =
   [email protected]
   AsyncMqttClient
-  https://github.com/bblanchon/ArduinoJson.git#v6.6.0-beta
+  https://github.com/bblanchon/ArduinoJson.git#v6.7.0-beta
   WS2812FX
   NeoPixelBus
   WebSockets