Merge pull request #4033 from SybexX/test_mh

test3

sd-card/config/config.ini

@@ -84,14 +84,14 @@ main.IgnoreLeadingNaN = false
 ;ClientID = watermeter
 ;user = USERNAME
 ;password = PASSWORD
-;RetainMessages = false
-;HomeassistantDiscovery = false
-;DiscoveryPrefix = 1
-;MeterType = other
 ;CACert = /config/certs/RootCA.pem
 ;ClientCert = /config/certs/client.pem.crt
 ;ClientKey = /config/certs/client.pem.key
 ;ValidateServerCert = true
+;RetainMessages = true
+;HomeassistantDiscovery = true
+;DiscoveryPrefix = homeassistant
+;MeterType = other
 ;DomoticzTopicIn = domoticz/in
 ;main.DomoticzIDX = 0
 
@@ -117,7 +117,6 @@ main.IgnoreLeadingNaN = false
 ;UploadImg = 0
 
 ;[GPIO]
-;MainTopicMQTT = wasserzaehler/GPIO
 ;IO0 = input disabled 10 false false 
 ;IO1 = input disabled 10 false false 
 ;IO3 = input disabled 10 false false 

sd-card/demo/config.ini

@@ -1,7 +1,9 @@
 [TakeImage]
 ;RawImagesLocation = /log/source
 ;RawImagesRetention = 15
+SaveAllFiles = false
 WaitBeforeTakingPicture = 2
+CamXclkFreqMhz = 20
 CamGainceiling = x8
 CamQuality = 10
 CamBrightness = 0
@@ -35,9 +37,10 @@ LEDIntensity = 0
 Demo = true
 
 [Alignment]
-InitialRotate = -34.6
 SearchFieldX = 20
 SearchFieldY = 20
+SearchMaxAngle = 15
+InitialRotate = -34.6
 AlignmentAlgo = default
 /config/ref0.jpg 30 189
 /config/ref1.jpg 536 113
@@ -56,18 +59,18 @@ Model = /config/ana-cont_1400_s2_q.tflite
 main.ana1 452 199 120 120 false
 
 [PostProcessing]
-main.DecimalShift = 0
-;main.AnalogToDigitTransitionStart = 
-main.ChangeRateThreshold = 2
 PreValueUse = true
 PreValueAgeStartup = 720
+SkipErrorMessage = false
 main.AllowNegativeRates = true
-;main.MaxRateValue = 0
+main.DecimalShift = 0
-;main.MaxRateType = AbsoluteChange
+main.AnalogToDigitTransitionStart = 9.8
+main.MaxFlowRate = 4.0
+main.MaxRateValue = 0.05
+main.MaxRateType = AbsoluteChange
+main.ChangeRateThreshold = 2
 main.ExtendedResolution = true
 main.IgnoreLeadingNaN = false
-ErrorMessage = true
-main.CheckDigitIncreaseConsistency = false
 
 ;[MQTT]
 ;Uri = mqtt://IP-ADRESS:1883
@@ -75,15 +78,16 @@ main.CheckDigitIncreaseConsistency = false
 ;ClientID = watermeter
 ;user = USERNAME
 ;password = PASSWORD
-RetainMessages = false
-;DomoticzTopicIn = undefined
-;main.DomoticzIDX = undefined
-HomeassistantDiscovery = false
-;MeterType = other
 ;CACert = /config/certs/RootCA.pem
 ;ClientCert = /config/certs/client.pem.crt
 ;ClientKey = /config/certs/client.pem.key
 ;ValidateServerCert = true
+;RetainMessages = true
+;HomeassistantDiscovery = true
+;DiscoveryPrefix = homeassistant
+;MeterType = other
+;DomoticzTopicIn = domoticz/in
+;main.DomoticzIDX = 0
 
 ;[InfluxDB]
 ;Uri = undefined
