+* New housing published for external LEDs and small clearing: https://www.thingiverse.com/thing:5028229
+
##### 8.5.0 - Multi Meter Support (2021-10-07)
diff --git a/README.md b/README.md
index 0ad9125c..bd6e2fdc 100644
--- a/README.md
+++ b/README.md
@@ -33,173 +33,35 @@ If you have any technical topics, you can file a issue in this repository.
In other cases you can contact the developer via email: 
-------
-## Coming next
-
-* Automated update of the neural network file (tflite) to make the learing of additional pictures much easier and automated (GitHub action)
-* New "hyprid" neural network for digital numbers --> allowing the detection of intermediate states ("ring between two numbers") as a subdigit
-
------
## Change log
-### Known Issues
-
-* Slow response of web server during picture analysis
-
**General remark:** Besides the file `firmware.bin`, typically the content of `/html` will need to be updated!
------
-##### 10.6.2
+##### 11.0.0 - Intermediate Digits
-- ignore hidden files in model selection (configuration page)
+- Implementation of new CNN types to detect intermediate values of digits with rolling numbers
+ - By default the old algo (0, 1, ..., 9, "N") is active (due to the limited types of digits trained so far)
+ - Activation can be done by selection a tflite file with the new trained model in the 'config.ini'
+ - **Details can be found in the [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Neural-Network-Types)** (different types, trained image types, naming convention)
-##### 10.6.1 - Stability Increase (2022-07-24)
+- Updated neural network files (and adaption to new naming convention)
-- **NEW 10.6.1**: Revoke esp32cam & tflite update
+- Published a tool to download and combine log files - **Thanks to **
-- **NEW 10.6.1**: Bug Fix: tflite-filename with ".", HTML spelling error
+ - Files see ['/tools/logfile-tool'](tbd), How-to see [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Gasmeter-Log-Downloader)
-- IndluxDB: direct injection into InfluxDB - thanks to **[wetneb](https://github.com/wetneb)**
-
-- MQTT: implemented "Retain Flag" and extend with absolute Change (in addition to rate)
-
-- `config.ini`: removal of modelsize (readout from tflite)
-
-- Updated analog neural network file (`ana1000s2.tflite`) & digital neural network file (`dig1400s2q.tflite`)
-
-- TFMicro/Lite: Update (espressif Version 20220716)
-
-- Updated esp32cam (v20220716)
-
-- ESP-IDF: Update to 4.4
-
-- Internal update (CNN algorithm optimizations, reparation for new neural network type)
-
-- Bug Fix: no time with fixed IP, Postprocessing, MQTT
+- Bug Fix: InfluxDB enabling in grahic configuration
-##### 10.5.2 - Stability Increase (2022-02-22)
-
-- NEW 10.5.2: Bug Fix: wrong `firmware.bin` (no rate update)
-- NEW 10.5.1: Bug Fix: wrong return value, rate value & PreValue status, HTML: SSID & IP were not displayed
-- MQTT: changed wifi naming to "wifiRSSI"
-- HTML: check selectable values for consistency
-- Refactoring of check postprocessing consistency (e.g. max rate, negative rate, ...)
-- Bug Fix: corrected error in "Check Consistency Increase"
-
-
-
-##### 10.4.0 - Stability Increase (2022-02-12)
-
-- Graphical configuration: select available neural network files (*.tfl, *.tflite) from drop down menu
-- OTA-update: add option to upload tfl / tflite files to the correct location (`/config/`)
- - In the future the new files will also be copied to the `firmware` directory of the repository
-- Added Wifi RSSI to MQTT information
-- Updated analog neural network file (`ana-s3-q-20220105.tflite`)
-- Updated digital neural network file (`dig-s1-q-20220102.tflite`)
-- Updated build environment to `Espressif 3.5.0`
-
-
-
-##### 10.3.0 - Stability Increase (2022-01-29)
-
-- Implemented LED flash dimming (`LEDIntensity`).
- Remark: as auto illumination in the camera is used, this is rather for energy saving. It will not help reducing reflections
-- Additional camera parameters: saturation, contrast (although not too much impact yet)
-- Some readings will have removable "N"s that can not be removed automatically and are handled with an "error" --> no return value in the field "value" anymore (still reported back via field "raw value")
-- Updated esp32 camera hardware driver
-- Bug fix: MQTT, HTML improvements
-
-**ATTENTION: The new ESP32 camera hardware driver is much more stable on newer OV2640 versions (no or much less reboots) but seems to be not fully compatible with older versions.**
-
-* If you have problem with stalled systems you can try the following
- - Update the parameter `ImageQuality` to `12` instead of current value `5` (manually in the `config.ini`)
-
- - If this is not helping, you might need to update your hardware or stay with version 9.2
-
-##### 10.2.0 - Stability Increase (2022-01-14)
-
-- Due to the updated camera driver, the image looks different and a new setup might be needed
- - Update reference image
- - Update Alignment marks
-
-- Reduce reboot due to camera problems
-
-- Update esp32-camera to new version (master as of 2022-01-09)
-
-
-
-##### 10.1.1 - Stability Increase (2022-01-12)
-
-- Bug Fix MQTT problem
-- Issue:
- - Changing from v9.x to 10.x the MQTT-parameter "Topic" was renamed into "MainTopic" to address multiple number meters. This renaming should have been done automatically in the background within the graphical configuration, but was not working. Instead the parameter "Topic" was deleted and "MainTopic" was set to disabled and "undefined".
-- ToDo
- - Update the `html.zip`
- - If old `config.ini` available: copy it to `/config`, open the graphical configuration and save it again.
- - If old `config.ini` not available: reset the parameter "MainTopic" within the `config.ini` manually
- - Reboot
-
-##### 10.1.0 - Stability Increase (2022-01-09)
-
-- Reduce ESP32 frequency to 160MHz
-
-- Update tflite (new source: https://github.com/espressif/tflite-micro-esp-examples)
-
-- Update analog neural network (ana-s3-q-20220105.tflite)
-
-- Update digital neural network (dig-s1-q-20220102.tflite)
-
-- Increased web-server buffers
-- bug fix: compiler compatibility
-
-##### 10.0.2 - Stability Increase (2022-01-01)
-
-- NEW v10.0.2: Corrected JSON error
-
-- Updated compiler toolchain to ESP-IDF 4.3
-
-- Removal of memory leak
-
-- Improved error handling during startup (check PSRAM and camera with remark in logfile)
-
-- MQTT: implemented raw value additionally, removal of regex contrain
-
-- Normalized Parameter ``MaxRateValue`` to "change per minute"
-
-- HTML: improved input handling
-
-- Corrected error handling: in case of error the old value, rate, timestamp are not transmitted any more
-
-
-
-##### 9.2.0 - External Illumination (2021-12-02)
-
-- Direct JSON access: ``http://IP-ADRESS/json``
-- Error message in log file in case camera error during startup
-- Upgrade analog CNN to v9.1.0
-- Upgrade digital CNN to v13.3.0 (added new images)
-- html: support of different ports
-
-##### 9.1.1 - External Illumination (2021-11-16)
-
-- NEW 9.1.1 bug fix: LED implemenetation
-- External LEDs: change control mode (resolve bug with more than 2 LEDs)
-- Additional info into log file
-- Bug fix: decimal shift, html, log file
-
-##### 9.0.0 - External Illumination (2021-10-23)
-
-* Implementation of external illumination to adjust positioning, brightness and color of the illumination now set individually
- * Technical details can be found in the wiki: https://github.com/jomjol/AI-on-the-edge-device/wiki/External-LED
-
-* New housing published for external LEDs and small clearing: https://www.thingiverse.com/thing:5028229
-
-
+## Tools
+* Logfile downloader and combiner (Thx to [reserve85](https://github.com/reserve85))
+ * Files see ['/tools/logfile-tool'](tbd), How-to see [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Gasmeter-Log-Downloader)
@@ -213,6 +75,10 @@ There are some ideas and feature requests which are not followed currently - mai
## History
+##### 10.6.2 - Stability Increase (2022-07-24)
+
+##### 9.2.0 - External Illumination (2021-12-02)
+
##### 8.5.0 Multi Meter Support (2021-10-07)
##### 7.1.2 MQTT-Update - (2021-06-17)
diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
index 2e25b02f..6417f8d1 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
@@ -760,7 +760,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
_fit = _val + _valminus;
}
- if (result >= 10)
+ if (result > 10)
result = result - 10;
if (result < 0)
result = result + 10;
@@ -872,11 +872,14 @@ std::vectorUH;-#9liFJ)_M3IcUi>Y0ht*ywskr1mwpX63!?eTh0rrY<
zJFryzs>&12)IpU&D9NtL*5O?;1R@RL2--uyZD9{#bvxm9*x(U
z@>8>el}1y~k!f1kGBdX=y28vqe4x4}8tNPOhG;tvIFR(01$oKbZ8WKk3>@D$G*k(G
zA`Fe`HtBt6FR+A$+0#4meY`IWeGdlxc#{rYR54%S1>q=jg7k%T<0}r;e(?ZKn?h`Z
zin?0J9-aN`0{~IfRnTBCGm*f7Jp0Z6tR=+EM9H%?`)mE>a3q1r!Q%Q;-O+Q(=%S;g
zlnT35Z6;sLl3wKCaylLriC7i=7H*D2a6Z2UFOEXR;lleZLHeQ+*ZcaiE*HKXh2oS}
z921S64%_uUECa7xiThR9jW