v8.0.5

README.md

@@ -47,9 +47,10 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 8.0.4 - Multi Meter Support (2021-07-29)
+##### 8.0.5 - Multi Meter Support (2021-07-29)
 
-* NEW 8.0.4: bug fix: failed configuration after upgrade
+* NEW 8.0.5: bug fix: saving prevalue
+* NEW 8.0.4: bug fix: load config.ini after upgrade
 * NEW 8.0.3: bug fix: reboot during `config.ini` handling, html error
 * NEW 8.0.2: saving roundes prevalue, bug fix html server
 * NEW 8.0.1: bug fix: html handling of parameter `FixedExposure` and `ImageSize`

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -331,7 +331,7 @@ string ClassFlowControll::GetPrevalue(std::string _number)
     return std::string();    
 }
 
-std::string ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbers)
+std::string ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern)
 {
     float zw;
     char* p;
@@ -353,7 +353,7 @@ std::string ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string
 
     if (flowpostprocessing)
     {
-        flowpostprocessing->SetPreValue(zw, _numbers);
+        flowpostprocessing->SetPreValue(zw, _numbers, _extern);
         return _newvalue;    
     }
 

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -45,7 +45,7 @@ class ClassFlowControll :
 	bool getStatusSetupModus(){return SetupModeActive;};
 	string getReadout(bool _rawvalue, bool _noerror);
 	string getReadoutAll(int _type);	
-	string UpdatePrevalue(std::string _newvalue, std::string _numbers);
+	string UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern);
 	string GetPrevalue(std::string _number = "");	
 	bool ReadParameter(FILE* pfile, string& aktparamgraph);	
 

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -152,7 +152,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
 
         for (int i = 0; i < NUMBERS.size(); ++i)
         {
-            result =  NUMBERS[i]->ReturnValueNoError;
+            result =  NUMBERS[i]->ReturnValue;
             resulterror = NUMBERS[i]->ErrorMessageText;
             resultrate = std::to_string(NUMBERS[i]->FlowRateAct);
             resulttimestamp = NUMBERS[i]->timeStamp;

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -37,12 +37,22 @@ string ClassFlowPostProcessing::GetPreValue(std::string _number)
     return result;
 }
 
-void ClassFlowPostProcessing::SetPreValue(float zw, string _numbers)
+void ClassFlowPostProcessing::SetPreValue(float zw, string _numbers, bool _extern)
 {
+    printf("SetPrevalue: %f, %s\n", zw, _numbers.c_str());
     for (int j = 0; j < NUMBERS.size(); ++j)
     {
+//        printf("Number %d, %s\n", j, NUMBERS[j]->name.c_str());
         if (NUMBERS[j]->name == _numbers)
+        {
             NUMBERS[j]->PreValue = zw;
+            if (_extern)
+            {
+                time(&(NUMBERS[j]->lastvalue));
+                localtime(&(NUMBERS[j]->lastvalue));
+            }
+//            printf("Found %d! - set to %f\n", j,  NUMBERS[j]->PreValue);
+        }
     }
     UpdatePreValueINI = true;
     SavePreValue();
@@ -207,8 +217,9 @@ void ClassFlowPostProcessing::SavePreValue()
         struct tm* timeinfo = localtime(&NUMBERS[j]->lastvalue);
         strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
         NUMBERS[j]->timeStamp = std::string(buffer);
+//        printf("SaverPreValue %d, Value: %f, Nachkomma %d\n", j, NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
 
-        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + "\n";
+        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + "\n";
         printf("Write PreValue Zeile: %s\n", _zw.c_str());
 
         fputs(_zw.c_str(), pFile);

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h

@@ -87,7 +87,7 @@ class ClassFlowPostProcessing :
     string getReadoutTimeStamp(int _number = 0);
     void SavePreValue();
     string GetPreValue(std::string _number = "");
-    void SetPreValue(float zw, string _numbers);
+    void SetPreValue(float zw, string _numbers, bool _extern = false);
     std::vector<NumberPost*> GetNumbers(){return NUMBERS;};
 
     string name(){return "ClassFlowPostProcessing";};

code/components/jomjol_tfliteclass/server_tflite.cpp

@@ -569,7 +569,7 @@ esp_err_t handler_prevalue(httpd_req_t *req)
     }
     else
     {
-        zw = "SetPrevalue to " + tfliteflow.UpdatePrevalue(_size, _numbers);
+        zw = "SetPrevalue to " + tfliteflow.UpdatePrevalue(_size, _numbers, true);
     }
 
     resp_str = zw.c_str();

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1bcaf09";
+const char* GIT_REV="d4b5ec2";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-29 20:15";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-08-01 21:38";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v8.0.4 - 2021-07-29";
+const char* GIT_BASE_BRANCH = "master - v8.0.5 - 2021-08-01";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1bcaf09";
+const char* GIT_REV="d4b5ec2";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-29 20:15";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-08-01 21:38";