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

Merge pull request #293 from toblum/develop

Browse source 
v2.1.9
This commit is contained in:
Debashish Sahu 2018-12-13 11:22:57 -05:00 committed by GitHub
commit a07fdd6baf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Arduino/McLighting/McLighting.ino
View file

@ -53,8 +53,8 @@
#endif #endif
#ifdef ARDUINOJSON_VERSION #ifdef ARDUINOJSON_VERSION
#if !(ARDUINOJSON_VERSION_MAJOR == 6 and ARDUINOJSON_VERSION_MINOR == 6) #if !(ARDUINOJSON_VERSION_MAJOR == 6 and ARDUINOJSON_VERSION_MINOR == 7)
#error "Install ArduinoJson v6.6.0-beta" #error "Install ArduinoJson v6.7.0-beta"
#endif #endif
#endif #endif

12
Arduino/McLighting/request_handlers.h
View file

@ -765,7 +765,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
} }
void sendState() { void sendState() {
const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(6); const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(6) + 500;
DynamicJsonDocument jsonBuffer(bufferSize); DynamicJsonDocument jsonBuffer(bufferSize);
JsonObject root = jsonBuffer.to<JsonObject>(); JsonObject root = jsonBuffer.to<JsonObject>();
@ -781,9 +781,9 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
root["speed"] = ws2812fx_speed; root["speed"] = ws2812fx_speed;
char modeName[30]; //char modeName[30];
strncpy_P(modeName, (PGM_P)strip.getModeName(strip.getMode()), sizeof(modeName)); // copy from progmem //strncpy_P(modeName, (PGM_P)strip.getModeName(strip.getMode()), sizeof(modeName)); // copy from progmem
root["effect"] = modeName; root["effect"] = strip.getModeName(strip.getMode());
char buffer[measureJson(root) + 1]; char buffer[measureJson(root) + 1];
serializeJson(root, buffer, sizeof(buffer)); serializeJson(root, buffer, sizeof(buffer));
@ -1203,7 +1203,7 @@ bool writeConfigFS(bool saveConfig){
json["mqtt_user"] = mqtt_user; json["mqtt_user"] = mqtt_user;
json["mqtt_pass"] = mqtt_pass; json["mqtt_pass"] = mqtt_pass;
// SPIFFS.remove("/config.json") ? DBG_OUTPUT_PORT.println("removed file") : DBG_OUTPUT_PORT.println("failed removing file"); //SPIFFS.remove("/config.json") ? DBG_OUTPUT_PORT.println("removed file") : DBG_OUTPUT_PORT.println("failed removing file");
File configFile = SPIFFS.open("/config.json", "w"); File configFile = SPIFFS.open("/config.json", "w");
if (!configFile) DBG_OUTPUT_PORT.println("failed to open config file for writing"); if (!configFile) DBG_OUTPUT_PORT.println("failed to open config file for writing");
@ -1275,7 +1275,7 @@ bool writeStateFS(){
json["green"] = main_color.green; json["green"] = main_color.green;
json["blue"] = main_color.blue; json["blue"] = main_color.blue;
// SPIFFS.remove("/state.json") ? DBG_OUTPUT_PORT.println("removed file") : DBG_OUTPUT_PORT.println("failed removing file"); //SPIFFS.remove("/stripstate.json") ? DBG_OUTPUT_PORT.println("removed file") : DBG_OUTPUT_PORT.println("failed removing file");
File configFile = SPIFFS.open("/stripstate.json", "w"); File configFile = SPIFFS.open("/stripstate.json", "w");
if (!configFile) { if (!configFile) {
DBG_OUTPUT_PORT.println("Failed!"); DBG_OUTPUT_PORT.println("Failed!");

2
Arduino/McLighting/version.h
View file

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

6
Arduino/McLighting/version_info.ino
View file

@ -35,4 +35,10 @@
* 11 Dec 2018 v 2.1.8 * 11 Dec 2018 v 2.1.8
* - Fix Auto-Discovery for HA version >= 0.84 #286 * - Fix Auto-Discovery for HA version >= 0.84 #286
* - Fix #283 * - Fix #283
*
* 13 Dec 2018 v 2.1.9
* - HA is not getting the correct animation name being run, boils down to changes to ArduinoJson library
* - 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
*/ */