Merge pull request #31 from jomjol/rolling

Rolling

Author: jomjol

README.md

@@ -36,10 +36,20 @@ Choose for the fitting docker tag and run the server with the following paramete
 The config and the log directory can be empty at the very first start. They will be loaded with a default configuratio, that can be modified afterwards.
 
 ## Changelog - lastest version
-##### 5.3.0 (2019-01-08)
+##### 5.5.2 (2020-02-23)
+* Modification of Errortext in case RateToHigh, NegativeRate (Blank after "Error", e.g. "ErrorRateToHigh" --> "Error - RateToHigh")
+* Change MaxRateValue from 0.1 to 0.2 in Default Config.ini
+##### 5.5.1 (2020-02-15)
+* Update CNN-Digital to v5.0.0 (improved training data from iobroker users)
+* Update CNN-Analog to v5.0.0 (improved training data from iobroker users)
+##### 5.5.0 (2020-02-12)
+* Update CNN-Digital to v4.2.0 (improved training data from iobroker users)
+##### 5.4.9 (2020-01-27)
+* Extensdion to json output: ../wasserzaehler.json
+##### 5.3.0 (2020-01-08)
 * Integration of storage of prevalue in file to reload on startup
 * Correction of drawing analog counter ROIs even if they are disabled
-##### 5.2.0 (2019-01-03)
+##### 5.2.0 (2020-01-03)
 * Raspberry Version: Remove autorestart (not working) - instead: use cron job for regular restart to handle tensorflow memory leak [Setting up cron job](https://github.com/jomjol/water-meter-system-complete/blob/raspi-rolling/Raspi-Cron-Job.md)
 ##### 5.1.0 (2019-12-28)
 * Raspberry Version: Autorestart on Python Crash of wasserzaehler.py

code/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Aktuelle Datei",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/wasseruhr.py",
+            "console": "integratedTerminal"
+        }
+    ]
+}

code/Dockerfile_raspi

@@ -4,6 +4,8 @@ RUN [ "cross-build-start" ]
 
 WORKDIR /
 
+RUN wget -qO- https://getpm2.com/install.sh | bash
+
 COPY . ./
 RUN pip3 install --no-cache-dir -r requirements_raspi.txt
 

code/config/config.ini

@@ -16,7 +16,7 @@ ReadPreValueFromFileMaxAge=30
 
 AllowNegativeRates=False
 #Maximum Change of new to old value (+ or -)
-MaxRateValue=0.1
+MaxRateValue=0.2
 #Return in Case of Error: Value = OldValue or NewValue
 #                         ErrorMessage = Return Text with problem (seperated by Tabstopp) if nothing, then no error message
 #                         Readout = Real Readout without corrections (NewValue)
@@ -49,13 +49,13 @@ pos_y=386
 
 [Digital_Digit]
 names=ziffer1, ziffer2, ziffer3, ziffer4, ziffer5
-Modelfile=./config/neuralnets/Train_CNN_Digital-Readout_Version_4.1.0.h5
+Modelfile=./config/neuralnets/Train_CNN_Digital-Readout_Version_5.0.0.h5
 #LogImageLocation=./log/digital_digit
 #LogNames=zeiger3, zeiger4
 
 [Analog_Counter]
 names=zeiger1, zeiger2, zeiger3, zeiger4
-Modelfile=./config/neuralnets/CNN_Analog-Readout_Version-4.0.1.h5
+Modelfile=./config/neuralnets/CNN_Analog-Readout_Version-5.0.0.h5
 #LogImageLocation=./log/analog_counter
 #LogNames=zeiger3, zeiger4
 

code/config/neuralnets/CNN_Analog-Readout_Version-5.0.0.h5

@@ -1,4 +1,5 @@
 [PreValue]
-time = 2000-01-01_00-00-00
-LastVorkomma = 00000
-LastNachkomma = 0000
+time = 2020-01-26_18-43-18
+lastvorkomma = 00490
+lastnachkomma = 5325
+

code/config/neuralnets/Train_CNN_Digital-Readout_Version_4.1.0.h5

@@ -15,7 +15,7 @@ ReadPreValueFromFileMaxAge=30
 AllowNegativeRates=False
 #Stores the last Value in a file for the case of a restart (e.g. Docker container after update)
 #Maximum Change of new to old value (+ or -)
-MaxRateValue=0.1
+MaxRateValue=0.2
 #Return in Case of Error: Value = OldValue or NewValue
 #                         ErrorMessage = Return Text with problem (seperated by Tabstopp) if nothing, then no error message
 #                         Readout = Real Readout without corrections (NewValue)
@@ -48,13 +48,13 @@ pos_y=386
 
 [Digital_Digit]
 names=ziffer1, ziffer2, ziffer3, ziffer4, ziffer5
-Modelfile=./config/neuralnets/Train_CNN_Digital-Readout_Version_4.1.0.h5
+Modelfile=./config/neuralnets/Train_CNN_Digital-Readout_Version_5.0.0.h5
 #LogImageLocation=./log/digital_digit
 #LogNames=zeiger3, zeiger4
 
 [Analog_Counter]
 names=zeiger1, zeiger2, zeiger3, zeiger4
-Modelfile=./config/neuralnets/CNN_Analog-Readout_Version-4.0.1.h5
+Modelfile=./config/neuralnets/CNN_Analog-Readout_Version-5.0.0.h5
 #LogImageLocation=./log/analog_counter
 #LogNames=zeiger3, zeiger4