Merge pull request #1 from jomjol/rolling

Update Rolling

README.md

@@ -19,8 +19,6 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 ### Known Issues
 
-* Parts of the web page only works correctly in **Firefox** and Chrome!
-  With **Edge** not all parts (especially the configuration) are **not full functional**.
 * spontaneous reboot, especially in case of intensive web server access (improved since v2.0.0)
 
 ------
@@ -29,7 +27,13 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 
 
-##### Rolling - (2020-09-21)
+##### Rolling - (2020-09-23)
+
+* Error Correction for Chrome and Firefox Support
+
+* Update CNN for digits to v6.4.0 (**Update of `config.ini` and upload of `dig0640s3.tflite` necessary)
+
+2020-09-21
 
 * Temperature Logging, Code Corrections
 

code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -171,9 +171,6 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
         if ((toUpper(zerlegt[0]) == "DECIMALSHIFT") && (zerlegt.size() > 1))
         {
             DecimalShift = stoi(zerlegt[1]);
-            if (PreValueUse){
-                PreValueOkay = LoadPreValue();
-            }
         }
 
         if ((toUpper(zerlegt[0]) == "PREVALUEUSE") && (zerlegt.size() > 1))
@@ -181,7 +178,6 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
             if (toUpper(zerlegt[1]) == "TRUE")
             {
                 PreValueUse = true;
-                PreValueOkay = LoadPreValue();
             }
         }
         if ((toUpper(zerlegt[0]) == "CHECKDIGITINCREASECONSISTENCY") && (zerlegt.size() > 1))
@@ -209,6 +205,10 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
             MaxRateValue = std::stof(zerlegt[1]);
         }
     }
+
+    if (PreValueUse) {
+        PreValueOkay = LoadPreValue();
+    }
     return true;
 }
 
@@ -329,23 +329,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         return true;
     }
 
-/*
-    if (isdigit)
-    {
-        int lastanalog = -1;
-        if (isanalog)
-            lastanalog = analog[0] - 48;
-        digit = ErsetzteN(digit, lastanalog);
-        zw = digit;
-    }
-
-    if (isdigit && isanalog)
-        zw = zw + ".";
-    if (isanalog)
-        zw = zw + analog;
-    zw = ShiftDecimal(zw, DecimalShift);
-*/    
-
     zw = ErsetzteN(ReturnRawValue);
 
     Value = std::stof(zw);

code/sdkconfig

@@ -240,8 +240,8 @@ CONFIG_ESP_EVENT_POST_FROM_ISR=y
 CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
-CONFIG_HTTPD_MAX_URI_LEN=512
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
+CONFIG_HTTPD_MAX_URI_LEN=1024
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_HTTPD_LOG_PURGE_DATA is not set

code/src/CMakeLists.txt

@@ -1,13 +1,7 @@
 # This file was automatically generated for projects
 # without default 'CMakeLists.txt' file.
 
-if(NOT CMAKE_BUILD_EARLY_EXPANSION) 
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp
-           ${CMAKE_CURRENT_BINARY_DIR}/_version.cpp
-    COMMAND ${CMAKE_COMMAND} -P
-            ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake)
-endif()
+
 
 FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
 

code/src/gitversion.cmake

@@ -0,0 +1,24 @@
+# cmake/gitversion.cmake
+cmake_minimum_required(VERSION 3.0.0)
+ 
+message(STATUS "Resolving GIT Version")
+ 
+set(_build_version "unknown")
+ 
+find_package(Git)
+if(GIT_FOUND)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+    WORKING_DIRECTORY "${local_dir}"
+    OUTPUT_VARIABLE _build_version
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  message( STATUS "GIT hash: ${_build_version}")
+else()
+  message(STATUS "GIT not found")
+endif()
+ 
+string(TIMESTAMP _time_stamp)
+ 
+configure_file(${local_dir}/cmake/gitversion.h.in ${output_dir}/gitversion.h @ONLY)

sd-card/config/config.ini

@@ -12,8 +12,7 @@ SearchFieldX = 20
 SearchFieldY = 20
 
 [Digits]
-;Model=/config/dig0622.tfl
-Model=/config/dig0630s3.tflite
+Model=/config/dig0640s3.tflite
 LogImageLocation = /log/digit
 ModelInputSize 20, 32
 digit1, 306, 120, 37, 67
@@ -21,7 +20,6 @@ digit2, 355, 120, 37, 67
 digit3, 404, 120, 37, 67
 
 [Analog]
-;Model=/config/ana0622.tfl
 Model=/config/ana0630s2.tflite
 LogImageLocation = /log/analog
 ModelInputSize 32, 32