v10.1.1

jomjol · Jan 12, 2022 · 96bb865 · 96bb865
1 parent 2daf6c8
commit 96bb865
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -54,16 +54,24 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 10.1.0 - Stability Increase (2022-01-09)
+##### 10.1.1 - Stability Increase (2022-01-12)
 
-- Reduce ESP32 frequency to 160MHz
+- **Bug Fix MQTT problem**
+- Issue: 
+  - Changing from v9.x to 10.x the MQTT-paramter "Topic" was renamed into "MainTopic" to address multiple number meters
+    This renaming should have been done automatically in the background within the graphical configuration, but was not working. Instead the parameter "Topic" was deleted and "MainTopic" was set to disabled and "undefined".
+- ToDo
+  - Update the `html.zip`
+  - If old `config.ini` available: copy it to `/config`, open the graphical configuration and save it again.
+  - If old `config.ini` not available: reset the parameter "MainTopic" within the `config.ini` manually 
+  - Reboot
 
-- Update tflite (new source: https://github.com/espressif/tflite-micro-esp-examples)
+##### 10.1.0 - Stability Increase (2022-01-12)
 
+- Reduce ESP32 frequency to 160MHz
+- Update tflite (new source: https://github.com/espressif/tflite-micro-esp-examples)
 - Update analog neural network (ana-s3-q-20220105.tflite)
-
 - Update digital neural network (dig-s1-q-20220102.tflite)
-
 - Increased web-server buffers
 - bug fix: compiler compatibility
 

diff --git a/firmware/html.zip b/firmware/html.zip
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
@@ -323,7 +323,7 @@ <h4><input type="checkbox" id="Category_Digits_enabled" value="1"  onclick = 'Up
 			</td>
 		</tr>
 
-		<tr class="expert"  id="ex4">
+		<tr id="Category_Analog_ex4">
 			<td colspan="4" style="padding-left: 20px;">
 				<h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'UpdateAfterCategoryCheck()' unchecked > Analog</h4></td>
 		</tr> 

diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
@@ -7,24 +7,25 @@ function gethost_Version(){
 function getbasepath(){
     var host = window.location.hostname;
     if (((host == "127.0.0.1") || (host == "localhost") || (host == "")) 
-       && ((window.location.port == "80") || (window.location.port == "")))
+//       && ((window.location.port == "80") || (window.location.port == ""))
+       )
 
     {
 //        host = "http://192.168.2.219";          // jomjol interner test
 //        host = "http://192.168.178.46";          // jomjol interner test
-        host = "http://192.168.178.79";          // jomjol interner Real
+        host = "http://192.168.178.34";          // jomjol interner Real
 //        host = "http://192.168.43.191";
 //        host = ".";                           // jomjol interner localhost   
 
     }
     else
     {
         host = "http://" + host;
+        if (window.location.port != "") {
+            host = host + ":" + window.location.port;
+        }
     }
 
-    if (window.location.port != "") {
-       host = host + ":" + window.location.port;
-    }
     return host;
 }
 

diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js
@@ -86,6 +86,7 @@ function ParseConfig() {
      param[catname] = new Object();
      ParamAddValue(param, catname, "Uri");
      ParamAddValue(param, catname, "MainTopic", 1, false);
+     ParamAddValue(param, catname, "Topic", 1, false);
      ParamAddValue(param, catname, "ClientID");
      ParamAddValue(param, catname, "user");
      ParamAddValue(param, catname, "password");
@@ -157,6 +158,14 @@ function ParseConfig() {
           }
           aktline++;
      }
+
+
+     // Make the downward compatiblity with MQTT (Maintopic --> topic)
+     if (param["MQTT"]["Topic"]["found"] == true && param["MQTT"]["MainTopic"]["found"] == false)
+     {
+          param["MQTT"]["MainTopic"] = param["MQTT"]["Topic"]
+     }
+     delete param["MQTT"]["Topic"]                // Dient nur der Downwardskompatibilität
 }
 
 function ParamAddValue(param, _cat, _param, _anzParam = 1, _isNUMBER = false, _checkRegExList = null){

diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
@@ -1 +1 @@
-11.4.0
+11.4.1