Fixed compiling

This commit is contained in:
2021-11-02 23:17:10 +01:00
parent fc1e277423
commit 08e97debe7
2 changed files with 22 additions and 27 deletions

View File

@ -179,33 +179,8 @@ void CalibrateDisplay::rotate(int offset)
m_selectedButton = 0; m_selectedButton = 0;
} }
void CalibrateDisplay::back()
{
Base::back();
switch (m_status)
{
case Status::Begin:
if (m_bootup)
espgui::switchScreen<StatusDisplay>();
else
espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
break;
case Status::GasMin:
case Status::GasMax:
case Status::BremsMin:
case Status::BremsMax:
case Status::Confirm:
m_selectedButton = 0;
m_status = Status::Begin;
copyFromSettings();
}
}
void CalibrateDisplay::confirm() void CalibrateDisplay::confirm()
{ {
Base::confirm();
switch (m_selectedButton) switch (m_selectedButton)
{ {
case 0: // left button pressed case 0: // left button pressed
@ -259,6 +234,27 @@ void CalibrateDisplay::confirm()
} }
} }
void CalibrateDisplay::back()
{
switch (m_status)
{
case Status::Begin:
if (m_bootup)
espgui::switchScreen<StatusDisplay>();
else
espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
break;
case Status::GasMin:
case Status::GasMax:
case Status::BremsMin:
case Status::BremsMax:
case Status::Confirm:
m_selectedButton = 0;
m_status = Status::Begin;
copyFromSettings();
}
}
void CalibrateDisplay::copyFromSettings() void CalibrateDisplay::copyFromSettings()
{ {
m_gasMin = settings.boardcomputerHardware.gasMin; m_gasMin = settings.boardcomputerHardware.gasMin;

View File

@ -35,9 +35,8 @@ public:
void rotate(int offset) override; void rotate(int offset) override;
void back() override;
void confirm() override; void confirm() override;
void back() override;
private: private:
void copyFromSettings(); void copyFromSettings();