Rolling 20210921

README.md

@@ -47,10 +47,13 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling (2021-09-21)
+##### Rolling (2021-09-22)
 
 * bug fix
 
+  
+
+
 Rolling (2021-09-20)
 
 * Moved setting `ExtendedResolution` to individual number settings

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -311,21 +311,21 @@ bool ClassFlowControll::doFlow(string time)
 
 string ClassFlowControll::getReadoutAll(int _type)
 {
-    std::vector<NumberPost*> numbers = flowpostprocessing->GetNumbers();
+    std::vector<NumberPost*> *numbers = flowpostprocessing->GetNumbers();
     std::string out = "";
 
-    for (int i = 0; i < numbers.size(); ++i)
+    for (int i = 0; i < (*numbers).size(); ++i)
     {
-        out = out + numbers[i]->name + "\t";
+        out = out + (*numbers)[i]->name + "\t";
         switch (_type) {
             case READOUT_TYPE_VALUE:
-                out = out + numbers[i]->ReturnValueNoError;
+                out = out + (*numbers)[i]->ReturnValueNoError;
                 break;
             case READOUT_TYPE_PREVALUE:
                 if (flowpostprocessing->PreValueUse)
                 {
-                    if (numbers[i]->PreValueOkay)
+                    if ((*numbers)[i]->PreValueOkay)
-                        out = out + numbers[i]->ReturnPreValue;
+                        out = out + (*numbers)[i]->ReturnPreValue;
                     else
                         out = out + "PreValue too old";                
                 }
@@ -333,13 +333,13 @@ string ClassFlowControll::getReadoutAll(int _type)
                     out = out + "PreValue deactivated";
                 break;
             case READOUT_TYPE_RAWVALUE:
-                out = out + numbers[i]->ReturnRawValue;
+                out = out + (*numbers)[i]->ReturnRawValue;
                 break;
             case READOUT_TYPE_ERROR:
-                out = out + numbers[i]->ErrorMessageText;
+                out = out + (*numbers)[i]->ErrorMessageText;
                 break;
         }
-        if (i < numbers.size()-1)
+        if (i < (*numbers).size()-1)
             out = out + "\r\n";
     }
 

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -154,16 +154,16 @@ bool ClassFlowMQTT::doFlow(string zwtime)
 
     if (flowpostprocessing)
     {
-        std::vector<NumberPost*> NUMBERS = flowpostprocessing->GetNumbers();
+        std::vector<NumberPost*>* NUMBERS = flowpostprocessing->GetNumbers();
 
-        for (int i = 0; i < NUMBERS.size(); ++i)
+        for (int i = 0; i < (*NUMBERS).size(); ++i)
         {
-            result =  NUMBERS[i]->ReturnValueNoError;
+            result =  (*NUMBERS)[i]->ReturnValueNoError;
-            resulterror = NUMBERS[i]->ErrorMessageText;
+            resulterror = (*NUMBERS)[i]->ErrorMessageText;
-            resultrate = std::to_string(NUMBERS[i]->FlowRateAct);
+            resultrate = std::to_string((*NUMBERS)[i]->FlowRateAct);
-            resulttimestamp = NUMBERS[i]->timeStamp;
+            resulttimestamp = (*NUMBERS)[i]->timeStamp;
 
-            namenumber = NUMBERS[i]->name;
+            namenumber = (*NUMBERS)[i]->name;
             if (namenumber == "default")
                 namenumber = maintopic + "/";
             else

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -293,15 +293,15 @@ void ClassFlowPostProcessing::handleDecimalSeparator(string _decsep, string _val
     {
         int _zwdc = 0;
 
-        try
+//        try
         {
             _zwdc = stoi(_value);
         }
-        catch(const std::exception& e)
+/*        catch(const std::exception& e)
         {
             printf("ERROR - Decimalshift is not a number: %s\n", _value.c_str());
         }
-        
+*/        
         if (_digit == "default")                        // erstmal auf default setzen (falls sonst nichts gesetzt)
         {
             NUMBERS[j]->DecimalShift = _zwdc;
@@ -332,15 +332,15 @@ void ClassFlowPostProcessing::handleMaxRateValue(string _decsep, string _value)
     {
         float _zwdc = 1;
 
-        try
+//        try
         {
             _zwdc = stof(_value);
         }
-        catch(const std::exception& e)
+/*        catch(const std::exception& e)
         {
             printf("ERROR - MaxRateValue is not a number: %s\n", _value.c_str());
         }
-
+*/
 
         if (_digit == "default")                        // erstmal auf default setzen (falls sonst nichts gesetzt)
         {

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h

@@ -59,7 +59,7 @@ public:
 
     void UpdateNachkommaDecimalShift();
 
-    std::vector<NumberPost*> GetNumbers(){return NUMBERS;};
+    std::vector<NumberPost*>* GetNumbers(){return &NUMBERS;};
 
     string name(){return "ClassFlowPostProcessing";};
 };

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1e6eddc";
+const char* GIT_REV="c033db9";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-09-20 21:11";
+const char* BUILD_TIME="2021-09-21 18:28";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1e6eddc";
+const char* GIT_REV="c033db9";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-09-20 21:11";
+const char* BUILD_TIME="2021-09-21 18:27";