Rolling 20210712

README.md

@@ -45,7 +45,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
-##### Rolling - (2021-07-11)
+Rolling - (2021-07-12)
+
+* HTML: Bug fixing
+
+Rolling - (2021-07-11) - **SPECIAL THANKS TO https://github.com/Zwer2k**
 
 * GPIO: implements basic functionality for GPIO handler.
   - Configuration via config.ini / HTML page
@@ -63,7 +67,7 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 * Bugfix: memory leaks in ClassFlowAnalog and ClassFlowControll fixed.
 * Removed compiler warnings 
 
-##### Rolling - (2021-07-08)
+Rolling - (2021-07-08)
 
 * MQTT: added json output
 

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="a688a69";
+const char* GIT_REV="76a0518";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-07-11 23:41";
+const char* BUILD_TIME="2021-07-12 19:27";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="a688a69";
+const char* GIT_REV="76a0518";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-07-11 23:41";
+const char* BUILD_TIME="2021-07-12 19:27";

sd-card/config/config.ini

@@ -11,11 +11,11 @@ FixedExposure = false
 
 [Alignment]
 InitialRotate = 179
-;InitialMirror = false
+InitialMirror = false
 SearchFieldX = 20
 SearchFieldY = 20
 AlignmentAlgo = Default
-;FlipImageSize = false
+FlipImageSize = false
 /config/ref0.jpg 103 271
 /config/ref1.jpg 442 142
 
@@ -24,9 +24,9 @@ Model = /config/dig1040s1q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32
-main.digit1 294 126 30 54
+main.dig1 294 126 30 54
-main.digit2 343 126 30 54
+main.dig2 343 126 30 54
-main.digit3 391 126 30 54
+main.dig3 391 126 30 54
 
 [Analog]
 Model = /config/ana0700s1lq.tflite
@@ -34,10 +34,10 @@ Model = /config/ana0700s1lq.tflite
 ;LogfileRetentionInDays = 3
 ModelInputSize = 32 32
 ExtendedResolution = true
-main.analog1 432 230 92 92
+main.ana1 432 230 92 92
-main.analog2 379 332 92 92
+main.ana2 379 332 92 92
-main.analog3 283 374 92 92
+main.ana3 283 374 92 92
-main.analog4 155 328 92 92
+main.ana4 155 328 92 92
 
 [PostProcessing]
 main.DecimalShift = 0

sd-card/html/edit_config_param.html

@@ -1777,10 +1777,6 @@ function ReadParameterAll()
 //	FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
 }
 
-function WriteConfig(){
-	ReadParameterAll();
-	return setConfigParameters(param, category);
-}
 
 function FormatDecimalValue(_param, _cat, _name) {
 	for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {

sd-card/html/edit_explain_6.html

@@ -63,10 +63,10 @@ p {font-size: 1em;}
             param = getConfigParameters();
             param["System"]["SetupMode"]["enabled"] = false;
             param["System"]["SetupMode"]["value1"] = "false";
-            setConfigParameters(param);
+
-            var textToSave = setConfigParameters(param);
+            WriteConfigININew();
-		    FileDeleteOnServer("/config/config.ini", basepath);
+            SaveConfigToServer(basepath);    
-		    FileSendContent(textToSave, "/config/config.ini", basepath);
+
 
             var stringota = "/reboot";
             window.location = stringota;

sd-card/html/edit_reference.html

@@ -231,9 +231,8 @@ table {
                 var canvas = document.getElementById("canvas");
                 drawRotated(false);
 
-                var textToSave = setConfigParameters(param);
+                WriteConfigININew();
-                FileDeleteOnServer("/config/config.ini", basepath);
+                SaveConfigToServer(basepath);    
-                FileSendContent(textToSave, "/config/config.ini", basepath);
 
                 SaveCanvasToImage(canvas, "/config/reference.jpg", true, basepath);
                 showReference();

sd-card/html/readconfigparam.js

@@ -265,6 +265,17 @@ function getConfigParameters() {
 
 function WriteConfigININew()
 {
+     // Cleanup empty NUMBERS
+     for (var j = 0; j < NUMBERS.length; ++j)
+     {
+          if ((NUMBERS[j]["digit"].length + NUMBERS[j]["analog"].length) == 0)
+          {
+               NUMBERS.splice(j, 1);
+          }
+     }
+
+
+
      config_split = new Array(0);
 
      for (var cat in param) {
@@ -358,52 +369,6 @@ function WriteConfigININew()
      }
 }
 
-function setConfigParameters(_param, _category = "") {
-     for (var cat in _param) {
-          for (var name in _param[cat]) {
-               param[cat][name]["found"] = _param[cat][name]["found"];
-               param[cat][name]["enabled"] = _param[cat][name]["enabled"];
-               param[cat][name]["line"] = _param[cat][name]["line"];
-
-               param[cat][name]["anzParam"] = _param[cat][name]["anzParam"];
-               for (var j = 1; j <= _param[cat][name]["anzParam"]; ++j) {
-                    param[cat][name]["value"+j] =  _param[cat][name]["value"+j];
-                    }
-
-               if (param[cat][name]["found"]) {
-                    var text = name + " =" 
-                    
-                    for (var j = 1; j <= _param[cat][name]["anzParam"]; ++j) {
-                         text = text + " " + param[cat][name]["value"+j];
-                         }
-                    if (!param[cat][name]["enabled"]) {
-                         text = ";" + text;
-                    }
-                    config_split[param[cat][name]["line"]] = text;
-               }
-          }
-     }
-
-     for (var cat in _category) {
-          if (category[cat]["found"])
-          {
-               category[cat]["enabled"] = _category[cat]["enabled"];
-               text = "[" + cat + "]";
-               if (!category[cat]["enabled"]) {
-                    text = ";" + text;
-               }
-               config_split[category[cat]["line"]] = text;
-
-          }
-     }
-     
-     config_gesamt = config_split[0];
-     for (var i = 1; i < config_split.length; ++i){
-          config_gesamt = config_gesamt + "\n" + config_split[i]; 
-     }
-
-     return config_gesamt;
-}
 
 
 function isCommented(input)
@@ -611,8 +576,12 @@ function CreateNUMBER(_numbernew){
 
      for (_cat in param)
           for (_param in param[_cat])
-               if (param[_cat][_param]["Numbers"] == true){
+               if (param[_cat][_param]["Numbers"] == true)
-                    _ret[_cat] = new Object();
+               {
+                    if (typeof (_ret[_cat]) === "undefined")
+                    {
+                         _ret[_cat] = new Object();
+                    }
                     _ret[_cat][_param] = new Object();
                     _ret[_cat][_param]["found"] = false;
                     _ret[_cat][_param]["enabled"] = false;
@@ -620,8 +589,7 @@ function CreateNUMBER(_numbernew){
 
                }
 
-     NUMBERS.push(_ret);
+     NUMBERS.push(_ret);               
-
      return "";
 }
 

sd-card/html/version.txt

@@ -1 +1 @@
-9.2.0
+9.4.0