Merge pull request #1 from jomjol/rolling

Update Rolling
jomjol · Sep 23, 2020 · 5e037d7 · 5e037d7
2 parents a8aa6d6 + 8d2ddc2
commit 5e037d7
Show file tree

Hide file tree

Showing 10 changed files with 299 additions and 461 deletions.
diff --git a/README.md b/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
 

diff --git a/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
@@ -171,17 +171,13 @@ 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))
         {
             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);

diff --git a/code/sdkconfig b/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