v10.5.2

README.md

@@ -53,9 +53,10 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 10.5.1 - Stability Increase (2022-02-20)
+##### 10.5.2 - Stability Increase (2022-02-22)
 
-- **NEW 10.5.1:** Bug Fix: wrong return value & PreValue status, HTML: SSID & IP were not displayed 
+- **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 select able values for consistency
 - Refactoring of check postprocessing consistency (e.g. max rate, negative rate, ...)

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -605,6 +605,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
     for (int j = 0; j < NUMBERS.size(); ++j)
     {
         NUMBERS[j]->ReturnRawValue = "";
+        NUMBERS[j]->ReturnRateValue = "";
         NUMBERS[j]->ReturnValue = "";
         NUMBERS[j]->ErrorMessageText = "";
         NUMBERS[j]->Value = -1;
@@ -670,8 +671,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         double difference = difftime(imagetime, NUMBERS[j]->lastvalue);      // in Sekunden
         difference /= 60;  
         NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / difference;
+        NUMBERS[j]->ReturnRateValue =  to_string(NUMBERS[j]->FlowRateAct);
 
-        if (NUMBERS[j]->useMaxRateValue)
+        if (NUMBERS[j]->useMaxRateValue && PreValueUse && NUMBERS[j]->PreValueOkay)
         {
             float _ratedifference;                                                   
             if (NUMBERS[j]->RateType == RateChange)
@@ -684,6 +686,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
                 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;
                 NUMBERS[j]->ReturnValue = "";
+                NUMBERS[j]->ReturnRateValue = "";
                 continue;
             }
         }

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="cbe884a";
-const char* GIT_TAG="v10.5.0";
+const char* GIT_REV="7187101";
+const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2022-02-20 16:02";
+const char* BUILD_TIME="2022-02-22 19:05";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v10.5.1 - 2022-02-20";
+const char* GIT_BASE_BRANCH = "master - v10.5.2 - 2022-02-22";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="cbe884a";
-const char* GIT_TAG="v10.5.0";
+const char* GIT_REV="7187101";
+const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2022-02-20 16:01";
+const char* BUILD_TIME="2022-02-22 19:05";