@@ -91,7 +95,7 @@ HomeassistantDiscovery = false
 ;user = undefined
 ;password = undefined
 ;main.Measurement = undefined
-;main.Field = 
+;main.Field = undefined
 
 ;[InfluxDBv2]
 ;Uri = undefined
@@ -129,10 +133,10 @@ LogLevel = 3
 LogfilesRetention = 3
 
 [System]
-Tooltip = true
 TimeZone = CET-1CEST,M3.5.0,M10.5.0/3
 ;TimeServer = pool.ntp.org
 ;Hostname = undefined
 RSSIThreshold = -75
 CPUFrequency = 160
-SetupMode = false
+Tooltip = true
+SetupMode = false

sd-card/html/edit_config_template.html

@@ -1213,7 +1213,7 @@
 
         <tr class="MQTTItem">
             <td class="indent2">
-                <input type="checkbox" id="MQTT_DiscoveryPrefix_enabled" value="1"  onclick = 'InvertEnableItem("MQTT", "DiscoveryPrefix")' unchecked >
+                <input type="checkbox" id="MQTT_DiscoveryPrefix_enabled" value="homeassistant"  onclick = 'InvertEnableItem("MQTT", "DiscoveryPrefix")' unchecked >
                 <label for=MQTT_DiscoveryPrefix_enabled><class id="MQTT_DiscoveryPrefix_text" style="color:black;">Discovery Prefix</class></label>
             </td>
             <td>

sd-card/html/readconfigparam.js

