diff --git a/ConfigSettings.h b/ConfigSettings.h index bea2f18..e954c0c 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,7 +3,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v1.6.0beta" +#define FW_VERSION "v1.6.0" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index 98a49d7..e9de3a7 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin index 646642b..8c8a437 100644 Binary files a/SomfyController.littlefs.bin and b/SomfyController.littlefs.bin differ diff --git a/Web.cpp b/Web.cpp index 524a37b..d79fbcb 100644 --- a/Web.cpp +++ b/Web.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -918,57 +917,6 @@ void Web::begin() { server.send(200, _encoding_json, g_content); } }); - /* - server.on("/pairShade", []() { - webServer.sendCORSHeaders(); - HTTPMethod method = server.method(); - if (method == HTTP_PUT || method == HTTP_POST) { - uint8_t shadeId = 255; - if (server.hasArg("plain")) { - // Its coming in the body. - DynamicJsonDocument doc(512); - DeserializationError err = deserializeJson(doc, server.arg("plain")); - if (err) { - switch (err.code()) { - case DeserializationError::InvalidInput: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Invalid JSON payload\"}")); - break; - case DeserializationError::NoMemory: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Out of memory parsing JSON\"}")); - break; - default: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"General JSON Deserialization failed\"}")); - break; - } - } - else { - JsonObject obj = doc.as(); - if (obj.containsKey("shadeId")) shadeId = obj["shadeId"]; - } - } - else if (server.hasArg("shadeId")) - shadeId = atoi(server.arg("shadeId").c_str()); - SomfyShade* shade = nullptr; - if (shadeId != 255) shade = somfy.getShadeById(shadeId); - if (!shade) { - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Shade not found to pair\"}")); - } - else { - //if(shade->bitLength == 56) - shade->sendCommand(somfy_commands::Prog, 4); - //else - // shade->sendCommand(somfy_commands::Prog, 1); - shade->paired = true; - shade->save(); - DynamicJsonDocument doc(512); - JsonObject obj = doc.to(); - shade->toJSON(obj); - serializeJson(doc, g_content); - server.send(200, _encoding_json, g_content); - } - } - }); - */ server.on("/unpairShade", []() { webServer.sendCORSHeaders(); HTTPMethod method = server.method(); diff --git a/data/index.html b/data/index.html index c3a8cab..b9b879e 100644 --- a/data/index.html +++ b/data/index.html @@ -3,10 +3,10 @@ - - + + - +
@@ -216,23 +216,25 @@