Skip to content

Updating MainMenu.cpp C-style pointers to use C++ style pointers #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgfoster merged 10 commits into from
Jun 8, 2021
Merged

Updating MainMenu.cpp C-style pointers to use C++ style pointers #165

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
47f0ae1
1st
invalid-email-address May 26, 2021
2a9d3cc
Merge branch 'main' into main
prestoncarman May 26, 2021
298a4ec
Cameron -- ADd Third Parenthese
invalid-email-address Jun 4, 2021
1177915
Merge branch 'main' of https://github.com/IDzyre/TankController into …
invalid-email-address Jun 4, 2021
7621dcd
Merge branch 'main' into main
IDzyre Jun 4, 2021
d0cf604
Merge branch 'main' into main
prestoncarman Jun 7, 2021
0dcba2f
Remove files related to VS Code
Jun 7, 2021
b8d9e03
remove .vs files
invalid-email-address Jun 8, 2021
9be4748
Merge branch 'main' of https://github.com/IDzyre/TankController
invalid-email-address Jun 8, 2021
60ccdd6
Merge branch 'Open-Acidification:main' into main
IDzyre Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/UIState/MainMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,31 +140,31 @@ void MainMenu::selectView() {
this->setNextState(static_cast<UIState *>(new SeeGoogleMins(tc)));
break;
case VIEW_IP_ADDRESS:
this->setNextState((UIState *)new SeeDeviceAddress(tc));
this->setNextState(static_cast<UIState *>(new SeeDeviceAddress(tc));
break;
case VIEW_LOG_FILE:
this->setNextState(static_cast<UIState *>(new SeeLogFile(tc)));
break;
case VIEW_MAC_ADDRESS:
this->setNextState((UIState *)new SeeDeviceAddress(tc));
this->setNextState(static_cast<UIState *>(new SeeDeviceAddress(tc));
break;
case VIEW_PID:
this->setNextState((UIState *)new SeePIDConstants(tc));
this->setNextState(static_cast<UIState *>(new SeePIDConstants(tc));
break;
case VIEW_PH_SLOPE:
this->setNextState((UIState *)new SeePHSlope(tc));
this->setNextState(static_cast<UIState *>(new SeePHSlope(tc));
break;
case VIEW_TANK_ID:
this->setNextState((UIState *)new SeeTankID(tc));
this->setNextState(static_cast<UIState *>(new SeeTankID(tc));
break;
case VIEW_TIME:
this->setNextState((UIState *)new SeeDeviceUptime(tc));
this->setNextState(static_cast<UIState *>(new SeeDeviceUptime(tc));
break;
case VIEW_UPTIME:
this->setNextState((UIState *)new SeeDeviceUptime(tc));
this->setNextState(static_cast<UIState *>(new SeeDeviceUptime(tc));
break;
case VIEW_VERSION:
this->setNextState((UIState *)new SeeVersion(tc));
this->setNextState(static_cast<UIState *>(new SeeVersion(tc));
break;
default:
break;
Expand All @@ -174,43 +174,43 @@ void MainMenu::selectView() {
void MainMenu::selectSet() {
switch (level2) {
case SET_CALIBRATION:
this->setNextState((UIState *)new PHCalibrationMid(tc));
this->setNextState(static_cast<UIState *>(new PHCalibrationMid(tc));
break;
case SET_CALIBRATION_CLEAR:
this->setNextState((UIState *)new SetCalibrationClear(tc));
this->setNextState(static_cast<UIState *>(new SetCalibrationClear(tc));
break;
case SET_CHILL_OR_HEAT:
this->setNextState((UIState *)new SetChillOrHeat(tc));
this->setNextState(static_cast<UIState *>(new SetChillOrHeat(tc));
break;
case SET_GOOGLE_MINS:
this->setNextState((UIState *)new SetGoogleSheetInterval(tc));
this->setNextState(static_cast<UIState *>(new SetGoogleSheetInterval(tc));
break;
case SET_PH:
this->setNextState((UIState *)new SetPHSetPoint(tc));
this->setNextState(static_cast<UIState *>(new SetPHSetPoint(tc));
break;
case SET_KD:
this->setNextState((UIState *)new SetKD(tc));
this->setNextState(static_cast<UIState *>(new SetKD(tc));
break;
case SET_KI:
this->setNextState((UIState *)new SetKI(tc));
this->setNextState(static_cast<UIState *>(new SetKI(tc));
break;
case SET_KP:
this->setNextState((UIState *)new SetKP(tc));
this->setNextState(static_cast<UIState *>(new SetKP(tc));
break;
case SET_PID_ON_OFF:
this->setNextState(static_cast<UIState *>(new EnablePID(tc)));
break;
case SET_TANK_ID:
this->setNextState((UIState *)new SetTankID(tc));
this->setNextState(static_cast<UIState *>(new SetTankID(tc));
break;
case SET_TEMP_CALIBRATION:
this->setNextState((UIState *)new TemperatureCalibration(tc));
this->setNextState(static_cast<UIState *>(new TemperatureCalibration(tc));
break;
case SET_TEMPERATURE:
this->setNextState((UIState *)new SetTempSetPoint(tc));
this->setNextState(static_cast<UIState *>(new SetTempSetPoint(tc));
break;
case SET_TIME:
this->setNextState((UIState *)new SetTime(tc));
this->setNextState(static_cast<UIState *>(new SetTime(tc));
break;
default:
break;
Expand Down