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

Merge pull request #203 from toblum/develop

Browse source 
Develop
This commit is contained in:
Tobias Blum 2018-07-09 18:37:45 +02:00 committed by GitHub
commit 94059ebecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Arduino/McLighting/McLighting.ino
View file

@ -319,6 +319,10 @@ void setup() {
#endif #endif
WiFi.setSleepMode(WIFI_NONE_SLEEP); WiFi.setSleepMode(WIFI_NONE_SLEEP);
// Uncomment if you want to restart ESP8266 if it cannot connect to WiFi.
// Value in brackets is in seconds that WiFiManger waits until restart
//wifiManager.setConfigPortalTimeout(180);
// Uncomment if you want to set static IP // Uncomment if you want to set static IP
// Order is: IP, Gateway and Subnet // Order is: IP, Gateway and Subnet
@ -331,8 +335,8 @@ void setup() {
if (!wifiManager.autoConnect(HOSTNAME)) { if (!wifiManager.autoConnect(HOSTNAME)) {
DBG_OUTPUT_PORT.println("failed to connect and hit timeout"); DBG_OUTPUT_PORT.println("failed to connect and hit timeout");
//reset and try again, or maybe put it to deep sleep //reset and try again, or maybe put it to deep sleep
ESP.reset(); ESP.reset(); //Will be removed when upgrading to standalone offline McLightingUI version
delay(1000); delay(1000); //Will be removed when upgrading to standalone offline McLightingUI version
} }
#if defined(ENABLE_MQTT) or defined(ENABLE_AMQTT) #if defined(ENABLE_MQTT) or defined(ENABLE_AMQTT)
@ -493,7 +497,7 @@ void setup() {
//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, []() {
DynamicJsonDocument jsonBuffer; DynamicJsonDocument jsonBuffer;
JsonObject& json = jsonBuffer.to<JsonObject>(); JsonObject json = jsonBuffer.to<JsonObject>();
json["HOSTNAME"] = HOSTNAME; json["HOSTNAME"] = HOSTNAME;
json["version"] = SKETCH_VERSION; json["version"] = SKETCH_VERSION;

34
Arduino/McLighting/request_handlers.h
View file

@ -279,13 +279,13 @@ String listStatusJSON(void) {
const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6); const size_t bufferSize = JSON_ARRAY_SIZE(3) + JSON_OBJECT_SIZE(6);
DynamicJsonDocument jsonBuffer(bufferSize); DynamicJsonDocument jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.to<JsonObject>(); 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);
root["speed"] = ws2812fx_speed; root["speed"] = ws2812fx_speed;
root["brightness"] = brightness; root["brightness"] = brightness;
JsonArray& color = root.createNestedArray("color"); JsonArray color = root.createNestedArray("color");
color.add(main_color.red); color.add(main_color.red);
color.add(main_color.green); color.add(main_color.green);
color.add(main_color.blue); color.add(main_color.blue);
@ -304,13 +304,13 @@ void getStatusJSON() {
String listModesJSON(void) { String listModesJSON(void) {
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);
DynamicJsonDocument jsonBuffer(bufferSize); DynamicJsonDocument jsonBuffer(bufferSize);
JsonArray& json = jsonBuffer.to<JsonArray>(); 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;
object["name"] = strip.getModeName(i); object["name"] = strip.getModeName(i);
} }
JsonObject& object = json.createNestedObject(); JsonObject object = json.createNestedObject();
String json_str; String json_str;
serializeJson(json, json_str); serializeJson(json, json_str);
@ -766,10 +766,10 @@ 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);
DynamicJsonDocument jsonBuffer(bufferSize); DynamicJsonDocument jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.to<JsonObject>(); JsonObject root = jsonBuffer.to<JsonObject>();
root["state"] = (stateOn) ? on_cmd : off_cmd; root["state"] = (stateOn) ? on_cmd : off_cmd;
JsonObject& color = root.createNestedObject("color"); JsonObject color = root.createNestedObject("color");
color["r"] = main_color.red; color["r"] = main_color.red;
color["g"] = main_color.green; color["g"] = main_color.green;
color["b"] = main_color.blue; color["b"] = main_color.blue;
@ -810,7 +810,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
return false; return false;
} }
//DBG_OUTPUT_PORT.println("JSON ParseObject() done!"); //DBG_OUTPUT_PORT.println("JSON ParseObject() done!");
JsonObject& root = jsonBuffer.as<JsonObject>(); 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"];
@ -828,7 +828,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
} }
if (root.containsKey("color")) { if (root.containsKey("color")) {
JsonObject& color = root["color"]; JsonObject color = root["color"];
main_color.red = (uint8_t) color["r"]; main_color.red = (uint8_t) color["r"];
main_color.green = (uint8_t) color["g"]; main_color.green = (uint8_t) color["g"];
main_color.blue = (uint8_t) color["b"]; main_color.blue = (uint8_t) color["b"];
@ -938,7 +938,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
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
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11)); DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.to<JsonObject>(); 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;
@ -949,7 +949,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
json["optimistic"] = "false"; json["optimistic"] = "false";
json["color_temp"] = "true"; json["color_temp"] = "true";
json["effect"] = "true"; json["effect"] = "true";
JsonArray& effect_list = json.createNestedArray("effect_list"); JsonArray effect_list = json.createNestedArray("effect_list");
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));
} }
@ -1018,7 +1018,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
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
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11)); DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip.getModeCount()) + JSON_OBJECT_SIZE(11));
JsonObject& json = jsonBuffer.to<JsonObject>(); 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;
@ -1029,7 +1029,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
json["optimistic"] = "false"; json["optimistic"] = "false";
json["color_temp"] = "true"; json["color_temp"] = "true";
json["effect"] = "true"; json["effect"] = "true";
JsonArray& effect_list = json.createNestedArray("effect_list"); JsonArray effect_list = json.createNestedArray("effect_list");
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));
} }
@ -1188,7 +1188,7 @@ bool writeConfigFS(bool saveConfig){
updateFS = true; updateFS = true;
DBG_OUTPUT_PORT.print("Saving config: "); DBG_OUTPUT_PORT.print("Saving config: ");
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4)); DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(4));
JsonObject& json = jsonBuffer.to<JsonObject>(); JsonObject json = jsonBuffer.to<JsonObject>();
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;
@ -1228,7 +1228,7 @@ bool readConfigFS() {
DBG_OUTPUT_PORT.print("Config: "); DBG_OUTPUT_PORT.print("Config: ");
if (!error) { if (!error) {
DBG_OUTPUT_PORT.println(" Parsed!"); DBG_OUTPUT_PORT.println(" Parsed!");
JsonObject& json = jsonBuffer.as<JsonObject>(); JsonObject json = jsonBuffer.as<JsonObject>();
serializeJson(json, DBG_OUTPUT_PORT); 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"]);
@ -1257,7 +1257,7 @@ bool writeStateFS(){
//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: ");
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7)); DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7));
JsonObject& json = jsonBuffer.to<JsonObject>(); JsonObject json = jsonBuffer.to<JsonObject>();
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;
@ -1301,7 +1301,7 @@ bool readStateFS() {
DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7)+200); DynamicJsonDocument jsonBuffer(JSON_OBJECT_SIZE(7)+200);
DeserializationError error = deserializeJson(jsonBuffer, buf.get()); DeserializationError error = deserializeJson(jsonBuffer, buf.get());
if (!error) { if (!error) {
JsonObject& json = jsonBuffer.as<JsonObject>(); JsonObject json = jsonBuffer.as<JsonObject>();
serializeJson(json, DBG_OUTPUT_PORT); 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"];

2
Arduino/McLighting/version.h
View file

@ -1 +1 @@
#define SKETCH_VERSION "2.1.2" #define SKETCH_VERSION "2.1.3"

3
Arduino/McLighting/version_info.ino
View file

@ -11,4 +11,7 @@
* - Upgrade to ArduinoJSON 6.xx from ArduinoJSON 5.xx * - Upgrade to ArduinoJSON 6.xx from ArduinoJSON 5.xx
* - Added example for static IP * - Added example for static IP
* - Added more internal variables to /esp_status * - Added more internal variables to /esp_status
*
* 5 Jul 2018 c 2.1.3
* - Fixes for ArduinoJson 6.1.0-beta
*/ */