From 0adb55c6685bffd065ff6aa898ec87c9dd6031db Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Sun, 19 Dec 2021 23:30:54 +0100 Subject: [PATCH] Removed modeUpdateRate config parameter --- main/accessors/settingsaccessors.h | 1 - main/displays/menus/timersmenu.cpp | 9 --------- main/presets.h | 1 - main/settings.h | 2 -- main/texts.cpp | 1 - main/texts.h | 1 - 6 files changed, 15 deletions(-) diff --git a/main/accessors/settingsaccessors.h b/main/accessors/settingsaccessors.h index b076e27..b1fb6e1 100644 --- a/main/accessors/settingsaccessors.h +++ b/main/accessors/settingsaccessors.h @@ -125,7 +125,6 @@ struct GametrakYMaxAccessor : public RefAccessorSaveSettings { int16_t struct GametrakDistMinAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakDistMin; } }; struct GametrakDistMaxAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakDistMax; } }; #endif -struct ModeUpdateRateAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.modeUpdateRate; } }; struct StatsUpdateRateAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.statsUpdateRate; } }; struct DisplayUpdateRateAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.displayUpdateRate; } }; struct DisplayRedrawRateAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.displayRedrawRate; } }; diff --git a/main/displays/menus/timersmenu.cpp b/main/displays/menus/timersmenu.cpp index 5b60650..8c87fd3 100644 --- a/main/displays/menus/timersmenu.cpp +++ b/main/displays/menus/timersmenu.cpp @@ -11,14 +11,6 @@ using namespace espgui; namespace { -using ModeUpdateRateChangeDisplay = makeComponent< - ChangeValueDisplay, - StaticText, - ModeUpdateRateAccessor, - BackActionInterface>, - SwitchScreenAction ->; - using StatsUpdateRateChangeDisplay = makeComponent< ChangeValueDisplay, StaticText, @@ -46,7 +38,6 @@ using DisplayRedrawRateChangeDisplay = makeComponent< TimersMenu::TimersMenu() { - constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); diff --git a/main/presets.h b/main/presets.h index e6421da..2477fd1 100644 --- a/main/presets.h +++ b/main/presets.h @@ -136,7 +136,6 @@ constexpr Settings::ControllerHardware spinnerControllerHardware { }; constexpr Settings::BoardcomputerHardware::TimersSettings defaultTimersSettings { - .modeUpdateRate = 50, .statsUpdateRate = 50, .displayUpdateRate = 50, .displayRedrawRate = 50, diff --git a/main/settings.h b/main/settings.h index 98de3ab..0f9945b 100644 --- a/main/settings.h +++ b/main/settings.h @@ -103,7 +103,6 @@ struct Settings #endif struct TimersSettings { - int16_t modeUpdateRate; int16_t statsUpdateRate; int16_t displayUpdateRate; int16_t displayRedrawRate; @@ -303,7 +302,6 @@ void Settings::executeForEveryCommonSetting(T &&callable) callable("gametrakDistMax", boardcomputerHardware.gametrakDistMax); #endif - callable("modeUpdateRate", boardcomputerHardware.timersSettings.modeUpdateRate); callable("statsUpdateRate", boardcomputerHardware.timersSettings.statsUpdateRate); callable("displayUpdateRa", boardcomputerHardware.timersSettings.displayUpdateRate); callable("displayRedrawRa", boardcomputerHardware.timersSettings.displayRedrawRate); diff --git a/main/texts.cpp b/main/texts.cpp index b70943a..a5c2e8f 100644 --- a/main/texts.cpp +++ b/main/texts.cpp @@ -430,7 +430,6 @@ char TEXT_MOTORTEST[] = "Motortest"; //TimersMenu //char TEXT_TIMERS[] = "Timers"; -char TEXT_MODEUPDATERATE[] = "Mode update rate"; char TEXT_STATSUPDATERATE[] = "Stats update rate"; char TEXT_DISPLAYUPDATERATE[] = "Display update rate"; char TEXT_DISPLAYREDRAWRATE[] = "Display redraw rate"; diff --git a/main/texts.h b/main/texts.h index 4223ee8..43765eb 100644 --- a/main/texts.h +++ b/main/texts.h @@ -430,7 +430,6 @@ extern char TEXT_MOTORTEST[]; //TimersMenu //extern char TEXT_TIMERS[]; -extern char TEXT_MODEUPDATERATE[]; extern char TEXT_STATSUPDATERATE[]; extern char TEXT_DISPLAYUPDATERATE[]; extern char TEXT_DISPLAYREDRAWRATE[];