@@ -50,7 +50,7 @@ bool ConfigClass::initialize()
5050
5151bool ConfigClass::parseJson (const char *input)
5252{
53- StaticJsonDocument< 1024 > doc;
53+ JsonDocument doc;
5454 DeserializationError error = deserializeJson (doc, input);
5555
5656 if (doc.containsKey (" timeZone" ))
@@ -128,12 +128,12 @@ void ConfigClass::getUserConfigJson(JsonDocument &doc)
128128 doc[" sunsetOffset" ] = sunsetOffset;
129129 doc[" sunsetAnimation" ] = sunsetAnimation;
130130 doc[" startupAnimation" ] = startupAnimation;
131- JsonArray sliderValueArray = doc. createNestedArray ( " sliderValues" );
131+ JsonArray sliderValueArray = doc[ " sliderValues" ]. to <JsonArray>( );
132132 for (uint16_t i = 0 ; i < sliderValues.size (); i++)
133133 {
134134 sliderValueArray.add (sliderValues.get (i));
135135 }
136- JsonArray colorPickerValueArray = doc. createNestedArray ( " colorPickerValues" );
136+ JsonArray colorPickerValueArray = doc[ " colorPickerValues" ]. to <JsonArray>( );
137137 for (uint16_t i = 0 ; i < colorPickerValues.size (); i++)
138138 {
139139 colorPickerValueArray.add (rgb2hex (colorPickerValues.get (i)));
@@ -144,26 +144,26 @@ void ConfigClass::getApplicationStateJson(JsonDocument &doc)
144144{
145145 doc[" status" ] = FastLEDHub.getStatus ();
146146 doc[" currentAnimation" ] = FastLEDHub.getCurrentAnimationName ();
147- JsonArray animations = doc. createNestedArray ( " animations" );
147+ JsonArray animations = doc[ " animations" ]. to <JsonArray>( );
148148 for (uint8_t i = 0 ; i < FastLEDHub.animations .size (); i++)
149149 {
150150 animations.add (FastLEDHub.animations .get (i)->getName ());
151151 }
152- JsonArray sliders = doc. createNestedArray ( " sliders" );
152+ JsonArray sliders = doc[ " sliders" ]. to <JsonArray>( );
153153 for (uint8_t i = 0 ; i < FastLEDHub.sliders .size (); i++)
154154 {
155- JsonObject slider = sliders.createNestedObject ();
155+ JsonObject slider = sliders.add <JsonObject> ();
156156 slider[" name" ] = FastLEDHub.sliders .get (i)->name ;
157157 slider[" min" ] = FastLEDHub.sliders .get (i)->min ;
158158 slider[" max" ] = FastLEDHub.sliders .get (i)->max ;
159159 slider[" step" ] = FastLEDHub.sliders .get (i)->step ;
160160 slider[" value" ] = FastLEDHub.sliders .get (i)->value ;
161161 slider[" icon" ] = FastLEDHub.sliders .get (i)->icon ;
162162 }
163- JsonArray colorPickers = doc. createNestedArray ( " colorPickers" );
163+ JsonArray colorPickers = doc[ " colorPickers" ]. to <JsonArray>( );
164164 for (uint8_t i = 0 ; i < FastLEDHub.colorPickers .size (); i++)
165165 {
166- JsonObject colorPicker = colorPickers.createNestedObject ();
166+ JsonObject colorPicker = colorPickers.add <JsonObject> ();
167167 colorPicker[" name" ] = FastLEDHub.colorPickers .get (i)->name ;
168168 colorPicker[" value" ] = rgb2hex (FastLEDHub.colorPickers .get (i)->value );
169169 colorPicker[" icon" ] = FastLEDHub.colorPickers .get (i)->icon ;
@@ -172,7 +172,7 @@ void ConfigClass::getApplicationStateJson(JsonDocument &doc)
172172
173173String ConfigClass::asString (bool includeApplicationState)
174174{
175- DynamicJsonDocument doc ( 3072 ) ;
175+ JsonDocument doc;
176176
177177 getUserConfigJson (doc);
178178
0 commit comments