diff --git a/Changelog.md b/Changelog.md index 7d2b3c9d..bf580b89 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,130 @@ # Versions +##### 5.0.0 Setup Modus - (2020-12-06) + +* Implementation of initial setup modus for fresh installation + +* Code restructuring (full compatibility between pure ESP-IDF and Platformio w/ espressif) + + + +##### 4.1.1 Configuration editor - (2020-12-02) + +* Bug fixing: internal improvement of file handling (reduce not responding) + + +##### 4.1.0 Configuration editor - (2020-11-30) + +* Implementation of configuration editor (including basic and expert mode) + +* Adjustable time zone to adjust to local time setting (incl. daylight saving time) + +* MQTT: additional topic for error reporting + +* standardized access to current logfile via `http://IP-ADRESS/logfileact` + +* Update digital CNN to v7.2.0, analog CNN to 6.3.0 + +* Bug fixing: truncation error, CheckDigitConsistency & PreValue implementation + + + +##### 4.0.0 Tflite Core - (2020-11-15) + +* Implementation of rolling log-files + +* Update Tflite-Core to master@20201108 (v2.4) + +* Bug-fixing for reducing reboots + + + +##### 3.1.0 MQTT-Client - (2020-10-26) + +* Update digital CNN to v6.5.0 and HTML (Info to hostname, IP, ssid) + +* New implementation of "checkDigitConsistency" also for digits +* MQTT-Adapter: user and password for sign in MQTT-Broker + +##### 3.0.0 MQTT-Client (2020-10-14) + +* Implementation of MQTT Client +* Improved Version Control +* bug-fixing + + + +##### 2.2.1 Version Control (2020-09-27) + +* Bug-Fixing (hostname in wlan.ini and error handling inside flow) + + +##### 2.2.0 Version Control (2020-09-27) + +* Integrated automated versioning system (menu: SYSTEM --> INFO) +* Update Build-System to PlatformIO - Espressif 32 v2.0.0 (ESP-IDF 4.1) + + +##### 2.1.0 Decimal Shift, Chrome & Edge (2020-09-25) + +* Implementation of Decimal Shift + +* Update default CNN for digits to v6.4.0 + +* Improvement HTML + +* Support for Chrome and Edge + +* Reduce logging to minimum - extended logging on demand + +* Implementation of hostname in wlan.ini (`hostname = "HOSTNAME")` + +* Bug fixing, code corrections + + +##### 2.0.0 Layout update (2020-09-12) + + * Update to **new and modern layout** + * Support for Chrome improved + * Improved robustness: improved error handling in auto flow reduces spontaneous reboots + * File server: Option for "DELETE ALL" + * WLan: support of spaces in SSID and password + * Reference Image: Option for mirror image, option for image update on the fly + * additional parameter in `wasserzaehler.html?noerror=true` to suppress an potential error message + * bug fixing + + + +##### 1.1.3 (2020-09-09) + +* **Bug in configuration of analog ROIs corrected** - correction in v.1.0.2 did not work properly +* Improved update page for the web server (`/html` can be updated via a zip-file, which is provided in `/firmware/html.zip`) +* Improved Chrome support + +##### 1.1.0 (2020-09-06) + +* Implementation of "delete complete directory" + **Attention: beside the `firmware.bin`, also the content of `/html` needs to be updated!** + + + +##### 1.0.2 (2020-09-06) + +* Bug in configuration of analog ROIs corrected +* minor bug correction + +##### 1.0.1 (2020-09-05) + +* preValue.ini Bug corrected +* minor bug correction + +##### 1.0.0 (2020-09-04) + +* **First usable version** - compatible to previous project (https://github.com/jomjol/water-meter-system-complete) +* NEW: + * no docker container for CNN calculation necessary + * web based configuration editor on board + ##### 0.1.0 (2020-08-07) * Initial Version - diff --git a/README.md b/README.md index bd14c114..5d9e4e73 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,10 @@ If you would like to support the developer with a cup of coffee you can do that +##### 6.4.0 Image Processing in Memory - (2021-03-20) + +* Additional alignment marks for settings the ROIs (analog and digit) + ##### 6.3.1 Image Processing in Memory - (2021-03-16) * NEW: 6.3.1: bug fixing in initial edit reference image and `config.ini` (Spelling error in `InitialRotate`) @@ -91,136 +95,27 @@ If you would like to support the developer with a cup of coffee you can do that * Bug fixing: edit digits, handling PreValue, html-bugs - + + + +## History ##### 5.0.0 Setup Modus - (2020-12-06) -* Implementation of initial setup modus for fresh installation - -* Code restructuring (full compatibility between pure ESP-IDF and Platformio w/ espressif) - - - ##### 4.1.1 Configuration editor - (2020-12-02) -* Bug fixing: internal improvement of file handling (reduce not responding) - - -##### 4.1.0 Configuration editor - (2020-11-30) - -* Implementation of configuration editor (including basic and expert mode) - -* Adjustable time zone to adjust to local time setting (incl. daylight saving time) - -* MQTT: additional topic for error reporting - -* standardized access to current logfile via `http://IP-ADRESS/logfileact` - -* Update digital CNN to v7.2.0, analog CNN to 6.3.0 - -* Bug fixing: truncation error, CheckDigitConsistency & PreValue implementation - - - ##### 4.0.0 Tflite Core - (2020-11-15) -* Implementation of rolling log-files - -* Update Tflite-Core to master@20201108 (v2.4) - -* Bug-fixing for reducing reboots - - - ##### 3.1.0 MQTT-Client - (2020-10-26) -* Update digital CNN to v6.5.0 and HTML (Info to hostname, IP, ssid) - -* New implementation of "checkDigitConsistency" also for digits -* MQTT-Adapter: user and password for sign in MQTT-Broker - -##### 3.0.0 MQTT-Client (2020-10-14) - -* Implementation of MQTT Client -* Improved Version Control -* bug-fixing +##### 2.2.1 Version Control - (2020-09-27) - -##### 2.2.1 Version Control (2020-09-27) - -* Bug-Fixing (hostname in wlan.ini and error handling inside flow) - +##### 2.1.0 Decimal Shift, Chrome & Edge - (2020-09-25) -##### 2.2.0 Version Control (2020-09-27) +##### 2.0.0 Layout update - (2020-09-12) -* Integrated automated versioning system (menu: SYSTEM --> INFO) -* Update Build-System to PlatformIO - Espressif 32 v2.0.0 (ESP-IDF 4.1) - - -##### 2.1.0 Decimal Shift, Chrome & Edge (2020-09-25) - -* Implementation of Decimal Shift - -* Update default CNN for digits to v6.4.0 - -* Improvement HTML - -* Support for Chrome and Edge - -* Reduce logging to minimum - extended logging on demand - -* Implementation of hostname in wlan.ini (`hostname = "HOSTNAME")` - -* Bug fixing, code corrections - - -##### 2.0.0 Layout update (2020-09-12) - - * Update to **new and modern layout** - * Support for Chrome improved - * Improved robustness: improved error handling in auto flow reduces spontaneous reboots - * File server: Option for "DELETE ALL" - * WLan: support of spaces in SSID and password - * Reference Image: Option for mirror image, option for image update on the fly - * additional parameter in `wasserzaehler.html?noerror=true` to suppress an potential error message - * bug fixing - - - -##### 1.1.3 (2020-09-09) - -* **Bug in configuration of analog ROIs corrected** - correction in v.1.0.2 did not work properly -* Improved update page for the web server (`/html` can be updated via a zip-file, which is provided in `/firmware/html.zip`) -* Improved Chrome support - -##### 1.1.0 (2020-09-06) - -* Implementation of "delete complete directory" - **Attention: beside the `firmware.bin`, also the content of `/html` needs to be updated!** - - - -##### 1.0.2 (2020-09-06) - -* Bug in configuration of analog ROIs corrected -* minor bug correction - -##### 1.0.1 (2020-09-05) - -* preValue.ini Bug corrected -* minor bug correction - -##### 1.0.0 (2020-09-04) - -* **First usable version** - compatible to previous project (https://github.com/jomjol/water-meter-system-complete) -* NEW: - * no docker container for CNN calculation necessary - * web based configuration editor on board - -##### 0.1.0 (2020-08-07) - -* Initial Version +##### 1.1.3 Initial Version - (2020-09-09) #### [Full Changelog](Changelog.md) diff --git a/code/main/version.cpp b/code/main/version.cpp index bc7288e4..fb45468b 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="60701bc"; +const char* GIT_REV="3b3d924"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-16 21:11"; \ No newline at end of file +const char* BUILD_TIME="2021-03-17 22:46"; \ No newline at end of file diff --git a/code/sdkconfig b/code/sdkconfig index 8e20c251..7028733c 100644 --- a/code/sdkconfig +++ b/code/sdkconfig @@ -165,8 +165,6 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # CONFIG_BT_ENABLED is not set CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 -CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 -CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 @@ -241,7 +239,6 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y # # ESP32-specific # -CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y CONFIG_ESP32_REV_MIN_0=y # CONFIG_ESP32_REV_MIN_1 is not set # CONFIG_ESP32_REV_MIN_2 is not set @@ -660,10 +657,8 @@ CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE_RXTOALL=y # CONFIG_LWIP_SO_RCVBUF is not set # CONFIG_LWIP_NETBUF_RECVINFO is not set -CONFIG_LWIP_IP4_FRAG=y -CONFIG_LWIP_IP6_FRAG=y -# CONFIG_LWIP_IP4_REASSEMBLY is not set -# CONFIG_LWIP_IP6_REASSEMBLY is not set +CONFIG_LWIP_IP_FRAG=y +# CONFIG_LWIP_IP_REASSEMBLY is not set # CONFIG_LWIP_STATS is not set # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y @@ -687,10 +682,8 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 # # TCP # -CONFIG_LWIP_TCP_ISN_HOOK=y CONFIG_LWIP_MAX_ACTIVE_TCP=16 CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y CONFIG_LWIP_TCP_MAXRTX=12 CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1440 @@ -705,7 +698,6 @@ CONFIG_LWIP_TCP_QUEUE_OOSEQ=y CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set -CONFIG_LWIP_TCP_RTO_TIME=1500 # end of TCP # @@ -721,8 +713,6 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF # CONFIG_LWIP_PPP_SUPPORT is not set -CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3 -CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5 # # ICMP @@ -1006,8 +996,6 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 # CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_TLS_V12 is not set -# CONFIG_WPA_WPS_WARS is not set -# CONFIG_WPA_DEBUG_PRINT is not set # end of Supplicant # diff --git a/code/test/README b/code/test/README deleted file mode 100644 index b94d0890..00000000 --- a/code/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PlatformIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PlatformIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/code/version.cpp b/code/version.cpp index d473078c..fb45468b 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="5f0f180"; +const char* GIT_REV="3b3d924"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-14 12:56"; \ No newline at end of file +const char* BUILD_TIME="2021-03-17 22:46"; \ No newline at end of file diff --git a/firmware/html.zip b/firmware/html.zip index d569e952..571419e4 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/config/ana0700s1lq.tflite b/sd-card/config/ana0700s1lq.tflite new file mode 100644 index 00000000..531c1a2d Binary files /dev/null and b/sd-card/config/ana0700s1lq.tflite differ diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini index 9864faa5..9c2b9850 100644 --- a/sd-card/config/config.ini +++ b/sd-card/config/config.ini @@ -26,7 +26,7 @@ digit2 355 120 37 67 digit3 404 120 37 67 [Analog] -Model = /config/ana0630s2.tflite +Model = /config/ana0700s1lq.tflite ;LogImageLocation = /log/analog ;LogfileRetentionInDays = 3 ModelInputSize = 32 32 diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html index 080d89d6..d627bdc4 100644 --- a/sd-card/html/edit_analog.html +++ b/sd-card/html/edit_analog.html @@ -363,7 +363,15 @@ function ParseIni(_basepath) { var y0 = parseInt(rect.startY) - parseInt(lw/2); var dx = parseInt(rect.w) + parseInt(lw); var dy = parseInt(rect.h) + parseInt(lw); - context.strokeRect(x0, y0, dx, dy); + context.strokeRect(x0, y0, dx, dy); + context.lineWidth = 1; + context.beginPath(); + context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI); + context.moveTo(x0+dx/2, y0); + context.lineTo(x0+dx/2, y0+dy); + context.moveTo(x0, y0+dy/2); + context.lineTo(x0+dx, y0+dy/2); + context.stroke(); ROIInfo[aktindex]["x"] = rect.startX; ROIInfo[aktindex]["y"] = rect.startY; ROIInfo[aktindex]["dx"] = rect.w; diff --git a/sd-card/html/edit_digits.html b/sd-card/html/edit_digits.html index 1ea6c861..647850ed 100644 --- a/sd-card/html/edit_digits.html +++ b/sd-card/html/edit_digits.html @@ -354,7 +354,9 @@ function draw() { var y0 = parseInt(rect.startY) - parseInt(lw/2); var dx = parseInt(rect.w) + parseInt(lw); var dy = parseInt(rect.h) + parseInt(lw); - context.strokeRect(x0, y0, dx, dy); + context.strokeRect(x0, y0, dx, dy); + context.lineWidth = 1; + context.strokeRect(x0+dx*0.2, y0+dy*0.2, dx*0.6, dy*0.6); ROIInfo[aktindex]["x"] = rect.startX; ROIInfo[aktindex]["y"] = rect.startY; ROIInfo[aktindex]["dx"] = rect.w; diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js index a3e80ee6..40a7c87a 100644 --- a/sd-card/html/gethost.js +++ b/sd-card/html/gethost.js @@ -9,7 +9,7 @@ function getbasepath(){ { // host = "http://192.168.2.118"; // jomjol interner test // host = "http://192.168.178.26"; // jomjol interner test - host = "http://192.168.178.26"; // jomjol interner Real + host = "http://192.168.178.22"; // jomjol interner Real // host = "."; // jomjol interner localhost } diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index dc0208ab..19b860c1 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -6.3.1 +6.4.0