From c54ca18e4ea634389355ccf547ecffdcc5415d2b Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Mon, 3 Jun 2024 23:36:14 +0200 Subject: [PATCH] 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 --- .../jomjol_flowcontroll/ClassFlow.cpp | 5 ----- code/components/jomjol_flowcontroll/ClassFlow.h | 1 - .../jomjol_flowcontroll/ClassFlowControll.cpp | 17 +---------------- code/platformio.ini | 3 ++- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/code/components/jomjol_flowcontroll/ClassFlow.cpp b/code/components/jomjol_flowcontroll/ClassFlow.cpp index 0de7428d..858c9524 100644 --- a/code/components/jomjol_flowcontroll/ClassFlow.cpp +++ b/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; diff --git a/code/components/jomjol_flowcontroll/ClassFlow.h b/code/components/jomjol_flowcontroll/ClassFlow.h index 52f5c72c..9c826c11 100644 --- a/code/components/jomjol_flowcontroll/ClassFlow.h +++ b/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";}; }; diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index b4b7bb18..1e2cd751 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/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(""); } diff --git a/code/platformio.ini b/code/platformio.ini index 38012347..c174baa2 100644 --- a/code/platformio.ini +++ b/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}