Parcourir la source

Rolling 20210831

jomjol il y a 4 ans
Parent
commit
a86434c9a2

+ 7 - 3
README.md

@@ -47,10 +47,14 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling (2021-08-30)
+##### Rolling (2021-08-31)
 
-* dedicated NaN-test case
-* based on v8.2.0
+* Bug fix
+
+Rolling (2021-08-30)
+
+* Dedicated NaN-test case
+* Based on v8.2.0
 
 ##### 8.2.0 - Multi Meter Support (2021-08-24)
 

+ 2 - 4
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -402,8 +402,6 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
 
 void ClassFlowPostProcessing::InitNUMBERS()
 {
-//    ClassFlowDigit* _cdigit = NULL;
-//    ClassFlowAnalog* _canalog = NULL;
     int anzDIGIT = 0;
     int anzANALOG = 0;
     std::vector<std::string> name_numbers;
@@ -572,9 +570,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 ///////////////// SPEZIALFALL für User Gustl ///////////////////////////////////////////////////////
         if (IgnoreLeadingNaN)               
         {
-            while ((NUMBERS[j]->ReturnValue.length() > 1) && (NUMBERS[j]->ReturnValue[0] == 'N'))
+            while ((NUMBERS[j]->ReturnRawValue.length() > 1) && (NUMBERS[j]->ReturnRawValue[0] == 'N'))
             {
-                NUMBERS[j]->ReturnValue.erase(0, 1);
+                NUMBERS[j]->ReturnRawValue.erase(0, 1);
             }
         } 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

+ 2 - 2
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="eb02e0a";
+const char* GIT_REV="b7b7029";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-30 21:07";
+const char* BUILD_TIME="2021-08-31 11:37";

+ 2 - 2
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="eb02e0a";
+const char* GIT_REV="b7b7029";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-30 21:07";
+const char* BUILD_TIME="2021-08-31 11:37";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin