Prepare v4.1.1

README.md

@@ -25,10 +25,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
-##### Rolling - (2020-12-02)
+##### 4.1.1 Configuration editor - (2020-12-02)
 
 * Bug fixing: internal improvement of file handling (reduce not responding)
-* based on v4.1.0
+
+
 
 ##### 4.1.0 Configuration editor - (2020-11-30)
 

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -126,7 +126,6 @@ bool ClassFlowMQTT::doFlow(string zwtime)
     }
 
     OldValue = result;
-
-
+
     return true;
 }

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -4,6 +4,7 @@
 #include "ClassFlowAnalog.h"
 #include "ClassFlowDigit.h"
 #include "ClassFlowMakeImage.h"
+#include "ClassLogFile.h"
 
 #include <iomanip>
 #include <sstream>
@@ -42,6 +43,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
     zwtime = trim(std::string(zw));
 
     fgets(zw, 1024, pFile);
+    fclose(pFile);
     printf("%s", zw);
     zwvalue = trim(std::string(zw));
     PreValue = stof(zwvalue.c_str());
@@ -103,17 +105,15 @@ void ClassFlowPostProcessing::SavePreValue(float value, string zwtime)
         timeinfo = localtime(&rawtime);
 
         strftime(buffer, 80, "%Y-%m-%d_%H-%M-%S", timeinfo);
-
         zwtime = std::string(buffer);
     }
 
-fputs(zwtime.c_str(), pFile);
-fputs("\n", pFile);
-
-fputs(to_string(value).c_str(), pFile);
-fputs("\n", pFile);
+    fputs(zwtime.c_str(), pFile);
+    fputs("\n", pFile);
+    fputs(to_string(value).c_str(), pFile);
+    fputs("\n", pFile);
 
-fclose(pFile);
+    fclose(pFile);
 }
 
 
@@ -269,6 +269,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
     ErrorMessageText = "";
 
+
     for (int i = 0; i < ListFlowControll->size(); ++i)
     {
         if (((*ListFlowControll)[i])->name().compare("ClassFlowMakeImage") == 0)
@@ -312,6 +313,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
     ReturnRawValue = ShiftDecimal(ReturnRawValue, DecimalShift);   
 
+
     if (!PreValueUse || !PreValueOkay)
     {
         ReturnValue = ReturnRawValue;
@@ -336,7 +338,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
     zw = ErsetzteN(ReturnRawValue); 
 
-
     Value = std::stof(zw);
     if (checkDigitIncreaseConsistency)
     {
@@ -367,10 +368,10 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
     if (ErrorMessageText.length() == 0)
     {
         PreValue = Value;
+
         SavePreValue(Value, zwtime);
+
     }
-
-
     return true;
 }
 

code/src/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="ed3226e";
+const char* GIT_REV="f6f3e23";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-12-02 07:33";
+const char* BUILD_TIME="2020-12-02 21:50";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="ed3226e";
+const char* GIT_REV="f6f3e23";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-12-02 07:33";
+const char* BUILD_TIME="2020-12-02 21:50";