浏览代码

update noerror=true

jomjol 5 年之前
父节点
当前提交
186a500a1e

+ 2 - 1
README.md

@@ -31,9 +31,10 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 ##### Rolling - (2020-09-10)
 
+* additional parameter in `wasserzahler.html?noerror=true`  to suppress an potential error message in case of consitency check (is equal to `ErrorMessage` = False in `config.ini`)
 * update ROI-configurator, in case of no ROIs defined
 
-2020-09-10
+2020-09-09
 
 * Update to new and modern layout (thanks to michaeljoos in iobroker-thread)
 * incorporated "Take Picture" to make new reference image

+ 2 - 2
code/lib/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -157,10 +157,10 @@ bool ClassFlowControll::doFlow(string time)
     return result;
 }
 
-string ClassFlowControll::getReadout(bool _rawvalue = false)
+string ClassFlowControll::getReadout(bool _rawvalue = false, bool _noerror = false)
 {
     if (flowpostprocessing)
-        return flowpostprocessing->getReadoutParam(_rawvalue);
+        return flowpostprocessing->getReadoutParam(_rawvalue, _noerror);
 
     string zw = "";
     string result = "";

+ 1 - 1
code/lib/jomjol_flowcontroll/ClassFlowControll.h

@@ -27,7 +27,7 @@ protected:
 public:
 	void InitFlow(std::string config);
 	bool doFlow(string time);
-	string getReadout(bool _rawvalue);
+	string getReadout(bool _rawvalue, bool _noerror);
 	string UpdatePrevalue(std::string _newvalue);
 	string GetPrevalue();	
 	bool ReadParameter(FILE* pfile, string& aktparamgraph);	

+ 5 - 1
code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -154,6 +154,7 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
                             std::stringstream stream;
                             stream << std::fixed << std::setprecision(AnzahlNachkomma) << Value;
                             ReturnValue = stream.str();
+                            ReturnValueNoError = ReturnValue;
                         }
                     }
                 }
@@ -304,6 +305,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         zwvalue = stream.str();
     }
 
+    ReturnValueNoError = zwvalue;
     ReturnValue = zwvalue;
     if (ErrorMessage && (error.length() > 0))
         ReturnValue = ReturnValue + "\t" + error;
@@ -319,10 +321,12 @@ string ClassFlowPostProcessing::getReadout()
     return ReturnValue;
 }
 
-string ClassFlowPostProcessing::getReadoutParam(bool _rawValue)
+string ClassFlowPostProcessing::getReadoutParam(bool _rawValue, bool _noerror)
 {
     if (_rawValue)
         return ReturnRawValue;
+    if (_noerror)
+        return ReturnValueNoError;
     return ReturnValue;
 }
 

+ 2 - 1
code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.h

@@ -22,6 +22,7 @@ protected:
     float Value;
     string ReturnValue;
     string ReturnRawValue;
+    string ReturnValueNoError;
 
     bool LoadPreValue(void);
 
@@ -34,7 +35,7 @@ public:
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
     string getReadout();
-    string getReadoutParam(bool _rawValue);
+    string getReadoutParam(bool _rawValue, bool _noerror);
     void SavePreValue(float value, string time = "");
     string GetPreValue();
 

+ 7 - 1
code/src/server_tflite.cpp

@@ -131,6 +131,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
 {
     LogFile.WriteToFile("handler_wasserzaehler");    
     bool _rawValue = false;
+    bool _noerror = false;
     string zw;
 
     printf("handler_wasserzaehler uri:\n"); printf(req->uri); printf("\n");
@@ -146,9 +147,14 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
             printf("rawvalue is found"); printf(_size); printf("\n"); 
             _rawValue = true;
         }
+        if (httpd_query_key_value(_query, "noerror", _size, 10) == ESP_OK)
+        {
+            printf("noerror is found"); printf(_size); printf("\n"); 
+            _noerror = true;
+        }        
     }  
 
-    zw = tfliteflow.getReadout(_rawValue);
+    zw = tfliteflow.getReadout(_rawValue, _noerror);
     if (zw.length() > 0)
         httpd_resp_sendstr_chunk(req, zw.c_str()); 
 

二进制
firmware/bootloader.bin


二进制
firmware/firmware.bin


二进制
firmware/html.zip