Skip to content

Commit

Permalink
update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
caco3 and CaCO3 authored Jun 3, 2024
1 parent beb0959 commit c54ca18
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 23 deletions.
5 changes: 0 additions & 5 deletions code/components/jomjol_flowcontroll/ClassFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ string ClassFlow::getHTMLSingleStep(string host){
return "";
}

string ClassFlow::getReadout()
{
return string();
}

std::string ClassFlow::GetParameterName(std::string _input)
{
string _param;
Expand Down
1 change: 0 additions & 1 deletion code/components/jomjol_flowcontroll/ClassFlow.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class ClassFlow
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";};

};
Expand Down
17 changes: 1 addition & 16 deletions code/components/jomjol_flowcontroll/ClassFlowControll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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("");
}


Expand Down
3 changes: 2 additions & 1 deletion code/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit c54ca18

Please sign in to comment.