Merge branch 'master' into rolling

Author: jomjol

README.md

@@ -49,17 +49,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling (2021-11-06)
+##### 9.1.0 - External Illumination (2021-11-14)
 
-* External LEDs: change control mode (problem with more than 2 LEDs)
-
-* Additional info into log file
-
-* Bug fix: wrong number of sub digits in case analog and decimal shift
-
-* Bug fix: html code
-
-  
+- External LEDs: change control mode (resolve bug with more than 2 LEDs)
+- Additional info into log file
+- Bug fix: decimal shift, html, log file
 
 ##### 9.0.0 - External Illumination (2021-10-23)
 

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -492,8 +492,6 @@ void ClassFlowPostProcessing::InitNUMBERS()
         _number->MaxRateValue = 0.1;
         _number->useMaxRateValue = false;
         _number->checkDigitIncreaseConsistency = false;
-        _number->PreValueOkay = false;
-        _number->useMaxRateValue = false;
         _number->DecimalShift = 0;
         _number->DecimalShiftInitial = 0;
         _number->isExtendedResolution = false;
@@ -658,7 +656,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
                 zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
             }
 
-            if (NUMBERS[j]->useMaxRateValue && (abs(NUMBERS[j]->Value - NUMBERS[j]->PreValue) > NUMBERS[j]->MaxRateValue))
+            if (NUMBERS[j]->useMaxRateValue && ((abs(NUMBERS[j]->Value - NUMBERS[j]->PreValue) > 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;

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="020e93b";
+const char* GIT_REV="4fe9ab9";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-11-06 22:37";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-11-14 08:39";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="020e93b";
+const char* GIT_REV="4fe9ab9";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-11-06 22:36";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-11-14 08:39";