diff --git a/ConfigSettings.h b/ConfigSettings.h index 2e00321..0db2f4d 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -2,7 +2,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v1.2.1" +#define FW_VERSION "v1.2.2" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/Network.cpp b/Network.cpp index da0dd29..bd97424 100644 --- a/Network.cpp +++ b/Network.cpp @@ -59,9 +59,9 @@ void Network::loop() { } void Network::emitSockets() { if(WiFi.status() == WL_CONNECTED) { - if(abs(abs(WiFi.RSSI()) - abs(this->lastRSSI)) > 2 || WiFi.channel() != this->lastChannel) { + if(abs(abs(WiFi.RSSI()) - abs(this->lastRSSI)) > 1 || WiFi.channel() != this->lastChannel) { char buf[128]; - snprintf(buf, sizeof(buf), "{\"ssid\":\"%s\",\"strength\":%d,\"channel\":%d}", WiFi.SSID(), WiFi.RSSI(), WiFi.channel()); + snprintf(buf, sizeof(buf), "{\"ssid\":\"%s\",\"strength\":%d,\"channel\":%d}", WiFi.SSID().c_str(), WiFi.RSSI(), WiFi.channel()); sockEmit.sendToClients("wifiStrength", buf); this->lastRSSI = WiFi.RSSI(); this->lastChannel = WiFi.channel(); @@ -73,7 +73,7 @@ void Network::emitSockets() { void Network::emitSockets(uint8_t num) { if(WiFi.status() == WL_CONNECTED) { char buf[128]; - snprintf(buf, sizeof(buf), "{\"ssid\":\"%s\",\"strength\":%d,\"channel\":%d}", WiFi.SSID(), WiFi.RSSI(), WiFi.channel()); + snprintf(buf, sizeof(buf), "{\"ssid\":\"%s\",\"strength\":%d,\"channel\":%d}", WiFi.SSID().c_str(), WiFi.RSSI(), WiFi.channel()); sockEmit.sendToClient(num, "wifiStrength", buf); this->lastRSSI = WiFi.RSSI(); this->lastChannel = WiFi.channel(); diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index 3c7a971..e597c98 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 640a550..3bbc28e 100644 Binary files a/SomfyController.littlefs.bin and b/SomfyController.littlefs.bin differ diff --git a/data/index.html b/data/index.html index 273b4a0..4ba37c1 100644 --- a/data/index.html +++ b/data/index.html @@ -3,10 +3,10 @@ - - + + - +
diff --git a/data/index.js b/data/index.js index f228bff..45954c2 100644 --- a/data/index.js +++ b/data/index.js @@ -328,7 +328,7 @@ async function reopenSocket() { await initSockets(); } class General { - appVersion = 'v1.2.1'; + appVersion = 'v1.2.2'; reloadApp = false; async init() { this.setAppVersion(); diff --git a/data/main.css b/data/main.css index 11a5c4a..9ac3382 100644 --- a/data/main.css +++ b/data/main.css @@ -601,7 +601,7 @@ div.waitoverlay > .lds-roller { width:100%; background-color:gainsboro; color:gray; - height:60px; + min-height:60px; top:0px; padding-left:7px; padding-right:7px;