From a1c2a1e43a55c95373b034e6605fd66669a4edec Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 25 May 2020 22:02:30 +0200 Subject: [PATCH] Added gametrak mode settings menu --- src/displays/menus/gametrakmodesettingsmenu.h | 24 +++++++++++++++++++ src/displays/menus/modessettingsmenu.h | 4 ++++ src/screens.h | 3 +++ src/texts.h | 4 ++++ 4 files changed, 35 insertions(+) create mode 100644 src/displays/menus/gametrakmodesettingsmenu.h diff --git a/src/displays/menus/gametrakmodesettingsmenu.h b/src/displays/menus/gametrakmodesettingsmenu.h new file mode 100644 index 0000000..d26e832 --- /dev/null +++ b/src/displays/menus/gametrakmodesettingsmenu.h @@ -0,0 +1,24 @@ +#pragma once + +#include "menudisplay.h" +#include "staticmenudefinition.h" +#include "utils.h" +#include "menuitem.h" +#include "actions/switchscreenaction.h" +#include "icons/back.h" +#include "texts.h" + +namespace { +class ModesSettingsMenu; +} + +namespace { +class GametrakModeSettingsMenu : + public MenuDisplay, + public StaticText, + public BackActionInterface>, + public StaticMenuDefinition< + makeComponent, SwitchScreenAction, StaticMenuItemIcon<&icons::back>> + > +{}; +} diff --git a/src/displays/menus/modessettingsmenu.h b/src/displays/menus/modessettingsmenu.h index b5dd684..63b372b 100644 --- a/src/displays/menus/modessettingsmenu.h +++ b/src/displays/menus/modessettingsmenu.h @@ -11,6 +11,7 @@ namespace { class DefaultModeSettingsMenu; class TempomatModeSettingsMenu; class LarsmModeSettingsMenu; +class GametrakModeSettingsMenu; class SettingsMenu; } @@ -23,6 +24,9 @@ class ModesSettingsMenu : makeComponent, SwitchScreenAction>, makeComponent, SwitchScreenAction>, makeComponent, SwitchScreenAction>, +#ifdef FEATURE_GAMETRAK + makeComponent, SwitchScreenAction>, +#endif makeComponent, SwitchScreenAction, StaticMenuItemIcon<&icons::back>> > {}; diff --git a/src/screens.h b/src/screens.h index 3dc5dfc..d9358e3 100644 --- a/src/screens.h +++ b/src/screens.h @@ -12,6 +12,7 @@ #include "displays/menus/dynamicdebugmenu.h" #include "displays/menus/enablemenu.h" #include "displays/menus/feedbackdebugmenu.h" +#include "displays/menus/gametrakmodesettingsmenu.h" #include "displays/menus/genericwifisettingsmenu.h" #include "displays/menus/graphsmenu.h" #include "displays/menus/controllerhardwaresettingsmenu.h" @@ -69,6 +70,7 @@ union X { EnableMenu enableMenu; FrontFeedbackDebugMenu frontFeedbackDebugMenu; BackFeedbackDebugMenu backFeedbackDebugMenu; + GametrakModeSettingsMenu gametrakModeSettingsMenu; GenericWifiSettingsMenu genericWifiSettingsMenu; GraphsMenu graphsMenu; InvertMenu invertMenu; @@ -200,6 +202,7 @@ template<> decltype(displays.dynamicDebugMenu) & template<> decltype(displays.enableMenu) &getRefByType() { return displays.enableMenu; } template<> decltype(displays.frontFeedbackDebugMenu) &getRefByType() { return displays.frontFeedbackDebugMenu; } template<> decltype(displays.backFeedbackDebugMenu) &getRefByType() { return displays.backFeedbackDebugMenu; } +template<> decltype(displays.gametrakModeSettingsMenu) &getRefByType() { return displays.gametrakModeSettingsMenu; } template<> decltype(displays.genericWifiSettingsMenu) &getRefByType() { return displays.genericWifiSettingsMenu; } template<> decltype(displays.graphsMenu) &getRefByType() { return displays.graphsMenu; } template<> decltype(displays.invertMenu) &getRefByType() { return displays.invertMenu; } diff --git a/src/texts.h b/src/texts.h index 6d1cd28..f8c6360 100644 --- a/src/texts.h +++ b/src/texts.h @@ -157,6 +157,9 @@ constexpr char TEXT_ENABLEBACKLEFT[] = "Enable back left"; constexpr char TEXT_ENABLEBACKRIGHT[] = "Enable back right"; //constexpr char TEXT_BACK[] = "Back"; +//GametrakModeSettingsMenu +constexpr char TEXT_GAMETRAKMODESETTINGS[] = "Gametrak mode settings"; + //GenericWifiSettingsMenu constexpr char TEXT_GENERICWIFISETTINGS[] = "Generic WiFi settings"; constexpr char TEXT_WIFICHANGEMODE[] = "Change mode"; @@ -202,6 +205,7 @@ constexpr char TEXT_LARSMMODECHANGEITERATIONS[] = "Change iterations"; constexpr char TEXT_DEFAULTMODESETTIGNS[] = "Default mode settings"; constexpr char TEXT_TEMPOMATMODESETTINGS[] = "Tempomat mode settings"; //constexpr char TEXT_LARSMMODESETTINGS[] = "Larsm mode settings"; +//constexpr char TEXT_GAMETRAKMODESETTINGS[] = "Gametrak mode settings"; //constexpr char TEXT_BACK[] = "Back"; //TempomatModeSettingsMenu