Merge branch 'develop'
This commit is contained in:
commit
0b5dae9e80
8 changed files with 99 additions and 90 deletions
|
@ -320,6 +320,10 @@ void setup() {
|
||||||
|
|
||||||
WiFi.setSleepMode(WIFI_NONE_SLEEP);
|
WiFi.setSleepMode(WIFI_NONE_SLEEP);
|
||||||
|
|
||||||
|
// Uncomment if you want to set static IP
|
||||||
|
// Order is: IP, Gateway and Subnet
|
||||||
|
//wifiManager.setSTAStaticIPConfig(IPAddress(192,168,0,128), IPAddress(192,168,0,1), IPAddress(255,255,255,0));
|
||||||
|
|
||||||
//fetches ssid and pass and tries to connect
|
//fetches ssid and pass and tries to connect
|
||||||
//if it does not connect it starts an access point with the specified name
|
//if it does not connect it starts an access point with the specified name
|
||||||
//here "AutoConnectAP"
|
//here "AutoConnectAP"
|
||||||
|
@ -488,18 +492,21 @@ void setup() {
|
||||||
}, handleFileUpload);
|
}, handleFileUpload);
|
||||||
//get heap status, analog input value and all GPIO statuses in one json call
|
//get heap status, analog input value and all GPIO statuses in one json call
|
||||||
server.on("/esp_status", HTTP_GET, []() {
|
server.on("/esp_status", HTTP_GET, []() {
|
||||||
//String json = "{";
|
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(9));
|
||||||
//json += "\"heap\":" + String(ESP.getFreeHeap());
|
JsonObject& json = jsonBuffer.to<JsonObject>();
|
||||||
//// json += ", \"analog\":" + String(analogRead(A0));
|
|
||||||
//// json += ", \"gpio\":" + String((uint32_t)(((GPI | GPO) & 0xFFFF) | ((GP16I & 0x01) << 16)));
|
|
||||||
//json += "}";
|
|
||||||
|
|
||||||
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(9));
|
|
||||||
JsonObject& json = jsonBuffer.createObject();
|
|
||||||
|
|
||||||
json["HOSTNAME"] = HOSTNAME;
|
json["HOSTNAME"] = HOSTNAME;
|
||||||
json["version"] = SKETCH_VERSION;
|
json["version"] = SKETCH_VERSION;
|
||||||
json["heap"] = ESP.getFreeHeap();
|
json["heap"] = ESP.getFreeHeap();
|
||||||
|
json["sketch_size"] = ESP.getSketchSize();
|
||||||
|
json["free_sketch_space"] = ESP.getFreeSketchSpace();
|
||||||
|
json["flash_chip_size"] = ESP.getFlashChipSize();
|
||||||
|
json["flash_chip_real_size"] = ESP.getFlashChipRealSize();
|
||||||
|
json["flash_chip_speed"] = ESP.getFlashChipSpeed();
|
||||||
|
json["sdk_version"] = ESP.getSdkVersion();
|
||||||
|
json["core_version"] = ESP.getCoreVersion();
|
||||||
|
json["cpu_freq"] = ESP.getCpuFreqMHz();
|
||||||
|
json["chip_id"] = ESP.getFlashChipId();
|
||||||
#ifndef USE_NEOANIMATIONFX
|
#ifndef USE_NEOANIMATIONFX
|
||||||
json["animation_lib"] = "WS2812FX";
|
json["animation_lib"] = "WS2812FX";
|
||||||
json["pin"] = PIN;
|
json["pin"] = PIN;
|
||||||
|
@ -514,22 +521,38 @@ void setup() {
|
||||||
json["button_mode"] = "OFF";
|
json["button_mode"] = "OFF";
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_AMQTT
|
#ifdef ENABLE_AMQTT
|
||||||
|
json["amqtt"] = "ON";
|
||||||
|
#endif
|
||||||
|
#ifdef ENABLE_MQTT
|
||||||
json["mqtt"] = "ON";
|
json["mqtt"] = "ON";
|
||||||
#else
|
|
||||||
json["mqtt"] = "OFF";
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_HOMEASSISTANT
|
#ifdef ENABLE_HOMEASSISTANT
|
||||||
json["home_assistant"] = "ON";
|
json["home_assistant"] = "ON";
|
||||||
#else
|
#else
|
||||||
json["home_assistant"] = "OFF";
|
json["home_assistant"] = "OFF";
|
||||||
#endif
|
#endif
|
||||||
//char buffer[json.measureLength() + 1];
|
#ifdef ENABLE_LEGACY_ANIMATIONS
|
||||||
//json.printTo(buffer, sizeof(buffer));
|
json["legacy_animations"] = "ON";
|
||||||
|
#else
|
||||||
|
json["legacy_animations"] = "OFF";
|
||||||
|
#endif
|
||||||
|
#ifdef HTTP_OTA
|
||||||
|
json["esp8266_http_updateserver"] = "ON";
|
||||||
|
#endif
|
||||||
|
#ifdef ENABLE_OTA
|
||||||
|
json["arduino_ota"] = "ON";
|
||||||
|
#endif
|
||||||
|
#ifdef ENABLE_STATE_SAVE_SPIFFS
|
||||||
|
json["state_save"] = "SPIFFS";
|
||||||
|
#endif
|
||||||
|
#ifdef ENABLE_STATE_SAVE_EEPROM
|
||||||
|
json["state_save"] = "EEPROM";
|
||||||
|
#endif
|
||||||
|
|
||||||
String json_str;
|
String json_str;
|
||||||
json.printTo(json_str);
|
serializeJson(json, json_str);
|
||||||
server.sendHeader("Access-Control-Allow-Origin", "*");
|
server.sendHeader("Access-Control-Allow-Origin", "*");
|
||||||
server.send(200, "application/json", json_str);
|
server.send(200, "application/json", json_str);
|
||||||
//json_str = String();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,6 @@ uint32_t autoParams[][4] = { // color, speed, mode, duration (seconds)
|
||||||
const char* mqtt_clientid = HOSTNAME; // MQTT ClientID
|
const char* mqtt_clientid = HOSTNAME; // MQTT ClientID
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
char mqtt_host[64] = "";
|
char mqtt_host[64] = "";
|
||||||
char mqtt_port[6] = "";
|
char mqtt_port[6] = "";
|
||||||
char mqtt_user[32] = "";
|
char mqtt_user[32] = "";
|
||||||
|
|
|
@ -92,10 +92,6 @@ void handleSetAllMode(uint8_t * mypayload) {
|
||||||
main_color.green = ((rgb >> 8) & 0xFF);
|
main_color.green = ((rgb >> 8) & 0xFF);
|
||||||
main_color.blue = ((rgb >> 0) & 0xFF);
|
main_color.blue = ((rgb >> 0) & 0xFF);
|
||||||
|
|
||||||
// for (int i = 0; i < strip.numPixels(); i++) {
|
|
||||||
// strip.setPixelColor(i, main_color.red, main_color.green, main_color.blue);
|
|
||||||
// }
|
|
||||||
// strip.show();
|
|
||||||
DBG_OUTPUT_PORT.printf("WS: Set all leds to main color: [%u] [%u] [%u]\n", main_color.red, main_color.green, main_color.blue);
|
DBG_OUTPUT_PORT.printf("WS: Set all leds to main color: [%u] [%u] [%u]\n", main_color.red, main_color.green, main_color.blue);
|
||||||
#ifdef ENABLE_LEGACY_ANIMATIONS
|
#ifdef ENABLE_LEGACY_ANIMATIONS
|
||||||
exit_func = true;
|
exit_func = true;
|
||||||
|
@ -279,18 +275,11 @@ void handleSetWS2812FXMode(uint8_t * mypayload) {
|
||||||
}
|
}
|
||||||
|
|
||||||
String listStatusJSON(void) {
|
String listStatusJSON(void) {
|
||||||
//char json[255];
|
|
||||||
//char modeName[30];
|
|
||||||
uint8_t tmp_mode = (mode == SET_MODE) ? (uint8_t) ws2812fx_mode : strip.getMode();
|
uint8_t tmp_mode = (mode == SET_MODE) ? (uint8_t) ws2812fx_mode : strip.getMode();
|
||||||
|
|
||||||
//strncpy_P(modeName, (PGM_P)strip.getModeName(tmp_mode), sizeof(modeName)); // copy from progmem
|
|
||||||
|
|
||||||
//snprintf(json, sizeof(json), "{\"mode\":%d, \"ws2812fx_mode\":%d, \"ws2812fx_mode_name\":\"%s\", \"speed\":%d, \"brightness\":%d, \"color\":[%d, %d, %d]}",
|
|
||||||
// mode, tmp_mode, modeName, ws2812fx_speed, brightness, main_color.red, main_color.green, main_color.blue);
|
|
||||||
|
|
||||||
const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6);
|
const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6);
|
||||||
DynamicJsonBuffer jsonBuffer(bufferSize);
|
DynamicJsonDocument jsonBuffer(bufferSize);
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
JsonObject& root = jsonBuffer.to<JsonObject>();
|
||||||
root["mode"] = (uint8_t) mode;
|
root["mode"] = (uint8_t) mode;
|
||||||
root["ws2812fx_mode"] = tmp_mode;
|
root["ws2812fx_mode"] = tmp_mode;
|
||||||
root["ws2812fx_mode_name"] = strip.getModeName(tmp_mode);
|
root["ws2812fx_mode_name"] = strip.getModeName(tmp_mode);
|
||||||
|
@ -301,11 +290,8 @@ String listStatusJSON(void) {
|
||||||
color.add(main_color.green);
|
color.add(main_color.green);
|
||||||
color.add(main_color.blue);
|
color.add(main_color.blue);
|
||||||
|
|
||||||
// char* json = (char*) malloc(root.measureLength() + 1);
|
|
||||||
// root.printTo(json, sizeof(json));
|
|
||||||
|
|
||||||
String json;
|
String json;
|
||||||
root.printTo(json);
|
serializeJson(root, json);
|
||||||
|
|
||||||
return json;
|
return json;
|
||||||
}
|
}
|
||||||
|
@ -316,20 +302,9 @@ void getStatusJSON() {
|
||||||
}
|
}
|
||||||
|
|
||||||
String listModesJSON(void) {
|
String listModesJSON(void) {
|
||||||
// String modes = "[";
|
|
||||||
// for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
|
||||||
// modes += "{\"mode\":";
|
|
||||||
// modes += i;
|
|
||||||
// modes += ", \"name\":\"";
|
|
||||||
// modes += strip.getModeName(i);
|
|
||||||
// modes += "\"},";
|
|
||||||
// }
|
|
||||||
// modes += "{}]";
|
|
||||||
// return modes;
|
|
||||||
|
|
||||||
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);
|
||||||
DynamicJsonBuffer jsonBuffer(bufferSize);
|
DynamicJsonDocument jsonBuffer(bufferSize);
|
||||||
JsonArray& json = jsonBuffer.createArray();
|
JsonArray& json = jsonBuffer.to<JsonArray>();
|
||||||
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
||||||
JsonObject& object = json.createNestedObject();
|
JsonObject& object = json.createNestedObject();
|
||||||
object["mode"] = i;
|
object["mode"] = i;
|
||||||
|
@ -338,7 +313,7 @@ String listModesJSON(void) {
|
||||||
JsonObject& object = json.createNestedObject();
|
JsonObject& object = json.createNestedObject();
|
||||||
|
|
||||||
String json_str;
|
String json_str;
|
||||||
json.printTo(json_str);
|
serializeJson(json, json_str);
|
||||||
return json_str;
|
return json_str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,7 +329,7 @@ void handleMinimalUpload() {
|
||||||
char temp[1500];
|
char temp[1500];
|
||||||
|
|
||||||
snprintf ( temp, 1500,
|
snprintf ( temp, 1500,
|
||||||
"<!DOCTYPE html>\
|
"<!DOCTYPE html>\
|
||||||
<html>\
|
<html>\
|
||||||
<head>\
|
<head>\
|
||||||
<title>ESP8266 Upload</title>\
|
<title>ESP8266 Upload</title>\
|
||||||
|
@ -790,9 +765,8 @@ 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);
|
||||||
//StaticJsonBuffer<bufferSize> jsonBuffer;
|
DynamicJsonDocument jsonBuffer(bufferSize);
|
||||||
DynamicJsonBuffer jsonBuffer(bufferSize);
|
JsonObject& root = jsonBuffer.to<JsonObject>();
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
|
||||||
|
|
||||||
root["state"] = (stateOn) ? on_cmd : off_cmd;
|
root["state"] = (stateOn) ? on_cmd : off_cmd;
|
||||||
JsonObject& color = root.createNestedObject("color");
|
JsonObject& color = root.createNestedObject("color");
|
||||||
|
@ -810,8 +784,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
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"] = modeName;
|
||||||
|
|
||||||
char buffer[root.measureLength() + 1];
|
char buffer[measureJson(root) + 1];
|
||||||
root.printTo(buffer, sizeof(buffer));
|
serializeJson(root, buffer, sizeof(buffer));
|
||||||
|
|
||||||
#ifdef ENABLE_MQTT
|
#ifdef ENABLE_MQTT
|
||||||
mqtt_client.publish(mqtt_ha_state_out.c_str(), buffer, true);
|
mqtt_client.publish(mqtt_ha_state_out.c_str(), buffer, true);
|
||||||
|
@ -828,16 +802,16 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
|
|
||||||
bool processJson(char* message) {
|
bool processJson(char* message) {
|
||||||
const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(5) + 150;
|
const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(5) + 150;
|
||||||
//StaticJsonBuffer<bufferSize> jsonBuffer;
|
DynamicJsonDocument jsonBuffer(bufferSize);
|
||||||
DynamicJsonBuffer jsonBuffer(bufferSize);
|
DeserializationError error = deserializeJson(jsonBuffer, message);
|
||||||
JsonObject& root = jsonBuffer.parseObject(message);
|
if (error) {
|
||||||
|
DBG_OUTPUT_PORT.print("parseObject() failed: ");
|
||||||
if (!root.success()) {
|
DBG_OUTPUT_PORT.println(error.c_str());
|
||||||
DBG_OUTPUT_PORT.println("parseObject() failed");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//DBG_OUTPUT_PORT.println("JSON ParseObject() done!");
|
//DBG_OUTPUT_PORT.println("JSON ParseObject() done!");
|
||||||
|
JsonObject& root = jsonBuffer.as<JsonObject>();
|
||||||
|
|
||||||
if (root.containsKey("state")) {
|
if (root.containsKey("state")) {
|
||||||
const char* state_in = root["state"];
|
const char* state_in = root["state"];
|
||||||
if (strcmp(state_in, on_cmd) == 0 and !(animation_on)) {
|
if (strcmp(state_in, on_cmd) == 0 and !(animation_on)) {
|
||||||
|
@ -886,7 +860,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
|
|
||||||
if (root.containsKey("effect")) {
|
if (root.containsKey("effect")) {
|
||||||
animation_on = true;
|
animation_on = true;
|
||||||
String effectString = root["effect"].asString();
|
String effectString = root["effect"].as<String>();
|
||||||
|
|
||||||
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
||||||
if(String(strip.getModeName(i)) == effectString) {
|
if(String(strip.getModeName(i)) == effectString) {
|
||||||
|
@ -963,8 +937,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
ha_send_data.detach();
|
ha_send_data.detach();
|
||||||
mqtt_client.subscribe(mqtt_ha_state_in.c_str(), qossub);
|
mqtt_client.subscribe(mqtt_ha_state_in.c_str(), qossub);
|
||||||
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
|
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
|
||||||
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
|
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
|
||||||
JsonObject& json = jsonBuffer.createObject();
|
JsonObject& json = jsonBuffer.to<JsonObject>();
|
||||||
json["name"] = HOSTNAME;
|
json["name"] = HOSTNAME;
|
||||||
json["platform"] = "mqtt_json";
|
json["platform"] = "mqtt_json";
|
||||||
json["state_topic"] = mqtt_ha_state_out;
|
json["state_topic"] = mqtt_ha_state_out;
|
||||||
|
@ -979,8 +953,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
||||||
effect_list.add(strip.getModeName(i));
|
effect_list.add(strip.getModeName(i));
|
||||||
}
|
}
|
||||||
char buffer[json.measureLength() + 1];
|
char buffer[json.measureJson() + 1];
|
||||||
json.printTo(buffer, sizeof(buffer));
|
serializeJson(json, buffer, sizeof(buffer));
|
||||||
mqtt_client.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), buffer, true);
|
mqtt_client.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), buffer, true);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -1043,8 +1017,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
uint16_t packetIdSub2 = amqttClient.subscribe((char *)mqtt_ha_state_in.c_str(), qossub);
|
uint16_t packetIdSub2 = amqttClient.subscribe((char *)mqtt_ha_state_in.c_str(), qossub);
|
||||||
DBG_OUTPUT_PORT.printf("Subscribing at QoS %d, packetId: ", qossub); DBG_OUTPUT_PORT.println(packetIdSub2);
|
DBG_OUTPUT_PORT.printf("Subscribing at QoS %d, packetId: ", qossub); DBG_OUTPUT_PORT.println(packetIdSub2);
|
||||||
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
|
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
|
||||||
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
|
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
|
||||||
JsonObject& json = jsonBuffer.createObject();
|
JsonObject& json = jsonBuffer.to<JsonObject>();
|
||||||
json["name"] = HOSTNAME;
|
json["name"] = HOSTNAME;
|
||||||
json["platform"] = "mqtt_json";
|
json["platform"] = "mqtt_json";
|
||||||
json["state_topic"] = mqtt_ha_state_out;
|
json["state_topic"] = mqtt_ha_state_out;
|
||||||
|
@ -1059,8 +1033,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||||
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
|
||||||
effect_list.add(strip.getModeName(i));
|
effect_list.add(strip.getModeName(i));
|
||||||
}
|
}
|
||||||
char buffer[json.measureLength() + 1];
|
char buffer[json.measureJson() + 1];
|
||||||
json.printTo(buffer, sizeof(buffer));
|
serializeJson(json, buffer, sizeof(buffer));
|
||||||
DBG_OUTPUT_PORT.println(buffer);
|
DBG_OUTPUT_PORT.println(buffer);
|
||||||
amqttClient.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), qospub, true, buffer);
|
amqttClient.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), qospub, true, buffer);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1213,9 +1187,8 @@ bool writeConfigFS(bool saveConfig){
|
||||||
//FS save
|
//FS save
|
||||||
updateFS = true;
|
updateFS = true;
|
||||||
DBG_OUTPUT_PORT.print("Saving config: ");
|
DBG_OUTPUT_PORT.print("Saving config: ");
|
||||||
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(4));
|
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4));
|
||||||
// StaticJsonBuffer<JSON_OBJECT_SIZE(4)> jsonBuffer;
|
JsonObject& json = jsonBuffer.to<JsonObject>();
|
||||||
JsonObject& json = jsonBuffer.createObject();
|
|
||||||
json["mqtt_host"] = mqtt_host;
|
json["mqtt_host"] = mqtt_host;
|
||||||
json["mqtt_port"] = mqtt_port;
|
json["mqtt_port"] = mqtt_port;
|
||||||
json["mqtt_user"] = mqtt_user;
|
json["mqtt_user"] = mqtt_user;
|
||||||
|
@ -1225,8 +1198,8 @@ bool writeConfigFS(bool saveConfig){
|
||||||
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");
|
||||||
|
|
||||||
json.printTo(DBG_OUTPUT_PORT);
|
serializeJson(json, DBG_OUTPUT_PORT);
|
||||||
json.printTo(configFile);
|
serializeJson(json, configFile);
|
||||||
configFile.close();
|
configFile.close();
|
||||||
updateFS = false;
|
updateFS = false;
|
||||||
return true;
|
return true;
|
||||||
|
@ -1250,13 +1223,13 @@ bool readConfigFS() {
|
||||||
size_t size = configFile.size();
|
size_t size = configFile.size();
|
||||||
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(4)+300);
|
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4)+300);
|
||||||
// StaticJsonBuffer<JSON_OBJECT_SIZE(4)+300> jsonBuffer;
|
DeserializationError error = deserializeJson(jsonBuffer, buf.get());
|
||||||
JsonObject& json = jsonBuffer.parseObject(buf.get());
|
|
||||||
DBG_OUTPUT_PORT.print("Config: ");
|
DBG_OUTPUT_PORT.print("Config: ");
|
||||||
json.printTo(DBG_OUTPUT_PORT);
|
if (!error) {
|
||||||
if (json.success()) {
|
|
||||||
DBG_OUTPUT_PORT.println(" Parsed!");
|
DBG_OUTPUT_PORT.println(" Parsed!");
|
||||||
|
JsonObject& json = jsonBuffer.as<JsonObject>();
|
||||||
|
serializeJson(json, DBG_OUTPUT_PORT);
|
||||||
strcpy(mqtt_host, json["mqtt_host"]);
|
strcpy(mqtt_host, json["mqtt_host"]);
|
||||||
strcpy(mqtt_port, json["mqtt_port"]);
|
strcpy(mqtt_port, json["mqtt_port"]);
|
||||||
strcpy(mqtt_user, json["mqtt_user"]);
|
strcpy(mqtt_user, json["mqtt_user"]);
|
||||||
|
@ -1264,7 +1237,8 @@ bool readConfigFS() {
|
||||||
updateFS = false;
|
updateFS = false;
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
DBG_OUTPUT_PORT.println("Failed to load json config");
|
DBG_OUTPUT_PORT.print("Failed to load json config: ");
|
||||||
|
DBG_OUTPUT_PORT.println(error.c_str());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DBG_OUTPUT_PORT.println("Failed to open /config.json");
|
DBG_OUTPUT_PORT.println("Failed to open /config.json");
|
||||||
|
@ -1282,9 +1256,8 @@ 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(7));
|
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7));
|
||||||
// StaticJsonBuffer<JSON_OBJECT_SIZE(7)> jsonBuffer;
|
JsonObject& json = jsonBuffer.to<JsonObject>();
|
||||||
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;
|
||||||
|
@ -1302,8 +1275,8 @@ bool writeStateFS(){
|
||||||
updateStateFS = false;
|
updateStateFS = false;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
json.printTo(DBG_OUTPUT_PORT);
|
serializeJson(json, DBG_OUTPUT_PORT);
|
||||||
json.printTo(configFile);
|
serializeJson(json, configFile);
|
||||||
configFile.close();
|
configFile.close();
|
||||||
updateFS = false;
|
updateFS = false;
|
||||||
spiffs_save_state.detach();
|
spiffs_save_state.detach();
|
||||||
|
@ -1325,11 +1298,11 @@ 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(7)+200);
|
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7)+200);
|
||||||
// StaticJsonBuffer<JSON_OBJECT_SIZE(7)+200> jsonBuffer;
|
DeserializationError error = deserializeJson(jsonBuffer, buf.get());
|
||||||
JsonObject& json = jsonBuffer.parseObject(buf.get());
|
if (!error) {
|
||||||
json.printTo(DBG_OUTPUT_PORT);
|
JsonObject& json = jsonBuffer.as<JsonObject>();
|
||||||
if (json.success()) {
|
serializeJson(json, DBG_OUTPUT_PORT);
|
||||||
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"];
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define SKETCH_VERSION "2.1.1"
|
#define SKETCH_VERSION "2.1.2"
|
||||||
|
|
|
@ -6,4 +6,8 @@
|
||||||
* 11 May 2018 v 2.1.1
|
* 11 May 2018 v 2.1.1
|
||||||
* - Use ArduinoJSON to send JSON replies
|
* - Use ArduinoJSON to send JSON replies
|
||||||
* - Add strip.trigger()
|
* - Add strip.trigger()
|
||||||
|
*
|
||||||
|
* 17 Jun 2018 v 2.1.2
|
||||||
|
* - Upgrade to ArduinoJSON 6.xx from ArduinoJSON 5.xx
|
||||||
|
* - Added example for static IP
|
||||||
*/
|
*/
|
||||||
|
|
BIN
documentation/pcb/Gerber.zip
Normal file
BIN
documentation/pcb/Gerber.zip
Normal file
Binary file not shown.
BIN
documentation/pcb/PCB_Schematic.pdf
Normal file
BIN
documentation/pcb/PCB_Schematic.pdf
Normal file
Binary file not shown.
10
documentation/pcb/Photo View.svg
Normal file
10
documentation/pcb/Photo View.svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 119 KiB |
Loading…
Reference in a new issue