rolling 20210713 BETA v8.0.0

README.md

@@ -45,6 +45,22 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
+
+
+##### Rolling - **BETA for v8.0.0 - Multi Meter Support** (2021-07-13)
+
+* Dual / multi meter support (more than 1 number to be recognized)
+  This is implemented with the feature "number" on the ROI definition as well as selected options
+* MQTT: standardization of the naming - including new topics (`json`,  `freeMem `, `uptime`)c
+* Preparation for extended GPIO support (thanks to Zwerk2k) - not tested and functional fully yet
+* Bug fixing: html server, memory leak, MQTT connect, hostname, turn of flash LED
+
+<span style="color: red;">**ATTENTION: the configuration and prevalue files are modified automatically and will not be backward compatible!**</span> 
+
+
+
+
+
 Rolling - (2021-07-12)
 
 * HTML: Bug fixing

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -294,7 +294,7 @@ void ClassFlowPostProcessing::handleMaxRateValue(string _decsep, string _value)
 
         try
         {
-            _zwdc = stoi(_value);
+            _zwdc = stof(_value);
         }
         catch(const std::exception& e)
         {
@@ -601,7 +601,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
             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]->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;
                 zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
             }

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="76a0518";
+const char* GIT_REV="1f6b02a";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-07-12 19:27";
+const char* BUILD_TIME="2021-07-13 20:37";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="76a0518";
+const char* GIT_REV="1f6b02a";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-07-12 19:27";
+const char* BUILD_TIME="2021-07-13 20:37";

sd-card/config/config.ini

@@ -20,7 +20,7 @@ FlipImageSize = false
 /config/ref1.jpg 442 142
 
 [Digits]
-Model = /config/dig1040s1q.tflite
+Model = /config/dig1100s2q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32

sd-card/html/version.txt

@@ -1 +1 @@
-9.4.0
+9.5.0