v10.5.0

README.md

@@ -46,7 +46,6 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 ### Known Issues
 
 * slow response of web server during picture analysis
-* ~~spontaneous reboots (mostly due to html access during image processing)~~  --> solved since v10.3.0
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
@@ -54,14 +53,13 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling (2022-02-15)
+##### 10.5.0 - Stability Increase (2022-02-18)
 
-- Refactoring of check postprocessing consistency (e.g. max rate, negative rate, ...)
 - MQTT: changed wifi naming to "wifiRSSI"
 
-Rolling (2022-02-13)
-
 - HTML: check select able values for consistency
+- Refactoring of check postprocessing consistency (e.g. max rate, negative rate, ...)
+- Bug Fix: corrected error in "Check Consistency Increase"
 
 
 

code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h

@@ -39,7 +39,6 @@ struct NumberPost {
     string ReturnRawValue;      // Rohwert (mit N & führenden 0)    
     string ReturnValue;         // korrigierter Rückgabewert, ggf. mit Fehlermeldung
     string ReturnPreValue;  // korrigierter Rückgabewert ohne Fehlermeldung
-//    string ReturnValueNoError;
     string ErrorMessageText;        // Fehlermeldung bei Consistency Check
     int AnzahlAnalog;
     int AnzahlDigital;

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -626,7 +626,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
         NUMBERS[j]->ReturnRawValue = ShiftDecimal(NUMBERS[j]->ReturnRawValue, NUMBERS[j]->DecimalShift);
 
-        printf("RetunrRawValue %s", NUMBERS[j]->ReturnRawValue.c_str());  
+        printf("ReturnRaw %s", NUMBERS[j]->ReturnRawValue.c_str());  
 
 
         if (IgnoreLeadingNaN)               
@@ -676,7 +676,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
             else
                 _ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue);
 
-            if (abs(_ratedifference) > NUMBERS[j]->MaxRateValue)
+            if (abs(_ratedifference) > abs(NUMBERS[j]->MaxRateValue))
             {
                 NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Rate too high - Read: " + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
                 NUMBERS[j]->Value = NUMBERS[j]->PreValue;
@@ -829,14 +829,14 @@ float ClassFlowPostProcessing::checkDigitConsistency(float input, int _decilamsh
     while (pot <= pot_max)
     {
         zw = input / pow(10, pot-1);
-        aktdigit_before = ((int) round(zw) + 10) % 10;
+        aktdigit_before = ((int) zw) % 10;
         zw = _preValue / pow(10, pot-1);
-        olddigit_before = ((int) round(zw) + 10) % 10;
+        olddigit_before = ((int) zw) % 10;
 
         zw = input / pow(10, pot);
-        aktdigit = ((int) round(zw) + 10) % 10;
+        aktdigit = ((int) zw) % 10;
         zw = _preValue / pow(10, pot);
-        olddigit = ((int) round(zw) + 10) % 10;
+        olddigit = ((int) zw) % 10;
 
         no_nulldurchgang = (olddigit_before <= aktdigit_before);
 

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1f5486e";
+const char* GIT_REV="bcb1d98";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-02-15 21:28";
+const char* BUILD_TIME="2022-02-18 21:01";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v10.4.0 - 2022-02-12";
+const char* GIT_BASE_BRANCH = "master - v10.5.0 - 2022-02-18";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1f5486e";
+const char* GIT_REV="bcb1d98";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-02-15 21:28";
+const char* BUILD_TIME="2022-02-18 21:01";