diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index ea1983f..596acfc 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -159,7 +159,6 @@ set(headers displays/menus/motortestmodesettingsmenu.h displays/menus/networksettingsmenu.h displays/menus/otamenu.h - displays/menus/presetsmenu.h displays/menus/profilesmenu.h displays/menus/selectbatterytypemenu.h displays/menus/selectbuildserverbranch.h @@ -385,7 +384,6 @@ set(sources displays/menus/networksettingsmenu.cpp displays/menus/otamenu.cpp displays/menus/presetsmenu.cpp - displays/menus/profilesmenu.cpp displays/menus/selectbatterytypemenu.cpp displays/menus/selectbuildserverbranch.cpp displays/menus/selectbuildservermenu.cpp diff --git a/main/displays/menus/mainmenu.cpp b/main/displays/menus/mainmenu.cpp index 1df83dd..a14d028 100644 --- a/main/displays/menus/mainmenu.cpp +++ b/main/displays/menus/mainmenu.cpp @@ -10,7 +10,6 @@ #include "displays/menus/selectmodemenu.h" #include "displays/menus/ledstripmenu.h" #include "actions/modesettingsaction.h" -// #include "displays/menus/presetsmenu.h" // temporarily disabled #include "displays/menus/profilesmenu.h" #include "displays/menus/graphsmenu.h" #include "displays/menus/batterymenu.h" @@ -116,7 +115,6 @@ MainMenu::MainMenu() #endif constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::demos>>>(); if (SHOWITEM) { constructMenuItem, SwitchScreenAction>>(); } -// if (SHOWITEM) { constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::presets>>>(); } // temporarily disabled if (SHOWITEM) { constructMenuItem, SwitchScreenAction>>(); } constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::poweroff>>>(); constructMenuItem, RebootAction, StaticMenuItemIcon<&bobbyicons::reboot>>>(); diff --git a/main/displays/menus/presetsmenu.cpp b/main/displays/menus/presetsmenu.cpp deleted file mode 100644 index 272fc67..0000000 --- a/main/displays/menus/presetsmenu.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// This menu is disabled because of issues with the new config system. It may be reenabled in the near future. - -// ALso reenable in mainmenu!! - -/* -#include "presetsmenu.h" - -// local includes -#include "actioninterface.h" -#include "actions/multiaction.h" -#include "actions/switchscreenaction.h" -#include "globals.h" -#include "icons/back.h" -#include "mainmenu.h" -#include "menudisplay.h" -#include "presets.h" -#include "settings.h" -#include "utils.h" - -namespace { -constexpr char TEXT_PRESETS[] = "Presets"; -constexpr char TEXT_DEFAULTEVERYTHING[] = "Default everything"; -constexpr char TEXT_DEFAULTLIMITS[] = "Default limits"; -constexpr char TEXT_KIDSLIMITS[] = "Kids limits"; -constexpr char TEXT_DEFAULTPOTI[] = "Default poti"; -constexpr char TEXT_DEFAULTCONTROLLERHARDWARE[] = "Default controller H/W"; -constexpr char TEXT_MOSFETSOFFCONTROLLERHARDWARE[] = "MOSFETs off controller H/W"; -constexpr char TEXT_SPINNERCONTROLLERHARDWARE[] = "Spinner controller H/W"; -constexpr char TEXT_DEFAULTBOARDCOMPUTERHARDWARE[] = "Default boardcomputer H/W"; -constexpr char TEXT_DEFAULTDEFAULTMODE[] = "Default defaultMode"; -constexpr char TEXT_SINUSOIDALDEFAULTMODE[] = "Sinusoidal defaultMode"; -constexpr char TEXT_DEFAULTTEMPOMATMODE[] = "Default tempomatMode"; -constexpr char TEXT_DEFAULTLARSMMODE[] = "Default larsmMode"; -constexpr char TEXT_STREET[] = "Street"; -constexpr char TEXT_SIDEWALK[] = "Sidewalk"; -constexpr char TEXT_POLICE[] = "Police"; -constexpr char TEXT_RACE[] = "Race"; -constexpr char TEXT_BACK[] = "Back"; - -class ApplyPresetAction : public virtual ActionInterface -{ -public: - void triggered() override { saveSettings(); switchScreen(); } -}; - -template -class ApplySettingsPresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyLimitsPresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.limits = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyControllerHardwarePresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.controllerHardware = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyBoardcomputerHardwarePresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.boardcomputerHardware = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyDefaultModePresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.defaultMode = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyTempomatModePresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.tempomatMode = *preset; ApplyPresetAction::triggered(); } -}; - -template -class ApplyLarsmModePresetAction : public virtual ApplyPresetAction -{ -public: - void triggered() override { settings.larsmMode = *preset; ApplyPresetAction::triggered(); } -}; -} // namespace - -PresetsMenu::PresetsMenu() -{ - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, MultiAction, SwitchScreenAction>>>(); - constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); -} - -std::string PresetsMenu::text() const -{ - return TEXT_PRESETS; -} - -void PresetsMenu::back() -{ - switchScreen(); -} -*/ diff --git a/main/displays/menus/presetsmenu.h b/main/displays/menus/presetsmenu.h deleted file mode 100644 index 9699c1c..0000000 --- a/main/displays/menus/presetsmenu.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -// local includes -#include "displays/bobbymenudisplay.h" - -class PresetsMenu : public BobbyMenuDisplay -{ -public: - PresetsMenu(); - - std::string text() const override; - - void back() override; -};