simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

update to 2.1.2

Browse Source
This commit is contained in:
BPoH_Voodoo
2018-07-08 21:10:39 +02:00
parent 00f6ab5b58
commit 1bbff1eb4a
8 changed files with 157 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/request_handlers.h
+84 -102
View File
@@ -97,10 +97,6 @@ void handleSetAllMode(uint8_t * mypayload) {
main_color.green = ((rgb >> 8) & 0xFF);
main_color.blue = ((rgb ) & 0xFF);
// for (int i = 0; i < strip.numPixels(); i++) {
// strip.setPixelColor(i, main_color.red, main_color.green, main_color.blue, main_color.white);
// }
// strip.show();
DBG_OUTPUT_PORT.printf("WS: Set all leds to main color: W: [%u] R: [%u] G: [%u] B: [%u]\n", main_color.white, main_color.red, main_color.green, main_color.blue);
#ifdef ENABLE_LEGACY_ANIMATIONS
exit_func = true;
@@ -296,18 +292,11 @@ void handleSetWS2812FXMode(uint8_t * mypayload) {
}
String listStatusJSON(void) {
//char json[255];
//char modeName[30];
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);
DynamicJsonBuffer jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.to<JsonObject>();
root["mode"] = (uint8_t) mode;
root["ws2812fx_mode"] = tmp_mode;
root["ws2812fx_mode_name"] = strip.getModeName(tmp_mode);
@@ -319,11 +308,8 @@ String listStatusJSON(void) {
color.add(main_color.green);
color.add(main_color.blue);
// char* json = (char*) malloc(root.measureLength() + 1);
// root.printTo(json, sizeof(json));
String json;
root.printTo(json);
serializeJson(root, json);
return json;
}
@@ -334,20 +320,9 @@ void getStatusJSON() {
}
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);
DynamicJsonBuffer jsonBuffer(bufferSize);
JsonArray& json = jsonBuffer.createArray();
DynamicJsonDocument jsonBuffer(bufferSize);
JsonArray& json = jsonBuffer.to<JsonArray>();
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
JsonObject& object = json.createNestedObject();
object["mode"] = i;
@@ -356,7 +331,7 @@ String listModesJSON(void) {
JsonObject& object = json.createNestedObject();
String json_str;
json.printTo(json_str);
serializeJson(json, json_str);
return json_str;
}
@@ -372,7 +347,7 @@ void handleMinimalUpload() {
char temp[1500];
snprintf ( temp, 1500,
"<!DOCTYPE html>\
"<!DOCTYPE html>\
<html>\
<head>\
<title>ESP8266 Upload</title>\
@@ -470,7 +445,7 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
if (payload[0] == '?') {
uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10);
ws2812fx_speed = constrain(d, 0, 255);
strip.setSpeed(convertSpeed(ws2812fx_speed));
mode = SETSPEED;
Dbg_Prefix(mqtt, num);
DBG_OUTPUT_PORT.printf("Set speed to: [%u]\n", ws2812fx_speed);
#ifdef ENABLE_HOMEASSISTANT
@@ -488,7 +463,7 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
if (payload[0] == '%') {
uint8_t b = (uint8_t) strtol((const char *) &payload[1], NULL, 10);
brightness = constrain(b, 0, 255);
strip.setBrightness(brightness);
mode = BRIGHTNESS;
Dbg_Prefix(mqtt, num);
DBG_OUTPUT_PORT.printf("Set brightness to: [%u]\n", brightness);
#ifdef ENABLE_MQTT
@@ -593,41 +568,51 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
// $ ==> Get status Info.
if (payload[0] == '$') {
String json = listStatusJSON();
Dbg_Prefix(mqtt, num);
if (mqtt == true) {
DBG_OUTPUT_PORT.print("MQTT: ");
#ifdef ENABLE_MQTT
mqtt_client.publish(mqtt_outtopic, json.c_str());
#endif
#ifdef ENABLE_AMQTT
amqttClient.publish(mqtt_outtopic.c_str(), qospub, false, json.c_str());
#endif
} else {
DBG_OUTPUT_PORT.print("WS: ");
webSocket.sendTXT(num, "OK");
webSocket.sendTXT(num, json);
}
DBG_OUTPUT_PORT.println("Get status info: " + json);
webSocket.sendTXT(num, json);
#ifdef ENABLE_MQTT
mqtt_client.publish(mqtt_outtopic, listStatusJSON());
#endif
#ifdef ENABLE_AMQTT
String liststat = (String) listStatusJSON();
amqttClient.publish(mqtt_outtopic.c_str(), qospub, false, liststat.c_str());
#endif
}
// ~ ==> Get WS2812 modes.
if (payload[0] == '~') {
String json = listModesJSON();
Dbg_Prefix(mqtt, num);
if (mqtt == true) {
DBG_OUTPUT_PORT.print("MQTT: ");
#ifdef ENABLE_MQTT
// TODO: Fix this, doesn't return anything. Too long?
// Hint: https://github.com/knolleary/pubsubclient/issues/110
DBG_OUTPUT_PORT.printf("Error: Not implemented. Message too large for pubsubclient.");
mqtt_client.publish(mqtt_outtopic, "ERROR: Not implemented. Message too large for pubsubclient.");
//String json_modes = listModesJSON();
//DBG_OUTPUT_PORT.printf(json_modes.c_str());
//int res = mqtt_client.publish(mqtt_outtopic, json_modes.c_str(), json_modes.length());
//DBG_OUTPUT_PORT.printf("Result: %d / %d", res, json_modes.length());
#endif
#ifdef ENABLE_AMQTT
amqttClient.publish(mqtt_outtopic.c_str(), qospub, false, json.c_str());
#endif
} else {
DBG_OUTPUT_PORT.print("WS: ");
webSocket.sendTXT(num, "OK");
webSocket.sendTXT(num, json);
}
DBG_OUTPUT_PORT.println("Get WS2812 modes.");
DBG_OUTPUT_PORT.println(json);
#ifdef ENABLE_MQTT
DBG_OUTPUT_PORT.printf("Error: Not implemented. Message too large for pubsubclient.");
mqtt_client.publish(mqtt_outtopic, "ERROR: Not implemented. Message too large for pubsubclient.");
//String json_modes = listModesJSON();
//DBG_OUTPUT_PORT.printf(json_modes.c_str());
//int res = mqtt_client.publish(mqtt_outtopic, json_modes.c_str(), json_modes.length());
//DBG_OUTPUT_PORT.printf("Result: %d / %d", res, json_modes.length());
#endif
#ifdef ENABLE_AMQTT
amqttClient.publish(mqtt_outtopic.c_str(), qospub, false, json.c_str());
#endif
}
// / ==> Set WS2812 mode.
// TODO: Fix this, doesn't return anything. Too long?
// Hint: https://github.com/knolleary/pubsubclient/issues/110
if (payload[0] == '/') {
handleSetWS2812FXMode(payload);
Dbg_Prefix(mqtt, num);
@@ -648,7 +633,6 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
}
}
// ***************************************************************************
// WS request handlers
// ***************************************************************************
@@ -764,9 +748,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
void sendState() {
const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(6);
//StaticJsonBuffer<bufferSize> jsonBuffer;
DynamicJsonBuffer jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.to<JsonObject>();
root["state"] = (stateOn) ? on_cmd : off_cmd;
JsonObject& color = root.createNestedObject("color");
@@ -784,8 +767,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
root["effect"] = modeName;
char buffer[root.measureLength() + 1];
root.printTo(buffer, sizeof(buffer));
char buffer[measureJson(root) + 1];
serializeJson(root, buffer, sizeof(buffer));
#ifdef ENABLE_MQTT
mqtt_client.publish(mqtt_ha_state_out.c_str(), buffer, true);
@@ -802,16 +785,16 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
bool processJson(char* message) {
const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(5) + 150;
//StaticJsonBuffer<bufferSize> jsonBuffer;
DynamicJsonBuffer jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.parseObject(message);
if (!root.success()) {
DBG_OUTPUT_PORT.println("parseObject() failed");
DynamicJsonDocument jsonBuffer(bufferSize);
DeserializationError error = deserializeJson(jsonBuffer, message);
if (error) {
DBG_OUTPUT_PORT.print("parseObject() failed: ");
DBG_OUTPUT_PORT.println(error.c_str());
return false;
}
//DBG_OUTPUT_PORT.println("JSON ParseObject() done!");
JsonObject& root = jsonBuffer.as<JsonObject>();
if (root.containsKey("state")) {
const char* state_in = root["state"];
if (strcmp(state_in, on_cmd) == 0 and !(animation_on)) {
@@ -860,7 +843,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
if (root.containsKey("effect")) {
animation_on = true;
String effectString = root["effect"].asString();
String effectString = root["effect"].as<String>();
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
if(String(strip.getModeName(i)) == effectString) {
@@ -937,8 +920,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
ha_send_data.detach();
mqtt_client.subscribe(mqtt_ha_state_in.c_str(), qossub);
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.to<JsonObject>();
json["name"] = HOSTNAME;
json["platform"] = "mqtt_json";
json["state_topic"] = mqtt_ha_state_out;
@@ -953,8 +936,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
effect_list.add(strip.getModeName(i));
}
char buffer[json.measureLength() + 1];
json.printTo(buffer, sizeof(buffer));
char buffer[json.measureJson() + 1];
serializeJson(json, buffer, sizeof(buffer));
mqtt_client.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), buffer, true);
#endif
#endif
@@ -1017,8 +1000,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);
DBG_OUTPUT_PORT.printf("Subscribing at QoS %d, packetId: ", qossub); DBG_OUTPUT_PORT.println(packetIdSub2);
#ifdef MQTT_HOME_ASSISTANT_SUPPORT
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.to<JsonObject>();
json["name"] = HOSTNAME;
json["platform"] = "mqtt_json";
json["state_topic"] = mqtt_ha_state_out;
@@ -1033,8 +1016,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
for (uint8_t i = 0; i < strip.getModeCount(); i++) {
effect_list.add(strip.getModeName(i));
}
char buffer[json.measureLength() + 1];
json.printTo(buffer, sizeof(buffer));
char buffer[json.measureJson() + 1];
serializeJson(json, buffer, sizeof(buffer));
DBG_OUTPUT_PORT.println(buffer);
amqttClient.publish(String("homeassistant/light/" + String(HOSTNAME) + "/config").c_str(), qospub, true, buffer);
#endif
@@ -1258,9 +1241,8 @@ bool writeConfigFS(bool saveConfig){
//FS save
updateFS = true;
DBG_OUTPUT_PORT.print("Saving config: ");
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(4));
// StaticJsonBuffer<JSON_OBJECT_SIZE(4)> jsonBuffer;
JsonObject& json = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4));
JsonObject& json = jsonBuffer.to<JsonObject>();
json["mqtt_host"] = mqtt_host;
json["mqtt_port"] = mqtt_port;
json["mqtt_user"] = mqtt_user;
@@ -1270,8 +1252,8 @@ bool writeConfigFS(bool saveConfig){
File configFile = SPIFFS.open("/config.json", "w");
if (!configFile) DBG_OUTPUT_PORT.println("failed to open config file for writing");
json.printTo(DBG_OUTPUT_PORT);
json.printTo(configFile);
serializeJson(json, DBG_OUTPUT_PORT);
serializeJson(json, configFile);
configFile.close();
updateFS = false;
return true;
@@ -1295,13 +1277,13 @@ bool readConfigFS() {
size_t size = configFile.size();
std::unique_ptr<char[]> buf(new char[size]);
configFile.readBytes(buf.get(), size);
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(4)+300);
// StaticJsonBuffer<JSON_OBJECT_SIZE(4)+300> jsonBuffer;
JsonObject& json = jsonBuffer.parseObject(buf.get());
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4)+300);
DeserializationError error = deserializeJson(jsonBuffer, buf.get());
DBG_OUTPUT_PORT.print("Config: ");
json.printTo(DBG_OUTPUT_PORT);
if (json.success()) {
if (!error) {
DBG_OUTPUT_PORT.println(" Parsed!");
JsonObject& json = jsonBuffer.as<JsonObject>();
serializeJson(json, DBG_OUTPUT_PORT);
strcpy(mqtt_host, json["mqtt_host"]);
strcpy(mqtt_port, json["mqtt_port"]);
strcpy(mqtt_user, json["mqtt_user"]);
@@ -1309,7 +1291,8 @@ bool readConfigFS() {
updateFS = false;
return true;
} 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 {
DBG_OUTPUT_PORT.println("Failed to open /config.json");
@@ -1327,9 +1310,8 @@ bool writeStateFS(){
updateFS = true;
//save the strip state to FS JSON
DBG_OUTPUT_PORT.print("Saving cfg: ");
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(7));
// StaticJsonBuffer<JSON_OBJECT_SIZE(7)> jsonBuffer;
JsonObject& json = jsonBuffer.createObject();
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7));
JsonObject& json = jsonBuffer.to<JsonObject>();
json["mode"] = static_cast<int>(mode);
json["strip_mode"] = (int) strip.getMode();
json["brightness"] = brightness;
@@ -1348,8 +1330,8 @@ bool writeStateFS(){
updateStateFS = false;
return false;
}
json.printTo(DBG_OUTPUT_PORT);
json.printTo(configFile);
serializeJson(json, DBG_OUTPUT_PORT);
serializeJson(json, configFile);
configFile.close();
updateFS = false;
spiffs_save_state.detach();
@@ -1371,11 +1353,11 @@ bool readStateFS() {
// Allocate a buffer to store contents of the file.
std::unique_ptr<char[]> buf(new char[size]);
configFile.readBytes(buf.get(), size);
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(7)+200);
// StaticJsonBuffer<JSON_OBJECT_SIZE(7)+200> jsonBuffer;
JsonObject& json = jsonBuffer.parseObject(buf.get());
json.printTo(DBG_OUTPUT_PORT);
if (json.success()) {
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7)+200);
DeserializationError error = deserializeJson(jsonBuffer, buf.get());
if (!error) {
JsonObject& json = jsonBuffer.as<JsonObject>();
serializeJson(json, DBG_OUTPUT_PORT);
mode = static_cast<MODE>((int) json["mode"]);
ws2812fx_mode = json["strip_mode"];
brightness = json["brightness"];
@@ -1399,7 +1381,7 @@ bool readStateFS() {
DBG_OUTPUT_PORT.println("Failed to open \"/stripstate.json\"");
}
} else {
DBG_OUTPUT_PORT.println("Coudnt find \"/stripstate.json\"");
DBG_OUTPUT_PORT.println("Couldn't find \"/stripstate.json\"");
}
//end read
updateFS = false;