From 5f4627ffb9e48ab81b8fd85c1a86027636fa23eb Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Fri, 27 May 2022 16:36:51 +0200 Subject: [PATCH] Moved into cpp --- main/actions/modesettingsaction.cpp | 56 +++++++++++++++++++++++++++++ main/actions/modesettingsaction.h | 45 ----------------------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/main/actions/modesettingsaction.cpp b/main/actions/modesettingsaction.cpp index e69de29..e694a24 100644 --- a/main/actions/modesettingsaction.cpp +++ b/main/actions/modesettingsaction.cpp @@ -0,0 +1,56 @@ +#include "modesettingsaction.h" + +// 3rdparty lib includes +#include + +// local includes +#include "globals.h" +#include "modes/defaultmode.h" +#include "modes/mickmode.h" +#include "modes/tempomatmode.h" +#include "modes/larsmmode.h" +#ifdef FEATURE_GAMETRAK +#include "modes/gametrakmode.h" +#endif +#include "modes/motortestmode.h" +#ifdef FEATURE_JOYSTICK +#include "modes/wheelchairmode.h" +#endif +#include "modes/remotecontrolmode.h" +#include "displays/menus/defaultmodesettingsmenu.h" +#include "displays/menus/tempomatmodesettingsmenu.h" +#include "displays/menus/larsmmodesettingsmenu.h" +#ifdef FEATURE_GAMETRAK +#include "displays/menus/gametrakmodesettingsmenu.h" +#endif +#include "displays/menus/mickmodesettingsmenu.h" +#include "displays/menus/motortestmodesettingsmenu.h" +#include "displays/menus/remotecontrolmodesettingsmenu.h" + +void ModeSettingsAction::triggered() +{ + if (currentMode == &modes::defaultMode +#ifdef FEATURE_JOYSTICK + || currentMode == &modes::wheelchairMode +#endif + ) + pushScreen(); + else if (currentMode == &modes::tempomatMode) + pushScreen(); + else if (currentMode == &modes::larsmMode) + pushScreen(); + else if (currentMode == &modes::mickMode) + pushScreen(); + else if (currentMode == &modes::motortestMode) + pushScreen(); + else if (currentMode == &modes::remoteControlMode) + pushScreen(); +#ifdef FEATURE_GAMETRAK + else if (currentMode == &modes::gametrakMode) + pushScreen(); +#endif + else + { + //Serial.println("Unknown mode, cannot open settings for it"); + } +} diff --git a/main/actions/modesettingsaction.h b/main/actions/modesettingsaction.h index 3d27834..b930b50 100644 --- a/main/actions/modesettingsaction.h +++ b/main/actions/modesettingsaction.h @@ -1,56 +1,11 @@ #pragma once #include "actioninterface.h" -#include "globals.h" -#include "modes/defaultmode.h" -#include "modes/mickmode.h" -#include "modes/tempomatmode.h" -#include "modes/larsmmode.h" -#include "modes/gametrakmode.h" -#include "modes/motortestmode.h" -#ifdef FEATURE_JOYSTICK -#include "modes/wheelchairmode.h" -#endif -#include "displays/menus/defaultmodesettingsmenu.h" -#include "displays/menus/tempomatmodesettingsmenu.h" -#include "displays/menus/larsmmodesettingsmenu.h" -#include "displays/menus/gametrakmodesettingsmenu.h" -#include "displays/menus/mickmodesettingsmenu.h" -#include "displays/menus/motortestmodesettingsmenu.h" -#include "screenmanager.h" using namespace espgui; -namespace { class ModeSettingsAction : public virtual ActionInterface { public: void triggered() override; }; - -void ModeSettingsAction::triggered() -{ - if (currentMode == &modes::defaultMode -#ifdef FEATURE_JOYSTICK - || currentMode == &modes::wheelchairMode -#endif - ) - pushScreen(); - else if (currentMode == &modes::tempomatMode) - pushScreen(); - else if (currentMode == &modes::larsmMode) - pushScreen(); - else if (currentMode == &modes::mickMode) - pushScreen(); - else if (currentMode == &modes::motortestMode) - pushScreen(); -#ifdef FEATURE_GAMETRAK - else if (currentMode == &modes::gametrakMode) - pushScreen(); -#endif - else - { - //Serial.println("Unknown mode, cannot open settings for it"); - } -} -}