rolling 20210705

README.md

@@ -47,12 +47,16 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling - (2021-07-03)
+##### Rolling - (2021-07-05)
+
+* Update jquery, inital config.ini
+
+Rolling - (2021-07-03)
 
 * Parameter `MaxRateValue` individual for each number
 * BugFix: MQTT server tried to connect even in case it was disabled
 
-##### Rolling - (2021-07-01)
+Rolling - (2021-07-01)
 
 * NEW FEATURE: adding support for more than 1 number on a meter (e.g. two different power readings)
   Therefore the concept of "Numbers" is implemented - a bunch of digits and analog counters are combined to one number. You can define them during setup of digital and analog ROIs:

sd-card/config/config.ini

@@ -1,57 +1,56 @@
 [MakeImage]
 ;LogImageLocation = /log/source
-;LogfileRetentionInDays = 15
 WaitBeforeTakingPicture = 5
+;LogfileRetentionInDays = 15
+Brightness = -2
+;Contrast = 0
+;Saturation = 0
 ImageQuality = 5
 ImageSize = VGA
-;Brightness = -2
 FixedExposure = false
 
 [Alignment]
-InitialRotate=180
-FlipImageSize = false
-/config/ref0.jpg 119 273
-/config/ref1.jpg 456 138
+InitialRotate = 179
+;InitialMirror = false
 SearchFieldX = 20
 SearchFieldY = 20
-InitialMirror= false
 AlignmentAlgo = Default
+;FlipImageSize = false
+/config/ref0.jpg 104 271
+/config/ref1.jpg 442 142
 
 [Digits]
 Model = /config/dig1030s1q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32
-digit1 306 120 37 67
-digit2 355 120 37 67
-digit3 404 120 37 67
+main.digit1 292 120 37 67
+main.digit2 340 120 37 67
+main.digit3 389 120 37 67
 
 [Analog]
-Model = /config/ana0700s1lq.tflite
+Model = /config/ana0630s2.tflite
 ;LogImageLocation = /log/analog
 ;LogfileRetentionInDays = 3
 ModelInputSize = 32 32
-analog1 444 225 92 92
-analog2 391 329 92 92
-analog3 294 369 92 92
-analog4 168 326 92 92
-ExtendedResolution = false
+ExtendedResolution = true
+main.analog1 430 230 92 92
+main.analog2 376 331 92 92
+main.analog3 279 372 92 92
+main.analog4 150 327 92 92
 
 [PostProcessing]
-DecimalShift = 0
+main.DecimalShift = 0
 PreValueUse = true
 PreValueAgeStartup = 720
 AllowNegativeRates = false
-MaxRateValue = 0.1
+main.MaxRateValue = 0.1
 ErrorMessage = true
-CheckDigitIncreaseConsistency = false
+CheckDigitIncreaseConsistency = true
 
-[MQTT]
+;[MQTT]
 ;Uri = mqtt://IP-ADRESS:1883
-;Topic = wasserzaehler/zaehlerstand
-;TopicError = wasserzaehler/error
-;TopicRate = wasserzaehler/rate
-;TopicTimeStamp = wasserzaehler/timestamp
+;MainTopic = wasserzaehler
 ;ClientID = wasser
 ;user = USERNAME
 ;password = PASSWORD
@@ -65,9 +64,8 @@ Logfile = false
 LogfileRetentionInDays = 3
 
 [System]
-TimeZone = CET-1CEST,M3.5.0,M10.5.0/3
-;TimeServer = fritz.box
-;hostname = watermeter
-SetupMode = true
-
-[Ende]
+TimeZone = CET-1CEST
+;TimeServer = undefined
+;AutoAdjustSummertime = false
+;Hostname = undefined
+SetupMode = true

sd-card/html/edit_digits.html

@@ -125,7 +125,7 @@ th, td {
 <script type="text/javascript" src="./readconfigcommon.js"></script>
 <script type="text/javascript" src="./readconfigparam.js"></script>  
 
-<script type="text/javascript" src="./jquery-3.5.1.min.js"></script>  
+<script type="text/javascript" src="./jquery-3.6.0.min.js"></script>  
 
 <script language="JavaScript">
         var canvas = document.getElementById('canvas'),

sd-card/html/gethost.js

@@ -8,8 +8,8 @@ function getbasepath(){
     if ((host == "127.0.0.1") || (host == "localhost"))
     {
 //        host = "http://192.168.2.219";          // jomjol interner test
-//        host = "http://192.168.178.47";          // jomjol interner test
-        host = "http://192.168.178.22";          // jomjol interner Real
+        host = "http://192.168.178.46";          // jomjol interner test
+//        host = "http://192.168.178.22";          // jomjol interner Real
 
 //        host = ".";                           // jomjol interner localhost   
 

sd-card/html/readconfigparam.js

@@ -256,10 +256,7 @@ function WriteConfigININew()
                {
                     for (_num in NUMBERS)
                     {
-                         if (NUMBERS[_num]["name"] == "default")
-                              text = name;
-                         else
-                              text = NUMBERS[_num]["name"] + "." + name;
+                         text = NUMBERS[_num]["name"] + "." + name;
 
                          var text = text + " =" 
                          
@@ -295,10 +292,7 @@ function WriteConfigININew()
                     {
                          for (var _roiddet in NUMBERS[_roi]["digit"])
                          {
-                              if (NUMBERS[_roi]["name"] == "default")
-                                   text = NUMBERS[_roi]["digit"][_roiddet]["name"];
-                              else
-                                   text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["digit"][_roiddet]["name"];
+                              text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["digit"][_roiddet]["name"];
                               text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["x"];
                               text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["y"];
                               text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["dx"];
@@ -316,10 +310,7 @@ function WriteConfigININew()
                     {
                          for (var _roiddet in NUMBERS[_roi]["analog"])
                          {
-                              if (NUMBERS[_roi]["name"] == "default")
-                                   text = NUMBERS[_roi]["analog"][_roiddet]["name"];
-                              else
-                                   text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["analog"][_roiddet]["name"];
+                              text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["analog"][_roiddet]["name"];
                               text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["x"];
                               text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["y"];
                               text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["dx"];

sd-card/html/wasserzaehler_roi.html

@@ -62,7 +62,7 @@
 </body>
 </html>
 
-<script src="/jquery-3.5.1.min.js"></script>
+<script src="/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="./gethost.js"></script> 
 <script type="text/javascript" src="./readconfigcommon.js"></script> 
 <script type="text/javascript">