diff --git a/ConfigSettings.cpp b/ConfigSettings.cpp index 94222e1..7e3813f 100644 --- a/ConfigSettings.cpp +++ b/ConfigSettings.cpp @@ -141,6 +141,7 @@ bool MQTTSettings::fromJSON(JsonObject &obj) { this->parseValueString(obj, "username", this->username, sizeof(this->username)); this->parseValueString(obj, "password", this->password, sizeof(this->password)); this->parseValueString(obj, "rootTopic", this->rootTopic, sizeof(this->rootTopic)); + if(obj.containsKey("port")) this->port = obj["port"]; return true; } bool MQTTSettings::save() { diff --git a/ConfigSettings.h b/ConfigSettings.h index 61267d2..cafb6d0 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,7 +3,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v1.4.4" +#define FW_VERSION "v1.4.5" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/Somfy.cpp b/Somfy.cpp index 8c22097..4b2d6f9 100644 --- a/Somfy.cpp +++ b/Somfy.cpp @@ -1603,7 +1603,6 @@ static const uint32_t tempo_inter_frame_gap = 30415; static int16_t bitMin = SYMBOL * TOLERANCE_MIN; static uint16_t timing_index = 0; -//static uint32_t timings[MAX_TIMINGS]; static somfy_rx_t somfy_rx; static somfy_rx_queue_t rx_queue; diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index c07f49f..51d6fa2 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 babfd37..a42b702 100644 Binary files a/SomfyController.littlefs.bin and b/SomfyController.littlefs.bin differ diff --git a/data/index.html b/data/index.html index 05dcb2b..38584ce 100644 --- a/data/index.html +++ b/data/index.html @@ -3,10 +3,10 @@ - - + + - +
diff --git a/data/index.js b/data/index.js index 668e0fe..23f2e45 100644 --- a/data/index.js +++ b/data/index.js @@ -378,7 +378,7 @@ async function reopenSocket() { await initSockets(); } class General { - appVersion = 'v1.4.4'; + appVersion = 'v1.4.5'; reloadApp = false; async init() { this.setAppVersion();