Merge pull request #17 from jomjol/rolling

Update latest to v5.3.0

Author: jomjol

Config_Description.md

@@ -30,6 +30,8 @@ Here a consistency check of the readout value with respect to the previous full
 | Parameter        | Meaning           | Example        |
 | ------------- | ------------- | ------------- |
 | Enabled | Diable or Enable the Check | `Enabled=True` |
+| ReadPreValueFromFileAtStartup | Diable or Enable the Reading of the prevalue from file at Startup | `ReadPreValueFromFileAtStartup=True` |
+| ReadPreValueFromFileMaxAge | Maximum timedifference between last storage of prevalue in file and start in minutes | `ReadPreValueFromFileMaxAge=30` |
 | AllowNegativeRates | If set to `False`, then only increasing counter values are accepted | `AllowNegativeRates=False` |
 | MaxRateValue | Maximum absolute change from the previous value (+/-) | `MaxRateValue=0.1` |
 | ErrorReturn | Return value, in case of unconsistent values | `ErrorReturn=OldValue, ErrorMessage, Readout` |

README.md

@@ -15,8 +15,8 @@ This is available for an Intel based System (e.g. Synology Docker) as well as an
 | -------------- | ------------- | ------------- |
 | rolling | Experimental version for amd64-systems (e.g. Intel processors) | newest features, not fully tested |
 | raspi-rolling | Experimental version for armv7-systems (Raspberry PI3 and higher) | newest features, not fully tested  |
-| latest | Latest stable version for amd64-systems (e.g. Intel processors) | Currently identical to v5.0.0 (2019-12-28) |
-| raspi-latest | Latest stable version for armv7-systems (Raspberry PI3 and higher) | Currently identical to v5.0.0 (2019-12-28) |
+| latest | Latest stable version for amd64-systems (e.g. Intel processors) | Currently identical to v5.3.0 (2020-01-12) |
+| raspi-latest | Latest stable version for armv7-systems (Raspberry PI3 and higher) | Currently identical to v5.3.0 (2020-01-12) |
 | v4.x | Update to Tensorflow 2.0, fully automated build | Details see below |
 | v3.x | Tensorflow 1.4, manual build | Details see below  |
 
@@ -36,6 +36,13 @@ 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)
+* 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)
+* 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
 ##### 5.0.0 (2019-12-28)
 * Separate environmental setup to dedicated Docker images (for Raspberry: raspi-opencv-tensorflow and for Synology (Intel w/o AVX2): synology-opencv-tensorflow)
 

Raspi-Cron-Job.md

@@ -0,0 +1,18 @@
+# Setup of Cron job on Raspberry
+
+In the current version of Tensorflow (2.0) is a memory leakage in the function tf.predict(). This causes especially on the Raspberry the docker container to crash after some time.
+A work around for this is a regular restart of the container. The idea is from the user pfried from the iobroker forum - Many thanks to this!
+
+## Implementation
+The restart is done using within a cron job. To make this easier it is recommendet to give your docker container a dedicated name at start (```--name wasser```):
+
+```docker run -d --name wasser -p 3000:3000 --mount type=bind,source=/PATH_TO_LOCAL_CONFIG, target=/config --mount type=bind,source=/PATH_TO_LOCAL_LOG,target=/log jomjol/wasserzaehler:raspi-latest```
+
+After this you can easily restart it with a given frequency using a cron job in the file '''/etc/crontab''':
+
+```0 */6 * * *   root    /usr/bin/docker restart wasser```
+ 
+ In this example the container will be restartet every 6 hours on the full hour.
+ 
+ Explanation for cron jobs on Raspberry Pi can be found [here](http://raspberry.tips/raspberrypi-einsteiger/cronjob-auf-dem-raspberry-pi-einrichten)
+

code/Dockerfile_raspi

@@ -5,10 +5,8 @@ RUN [ "cross-build-start" ]
 WORKDIR /
 
 COPY . ./
-#RUN pip3 install --no-cache-dir ./wheels_raspi/opencv_contrib_python-4.1.1.26-cp37-cp37m-linux_armv7l.whl
 RUN pip3 install --no-cache-dir -r requirements_raspi.txt
 
-
 RUN [ "cross-build-end" ]
 
 EXPOSE 3000

code/config/config.ini

@@ -8,10 +8,15 @@ URLImageSource=http://192.168.178.22/capture_with_flashlight
 
 [ConsistencyCheck]
 Enabled=True
+
+ReadPreValueFromFileAtStartup=True
+#Maximum Time spanning since last startup for use of preValue from Filestorage in minutes
+ReadPreValueFromFileMaxAge=30
+#Stores the last Value in a file for the case of a restart (e.g. Docker container after update)
+
 AllowNegativeRates=False
 #Maximum Change of new to old value (+ or -)
 MaxRateValue=0.1
-
 #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)

code/config/prevalue.ini

@@ -0,0 +1,4 @@
+[PreValue]
+time = 2000-01-01_00-00-00
+LastVorkomma = 00000
+LastNachkomma = 0000

code/config_default/config.ini

@@ -8,10 +8,14 @@ URLImageSource=http://192.168.178.22/capture_with_flashlight
 
 [ConsistencyCheck]
 Enabled=True
+ReadPreValueFromFileAtStartup=True
+#Maximum Time spanning since last startup for use of preValue from Filestorage in minutes
+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
-
 #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)

code/config_default/prevalue.ini

@@ -0,0 +1,4 @@
+[PreValue]
+time = 2000-01-01_00-00-00
+LastVorkomma = 00000
+LastNachkomma = 0000