@@ -221,7 +221,7 @@ function ParseConfig() {
     param[catname] = new Object();
     ParamAddValue(param, catname, "SearchFieldX", 1, false, "20");
     ParamAddValue(param, catname, "SearchFieldY", 1, false, "20");
-    ParamAddValue(param, catname, "SearchMaxAngle", 1, false, "45");
+    ParamAddValue(param, catname, "SearchMaxAngle", 1, false, "15");
     ParamAddValue(param, catname, "Antialiasing", 1, false, "true");
     ParamAddValue(param, catname, "AlignmentAlgo", 1, false, "default");
     ParamAddValue(param, catname, "InitialRotate", 1, false, "0");
@@ -269,54 +269,54 @@ function ParseConfig() {
     category[catname]["enabled"] = false;
     category[catname]["found"] = false;
     param[catname] = new Object();
-    ParamAddValue(param, catname, "Uri");
+    ParamAddValue(param, catname, "Uri", 1, false, "mqtt://example.com:1883");
-    ParamAddValue(param, catname, "MainTopic", 1, false);
+    ParamAddValue(param, catname, "MainTopic", 1, false, "watermeter");
-    ParamAddValue(param, catname, "ClientID");
+    ParamAddValue(param, catname, "ClientID", 1, false, "watermeter");
-    ParamAddValue(param, catname, "user");
+    ParamAddValue(param, catname, "user", 1, false, "USERNAME");
-    ParamAddValue(param, catname, "password");
+    ParamAddValue(param, catname, "password", 1, false, "PASSWORD");
-    ParamAddValue(param, catname, "RetainMessages");
+    ParamAddValue(param, catname, "CACert", 1, false, "/config/certs/RootCA.pem");
-    ParamAddValue(param, catname, "DomoticzTopicIn");
+    ParamAddValue(param, catname, "ClientCert", 1, false, "/config/certs/client.pem.crt");
-    ParamAddValue(param, catname, "DomoticzIDX", 1, true);
+    ParamAddValue(param, catname, "ClientKey", 1, false, "/config/certs/client.pem.key");
-    ParamAddValue(param, catname, "HomeassistantDiscovery");
+    ParamAddValue(param, catname, "ValidateServerCert", 1, false, "true");
-    ParamAddValue(param, catname, "DiscoveryPrefix", 1, false);
+    ParamAddValue(param, catname, "RetainMessages", 1, false, "true");
-    ParamAddValue(param, catname, "MeterType");
+    ParamAddValue(param, catname, "HomeassistantDiscovery", 1, false, "true");
-    ParamAddValue(param, catname, "CACert");
+    ParamAddValue(param, catname, "DiscoveryPrefix", 1, false, "homeassistant");
-    ParamAddValue(param, catname, "ClientCert");
+    ParamAddValue(param, catname, "MeterType", 1, false, "other");
-    ParamAddValue(param, catname, "ClientKey");
+    ParamAddValue(param, catname, "DomoticzTopicIn", 1, false, "domoticz/in");
-    ParamAddValue(param, catname, "ValidateServerCert");
+    ParamAddValue(param, catname, "DomoticzIDX", 1, true, "0");
 
     var catname = "InfluxDB";
     category[catname] = new Object();
     category[catname]["enabled"] = false;
     category[catname]["found"] = false;
     param[catname] = new Object();
-    ParamAddValue(param, catname, "Uri");
+    ParamAddValue(param, catname, "Uri", 1, false, "undefined");
-    ParamAddValue(param, catname, "Database");
+    ParamAddValue(param, catname, "Database", 1, false, "undefined");
-    ParamAddValue(param, catname, "user");
+    ParamAddValue(param, catname, "user", 1, false, "undefined");
-    ParamAddValue(param, catname, "password");
+    ParamAddValue(param, catname, "password", 1, false, "undefined");
-    ParamAddValue(param, catname, "Measurement", 1, true);
+    ParamAddValue(param, catname, "Measurement", 1, true, "undefined");
-    ParamAddValue(param, catname, "Field", 1, true);
+    ParamAddValue(param, catname, "Field", 1, true, "undefined");
 
     var catname = "InfluxDBv2";
     category[catname] = new Object();
     category[catname]["enabled"] = false;
     category[catname]["found"] = false;
     param[catname] = new Object();
-    ParamAddValue(param, catname, "Uri");
+    ParamAddValue(param, catname, "Uri", 1, false, "undefined");
-    ParamAddValue(param, catname, "Bucket");
+    ParamAddValue(param, catname, "Bucket", 1, false, "undefined");
-    ParamAddValue(param, catname, "Org");
+    ParamAddValue(param, catname, "Org", 1, false, "undefined");
-    ParamAddValue(param, catname, "Token");
+    ParamAddValue(param, catname, "Token", 1, false, "undefined");
-    ParamAddValue(param, catname, "Measurement", 1, true);
+    ParamAddValue(param, catname, "Measurement", 1, true, "undefined");
-    ParamAddValue(param, catname, "Field", 1, true);
+    ParamAddValue(param, catname, "Field", 1, true, "undefined");
 
     var catname = "Webhook";
     category[catname] = new Object();
     category[catname]["enabled"] = false;
     category[catname]["found"] = false;
     param[catname] = new Object();
-    ParamAddValue(param, catname, "Uri", 1, false);
+    ParamAddValue(param, catname, "Uri", 1, false, "undefined");
-    ParamAddValue(param, catname, "ApiKey", 1, false);
+    ParamAddValue(param, catname, "ApiKey", 1, false, "undefined");
-    ParamAddValue(param, catname, "UploadImg", 1, false);
+    ParamAddValue(param, catname, "UploadImg", 1, false, "0");
 
     var catname = "GPIO";
     category[catname] = new Object();
@@ -369,7 +369,7 @@ function ParseConfig() {
     category[catname]["found"] = false;
     param[catname] = new Object();
     ParamAddValue(param, catname, "TimeZone", 1, false, "default");
-    ParamAddValue(param, catname, "TimeServer", 1, false, "default");
+    ParamAddValue(param, catname, "TimeServer", 1, false, "pool.ntp.org");
     ParamAddValue(param, catname, "Hostname", 1, false, "watermeter");   
     ParamAddValue(param, catname, "RSSIThreshold", 1, false, "0"); 
     ParamAddValue(param, catname, "CPUFrequency", 1, false, "160");