Merge branch 'jomjol:main' into add_delay_in_InitCam

sd-card/config/config.ini

@@ -31,11 +31,11 @@ CamZoom = false
 CamZoomOffsetX = 0
 CamZoomOffsetY = 0
 CamZoomSize = 0
-LEDIntensity = 0
-Demo = true
+LEDIntensity = 50
+Demo = false
 
 [Alignment]
-InitialRotate = -34.6
+InitialRotate = 0.0
 SearchFieldX = 20
 SearchFieldY = 20
 AlignmentAlgo = default
@@ -47,24 +47,30 @@ Model = /config/dig-cont_0710_s3_q.tflite
 CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/digit
 ;ROIImagesRetention = 3
-main.dig1 438 62 49 71 false
+main.dig1 294 126 30 54 false
+main.dig2 343 126 30 54 false
+main.dig3 391 126 30 54 false
 
 [Analog]
 Model = /config/ana-cont_1300_s2.tflite
+CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/analog
 ;ROIImagesRetention = 3
-main.ana1 452 199 120 120 false
+main.ana1 432 230 92 92 false
+main.ana2 379 332 92 92 false
+main.ana3 283 374 92 92 false
+main.ana4 155 328 92 92 false
 
 [PostProcessing]
 main.DecimalShift = 0
-;main.AnalogToDigitTransitionStart = 
+main.AnalogDigitTransitionStart = 9.2
 main.ChangeRateThreshold = 2
 PreValueUse = true
 PreValueAgeStartup = 720
-main.AllowNegativeRates = true
+main.AllowNegativeRates = false
 main.MaxRateValue = 0.05
 ;main.MaxRateType = AbsoluteChange
-main.ExtendedResolution = true
+main.ExtendedResolution = false
 main.IgnoreLeadingNaN = false
 ErrorMessage = true
 CheckDigitIncreaseConsistency = false
@@ -88,7 +94,7 @@ HomeassistantDiscovery = false
 ;user = undefined
 ;password = undefined
 ;main.Measurement = undefined
-;main.Field = 
+;main.Field = undefined
 
 ;[InfluxDBv2]
 ;Uri = undefined
@@ -104,6 +110,7 @@ HomeassistantDiscovery = 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 
@@ -112,25 +119,25 @@ HomeassistantDiscovery = false
 ;IO13 = input-pullup disabled 10 false false 
 LEDType = WS2812
 LEDNumbers = 2
-LEDColor = 150 150 150
+LEDColor = 150 150 150 
 
 [AutoTimer]
 AutoStart = true
-Interval = 1
+Interval = 5
 
 [DataLogging]
-DataLogActive = false
+DataLogActive = true
 DataFilesRetention = 3
 
 [Debug]
-LogLevel = 3
+LogLevel = 1
 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 = true