asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Forgot to save "speed" in spiffs, set strip mode after read

Browse source 
* Added speed to SPIFFS save
* Should set strip state after succesful read.
This commit is contained in:
debsahu 2018-03-23 20:43:51 -04:00
parent 8b21969784
commit 980bd40567
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Arduino/McLighting/request_handlers.h
View file

@ -1205,12 +1205,13 @@ bool writeStateFS(){
updateFS = true; updateFS = true;
//save the strip state to FS JSON //save the strip state to FS JSON
DBG_OUTPUT_PORT.print("Saving cfg: "); DBG_OUTPUT_PORT.print("Saving cfg: ");
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(6)); DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(7));
// StaticJsonBuffer<JSON_OBJECT_SIZE(6)> jsonBuffer; // StaticJsonBuffer<JSON_OBJECT_SIZE(7)> jsonBuffer;
JsonObject& json = jsonBuffer.createObject(); JsonObject& json = jsonBuffer.createObject();
json["mode"] = static_cast<int>(mode); json["mode"] = static_cast<int>(mode);
json["strip_mode"] = (int) strip.getMode(); json["strip_mode"] = (int) strip.getMode();
json["brightness"] = brightness; json["brightness"] = brightness;
json["speed"] = ws2812fx_speed;
json["red"] = main_color.red; json["red"] = main_color.red;
json["green"] = main_color.green; json["green"] = main_color.green;
json["blue"] = main_color.blue; json["blue"] = main_color.blue;
@ -1247,17 +1248,24 @@ bool readStateFS() {
// Allocate a buffer to store contents of the file. // Allocate a buffer to store contents of the file.
std::unique_ptr<char[]> buf(new char[size]); std::unique_ptr<char[]> buf(new char[size]);
configFile.readBytes(buf.get(), size); configFile.readBytes(buf.get(), size);
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(6)+170); DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(7)+200);
// StaticJsonBuffer<JSON_OBJECT_SIZE(6)+170> jsonBuffer; // StaticJsonBuffer<JSON_OBJECT_SIZE(7)+200> jsonBuffer;
JsonObject& json = jsonBuffer.parseObject(buf.get()); JsonObject& json = jsonBuffer.parseObject(buf.get());
json.printTo(DBG_OUTPUT_PORT); json.printTo(DBG_OUTPUT_PORT);
if (json.success()) { if (json.success()) {
mode = static_cast<MODE>((int) json["mode"]); mode = static_cast<MODE>((int) json["mode"]);
ws2812fx_mode = json["strip_mode"]; ws2812fx_mode = json["strip_mode"];
brightness = json["brightness"]; brightness = json["brightness"];
ws2812fx_speed = json["speed"];
main_color.red = json["red"]; main_color.red = json["red"];
main_color.green = json["green"]; main_color.green = json["green"];
main_color.blue = json["blue"]; main_color.blue = json["blue"];
strip.setMode(ws2812fx_mode);
strip.setSpeed(convertSpeed(ws2812fx_speed));
strip.setBrightness(brightness);
strip.setColor(main_color.red, main_color.green, main_color.blue);
updateFS = false; updateFS = false;
return true; return true;
} else { } else {