From ad06ef506f56546368fc23d78a349c3a6ec9312f Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 11 Jun 2020 14:57:10 +0200 Subject: [PATCH] Added timers menu --- .../menus/boardcomputerhardwaresettingsmenu.h | 2 ++ src/displays/menus/timersmenu.h | 23 +++++++++++++++++++ src/screens.h | 4 ++++ src/texts.h | 5 ++++ 4 files changed, 34 insertions(+) create mode 100644 src/displays/menus/timersmenu.h diff --git a/src/displays/menus/boardcomputerhardwaresettingsmenu.h b/src/displays/menus/boardcomputerhardwaresettingsmenu.h index 92981d0..f52394e 100644 --- a/src/displays/menus/boardcomputerhardwaresettingsmenu.h +++ b/src/displays/menus/boardcomputerhardwaresettingsmenu.h @@ -16,6 +16,7 @@ namespace { class BoardcomputerHardwareSettingsMenu; class CalibrateDisplay; class GametrakCalibrateDisplay; +class TimersMenu; class SettingsMenu; } @@ -164,6 +165,7 @@ class BoardcomputerHardwareSettingsMenu : #endif makeComponent, DummyAction>, makeComponent, ToggleBoolAction, CheckboxIcon, SwapScreenBytesAccessor>, + makeComponent, SwitchScreenAction>, makeComponent, SwitchScreenAction, StaticMenuItemIcon<&icons::back>> > {}; diff --git a/src/displays/menus/timersmenu.h b/src/displays/menus/timersmenu.h new file mode 100644 index 0000000..435f043 --- /dev/null +++ b/src/displays/menus/timersmenu.h @@ -0,0 +1,23 @@ +#pragma once + +#include "changevaluedisplay.h" +#include "menudisplay.h" +#include "staticmenudefinition.h" +#include "utils.h" +#include "actions/switchscreenaction.h" +#include "icons/back.h" +#include "texts.h" +#include "settingsaccessors.h" + +namespace { +class BoardcomputerHardwareSettingsMenu; +class TimersMenu : + public MenuDisplay, + public StaticText, + public BackActionInterface>, + public StaticMenuDefinition< + // TODO + makeComponent, SwitchScreenAction, StaticMenuItemIcon<&icons::back>> + > +{}; +} diff --git a/src/screens.h b/src/screens.h index 2f01cea..052a023 100644 --- a/src/screens.h +++ b/src/screens.h @@ -30,6 +30,7 @@ #include "displays/menus/selectmodemenu.h" #include "displays/menus/settingsmenu.h" #include "displays/menus/stationwifisettingsmenu.h" +#include "displays/menus/timersmenu.h" #include "displays/menus/wifiscanmenu.h" #include "displays/menus/wifisettingsmenu.h" #include "displays/bmsdisplay.h" @@ -99,6 +100,7 @@ union X { SelectModeMenu selectModeMenu; SettingsMenu settingsMenu; StationWifiSettingsMenu stationWifiSettingsMenu; + TimersMenu timersMenu; WifiScanMenu wifiScanMenu; WifiSettingsMenu wifiSettingsMenu; @@ -244,6 +246,8 @@ template<> decltype(displays.presetsMenu) & template<> decltype(displays.selectModeMenu) &getRefByType() { return displays.selectModeMenu; } template<> decltype(displays.settingsMenu) &getRefByType() { return displays.settingsMenu; } template<> decltype(displays.stationWifiSettingsMenu) &getRefByType() { return displays.stationWifiSettingsMenu; } + +template<> decltype(displays.timersMenu) &getRefByType() { return displays.timersMenu; } template<> decltype(displays.wifiScanMenu) &getRefByType() { return displays.wifiScanMenu; } template<> decltype(displays.wifiSettingsMenu) &getRefByType() { return displays.wifiSettingsMenu; } diff --git a/src/texts.h b/src/texts.h index 5858ce7..6c47062 100644 --- a/src/texts.h +++ b/src/texts.h @@ -248,6 +248,7 @@ constexpr char TEXT_SETGAMETRAKYMAX[] = "Set gametrakYMax"; constexpr char TEXT_SETGAMETRAKDISTMIN[] = "Set gametrakDistMin"; constexpr char TEXT_SETGAMETRAKDISTMAX[] = "Set gametrakDistMax"; constexpr char TEXT_SWAPSCREENBYTES[] = "Swap screen bytes"; +constexpr char TEXT_TIMERS[] = "Timers"; //constexpr char TEXT_BACK[] = "Back"; //PresetsMenu @@ -277,6 +278,10 @@ constexpr char TEXT_LARSM[] = "Larsm"; constexpr char TEXT_GAMETRAK[] = "Gametrak"; //constexpr char TEXT_BACK[] = "Back"; +//TimersMenu +//constexpr char TEXT_TIMERS[] = "Timers"; +//constexpr char TEXT_BACK[] = "Back"; + //ChangeValueDisplay constexpr char TEXT_OFF[] = "Off"; constexpr char TEXT_MASTER[] = "Master";