Merge branch 'rolling' into update-webui

sd-card/config/config.ini

@@ -31,7 +31,7 @@ main.dig2 343 126 30 54 false
 main.dig3 391 126 30 54 false
 
 [Analog]
-Model = /config/ana-cont_1105_s2_q.tflite
+Model = /config/ana-cont_1206_s2_q.tflite
 CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/analog
 ;ROIImagesRetention = 3

sd-card/html/common.js

@@ -4,12 +4,6 @@
 var domainname_for_testing = "192.168.178.23";
 
 
-
-function gethost_Version(){
-    return "1.0.0 - 20200910";
-}
-
-
 /* Returns the domainname with prepended protocol.
 Eg. http://watermeter.fritz.box or http://192.168.1.5 */
 function getDomainname(){

sd-card/html/edit_analog.html

@@ -752,7 +752,8 @@ function drawTextBG(context, txt, x, y, padding) {
                     context.strokeRect(x0, y0, dx, dy); 
                     context.lineWidth = lw;
                     context.beginPath();
-                    context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+//                    context.arc (x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+                    context.ellipse(x0+dx/2, y0+dy/2, dx/2, dy/2, 0, 0, 2 * Math.PI);
                     context.moveTo(x0+dx/2, y0);
                     context.lineTo(x0+dx/2, y0+dy);
                     context.moveTo(x0, y0+dy/2);
@@ -777,7 +778,8 @@ function drawTextBG(context, txt, x, y, padding) {
 
             context.lineWidth = 1;
             context.beginPath();
-            context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+//            context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+            context.ellipse(x0+dx/2, y0+dy/2, dx/2, dy/2, 0, 0, 2 * Math.PI);
             context.moveTo(x0+dx/2, y0);
             context.lineTo(x0+dx/2, y0+dy);
             context.moveTo(x0, y0+dy/2);

sd-card/html/gethost.js

@@ -1,41 +0,0 @@
-
-function gethost_Version(){
-    return "1.0.0 - 20200910";
-}
-
-
-function getbasepath(){
-    var host = window.location.hostname;
-    if (((host == "127.0.0.1") || (host == "localhost") || (host == "")) 
-//       && ((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.44";          // jomjol interner Real
-//        host = "http://192.168.43.191";
-//        host = ".";                           // jomjol interner localhost   
-
-    }
-    else
-    {
-        host = window.location.protocol + "//" + host;
-        if (window.location.port != "") {
-            host = host + ":" + window.location.port;
-        }
-    }
-
-    return host;
-}
-
-function UpdatePage(_dosession = true){
-    var zw = location.href;
-    zw = zw.substr(0, zw.indexOf("?"));
-    if (_dosession) {
-        window.location = zw + '?session=' + Math.floor((Math.random() * 1000000) + 1); 
-    }
-    else {
-        window.location = zw; 
-    }
-}

sd-card/html/readconfigcommon.js

@@ -269,7 +269,7 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
           return true;
      }
      else {
-          firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
+          firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
           return false;
      }
 }
@@ -297,7 +297,7 @@ function MakeRefZW(zw, _domainname){
           return true;
      }
      else {
-          firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
+          firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
           return false;
      }
 }

sd-card/html/wlan_config.html

@@ -3,6 +3,7 @@
         <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
         <script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>  
         <script type="text/javascript" src="firework.js?v=$COMMIT_HASH"></script>
+        <script type="text/javascript" src="/common.js?v=$COMMIT_HASH"> 
     </head>
 <body>
     <table>