Просмотр исходного кода

update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098)

* update to platformio/espressif32 @ 6.7.0

* remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden).

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
CaCO3 1 год назад
Родитель
Сommit
c54ca18e4e

+ 0 - 5
code/components/jomjol_flowcontroll/ClassFlow.cpp

@@ -67,11 +67,6 @@ string ClassFlow::getHTMLSingleStep(string host){
 	return "";
 }
 
-string ClassFlow::getReadout()
-{
-	return string();
-}
-
 std::string ClassFlow::GetParameterName(std::string _input)
 {
     string _param;

+ 0 - 1
code/components/jomjol_flowcontroll/ClassFlow.h

@@ -46,7 +46,6 @@ public:
 	virtual bool ReadParameter(FILE* pfile, string &aktparamgraph);
 	virtual bool doFlow(string time);
 	virtual string getHTMLSingleStep(string host);
-	virtual string getReadout();
 	virtual string name(){return "ClassFlow";};
 
 };

+ 1 - 16
code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -468,22 +468,7 @@ string ClassFlowControll::getReadout(bool _rawvalue = false, bool _noerror = fal
     if (flowpostprocessing)
         return flowpostprocessing->getReadoutParam(_rawvalue, _noerror, _number);
 
-    string zw = "";
-    string result = "";
-
-    for (int i = 0; i < FlowControll.size(); ++i)
-    {
-        zw = FlowControll[i]->getReadout();
-        if (zw.length() > 0)
-        {
-            if (result.length() == 0)
-                result = zw;
-            else
-                result = result + "\t" + zw;
-        }
-    }
-
-    return result;
+    return std::string("");
 }
 
 

+ 2 - 1
code/platformio.ini

@@ -19,7 +19,8 @@
 
 [common:esp32-idf]
     extends = common:idf
-    platform = platformio/espressif32 @ 6.5.0
+    ; PlatformIO releases, see https://github.com/platformio/platform-espressif32/releases
+    platform = platformio/espressif32 @ 6.7.0
     framework = espidf
     lib_deps = 
         ${common:idf.lib_deps}