Fix saving MQTT port settings #12

rstrouse · Apr 1, 2023 · 209a2d7 · 209a2d7
1 parent d239ce8
commit 209a2d7
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
diff --git a/data/index.html b/data/index.html
@@ -3,10 +3,10 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="main.css?v=1.4.4" type="text/css" />
-    <link rel="stylesheet" href="icons.css?v=1.4.4" type="text/css" />
+    <link rel="stylesheet" href="main.css?v=1.4.5" type="text/css" />
+    <link rel="stylesheet" href="icons.css?v=1.4.5" type="text/css" />
     <link rel="icon" type="image/png" href="favicon.png" />
-    <script type="text/javascript" src="index.js?v=1.4.4"></script>
+    <script type="text/javascript" src="index.js?v=1.4.5"></script>
 </head>
 <body>
     <div id="divContainer" class="container" style="user-select:none;position:relative;border-radius:27px;">

diff --git 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();