diff --git a/ConfigSettings.h b/ConfigSettings.h index 5b9e9a3..4a60a9d 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,7 +3,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v2.2.4" +#define FW_VERSION "v2.3.0" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index cb2a2c2..c04dd1e 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/SomfyController.ino.esp32s3.bin b/SomfyController.ino.esp32s3.bin index 0290fda..03e282c 100644 Binary files a/SomfyController.ino.esp32s3.bin and b/SomfyController.ino.esp32s3.bin differ diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin index da21d40..b640e89 100644 Binary files a/SomfyController.littlefs.bin and b/SomfyController.littlefs.bin differ diff --git a/Web.cpp b/Web.cpp index a0908a3..043393d 100644 --- a/Web.cpp +++ b/Web.cpp @@ -11,6 +11,7 @@ #include "Somfy.h" #include "MQTT.h" #include "GitOTA.h" +#include "Network.h" extern ConfigSettings settings; extern SSDPClass SSDP; @@ -19,6 +20,7 @@ extern SomfyShadeController somfy; extern Web webServer; extern MQTTClass mqtt; extern GitUpdater git; +extern Network net; #define WEB_MAX_RESPONSE 16384 static char g_content[WEB_MAX_RESPONSE]; @@ -697,6 +699,10 @@ void Web::handleDiscovery(WebServer &server) { obj["hostname"] = settings.hostname; obj["authType"] = static_cast(settings.Security.type); obj["permissions"] = settings.Security.permissions; + obj["chipModel"] = settings.chipModel; + if(net.connType == conn_types::ethernet) obj["connType"] = "Ethernet"; + else if(net.connType == conn_types::wifi) obj["connType"] = "Wifi"; + else obj["connType"] = "Unknown"; JsonArray arrShades = obj.createNestedArray("shades"); somfy.toJSONShades(arrShades); JsonArray arrGroups = obj.createNestedArray("groups"); diff --git a/data/appversion b/data/appversion index 0476155..cc6612c 100644 --- a/data/appversion +++ b/data/appversion @@ -1 +1 @@ -2.2.4 \ No newline at end of file +2.3.0 \ No newline at end of file diff --git a/data/index.html b/data/index.html index 08a27c4..c5b1c38 100644 --- a/data/index.html +++ b/data/index.html @@ -3,11 +3,11 @@ - - - + + + - +
diff --git a/data/index.js b/data/index.js index 16b80ef..28b4ad2 100644 --- a/data/index.js +++ b/data/index.js @@ -1255,7 +1255,7 @@ var security = new Security(); class General { initialized = false; - appVersion = 'v2.2.4'; + appVersion = 'v2.3.0'; reloadApp = false; init() { if (this.initialized) return;