From 0a35bfb77d3ca757f8f95793e1385c7840329fde Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 30 Dec 2021 06:12:14 +0100 Subject: [PATCH] Remove dpad debug displays --- config_allfeatures.cmake | 4 - config_comred.cmake | 4 - config_feedc0de.cmake | 1 - config_greyhash.cmake | 1 - config_mick.cmake | 1 - config_nofeatures.cmake | 4 - config_peter.cmake | 1 - main/CMakeLists.txt | 6 -- main/accessors/settingsaccessors.h | 1 + main/displays/dpad5wire2outdebugdisplay.cpp | 0 main/displays/dpad5wire2outdebugdisplay.h | 94 --------------------- main/displays/dpad5wiredebugdisplay.cpp | 0 main/displays/dpad5wiredebugdisplay.h | 90 -------------------- main/displays/dpad6wiredebugdisplay.cpp | 0 main/displays/dpad6wiredebugdisplay.h | 92 -------------------- main/displays/menus/timesettingsmenu.cpp | 16 +++- main/main.cpp | 9 -- 17 files changed, 13 insertions(+), 311 deletions(-) delete mode 100644 main/displays/dpad5wire2outdebugdisplay.cpp delete mode 100644 main/displays/dpad5wire2outdebugdisplay.h delete mode 100644 main/displays/dpad5wiredebugdisplay.cpp delete mode 100644 main/displays/dpad5wiredebugdisplay.h delete mode 100644 main/displays/dpad6wiredebugdisplay.cpp delete mode 100644 main/displays/dpad6wiredebugdisplay.h diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake index d7c500e..7ba4ece 100644 --- a/config_allfeatures.cmake +++ b/config_allfeatures.cmake @@ -56,11 +56,7 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_6WIRESW_IN3=18 -DPINS_DPAD_6WIRESW_IN4=19 -DPINS_DPAD_6WIRESW_IN5=26 - -# -DDPAD_5WIRESW_DEBUG -# -DDPAD_6WIRESW_DEBUG -DFEATURE_GSCHISSENE_DIODE - -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_comred.cmake b/config_comred.cmake index 96025d0..3def8b2 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -56,11 +56,7 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_6WIRESW_IN3=18 -DPINS_DPAD_6WIRESW_IN4=19 -DPINS_DPAD_6WIRESW_IN5=26 - -# -DDPAD_5WIRESW_DEBUG -# -DDPAD_6WIRESW_DEBUG -DFEATURE_GSCHISSENE_DIODE - -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake index a1bb05c..f68a5bb 100644 --- a/config_feedc0de.cmake +++ b/config_feedc0de.cmake @@ -48,7 +48,6 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_5WIRESW_IN1=27 -DPINS_DPAD_5WIRESW_IN2=32 -DPINS_DPAD_5WIRESW_IN3=33 -# -DDPAD_5WIRESW_DEBUG -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_greyhash.cmake b/config_greyhash.cmake index 408b5cf..0582c50 100644 --- a/config_greyhash.cmake +++ b/config_greyhash.cmake @@ -48,7 +48,6 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_5WIRESW_IN2=27 -DPINS_DPAD_5WIRESW_IN3=18 -DPINS_DPAD_5WIRESW_IN4=19 -# -DDPAD_5WIRESW_DEBUG # -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_mick.cmake b/config_mick.cmake index f0651e0..8a8ae57 100644 --- a/config_mick.cmake +++ b/config_mick.cmake @@ -48,7 +48,6 @@ set(BOBBYCAR_BUILDFLAGS # -DPINS_DPAD_5WIRESW_IN2=27 # -DPINS_DPAD_5WIRESW_IN3=18 # -DPINS_DPAD_5WIRESW_IN4=19 -# -DDPAD_5WIRESW_DEBUG -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake index 9bbee40..ed8b295 100644 --- a/config_nofeatures.cmake +++ b/config_nofeatures.cmake @@ -56,11 +56,7 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_6WIRESW_IN3=18 -DPINS_DPAD_6WIRESW_IN4=19 -DPINS_DPAD_6WIRESW_IN5=26 - -# -DDPAD_5WIRESW_DEBUG -# -DDPAD_6WIRESW_DEBUG # -DFEATURE_GSCHISSENE_DIODE - # -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/config_peter.cmake b/config_peter.cmake index a4d73cc..5529f87 100644 --- a/config_peter.cmake +++ b/config_peter.cmake @@ -48,7 +48,6 @@ set(BOBBYCAR_BUILDFLAGS -DPINS_DPAD_5WIRESW_IN1=4 -DPINS_DPAD_5WIRESW_IN2=5 -DPINS_DPAD_5WIRESW_IN3=27 - # -DDPAD_5WIRESW_DEBUG -DFEATURE_BLE # -DFEATURE_BLUETOOTH # -DFEATURE_BMS diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index cb4fa90..6083d00 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -111,9 +111,6 @@ set(headers displays/bobbysplitgraphdisplay.h displays/calibratedisplay.h displays/calibratevoltagedisplay.h - displays/dpad5wire2outdebugdisplay.h - displays/dpad5wiredebugdisplay.h - displays/dpad6wiredebugdisplay.h displays/gameoflifedisplay.h displays/gametrakcalibratedisplay.h displays/ledstripcolorsdisplay.h @@ -339,9 +336,6 @@ set(sources displays/bobbysplitgraphdisplay.cpp displays/calibratedisplay.cpp displays/calibratevoltagedisplay.cpp - displays/dpad5wire2outdebugdisplay.cpp - displays/dpad5wiredebugdisplay.cpp - displays/dpad6wiredebugdisplay.cpp displays/gameoflifedisplay.cpp displays/gametrakcalibratedisplay.cpp displays/ledstripcolorsdisplay.cpp diff --git a/main/accessors/settingsaccessors.h b/main/accessors/settingsaccessors.h index a4e925c..8329f79 100644 --- a/main/accessors/settingsaccessors.h +++ b/main/accessors/settingsaccessors.h @@ -61,6 +61,7 @@ struct TimezoneOffsetAccessor : public NewSettingsChronoAdaptorAccessor { ConfigWrapper &getConfig() const override { return configs.timeDst; } }; #ifdef FEATURE_NTP struct TimeServerEnabledAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.timeServerEnabled; } }; +struct TimeServerAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.timeServer; } }; struct TimeSyncModeAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.timeSyncMode; } }; //struct TimeSyncIntervalAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.timeSyncInterval; } }; struct TimeSyncIntervalAccessor : public NewSettingsChronoAdaptorAccessor { ConfigWrapper &getConfig() const override { return configs.timeSyncInterval; } }; diff --git a/main/displays/dpad5wire2outdebugdisplay.cpp b/main/displays/dpad5wire2outdebugdisplay.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/main/displays/dpad5wire2outdebugdisplay.h b/main/displays/dpad5wire2outdebugdisplay.h deleted file mode 100644 index 67776f5..0000000 --- a/main/displays/dpad5wire2outdebugdisplay.h +++ /dev/null @@ -1,94 +0,0 @@ -#pragma once - -#include "display.h" -#include "globals.h" -#include "widgets/label.h" -#include "dpad5wire_2out.h" - -namespace { -#ifdef FEATURE_DPAD_5WIRESW_2OUT -class DPad5Wire2OutDebugDisplay : public Display, public virtual DummyConfirm, public virtual DummyBack -{ -public: - void initScreen() override; - void redraw() override; - -private: - Label m_labelRaw{0, 50}; - Label m_labelUp{175, 75}; - Label m_labelDown{175, 100}; - Label m_labelBack{175, 125}; - Label m_labelConfirm{175, 150}; - Label m_labelProfile0{175, 175}; - Label m_labelProfile1{175, 200}; - Label m_labelProfile2{175, 225}; - Label m_labelProfile3{175, 250}; - Label m_labelGas{175, 275}; - Label m_labelBrems{175, 300}; -}; - -void DPad5Wire2OutDebugDisplay::initScreen() -{ - tft.fillScreen(TFT_BLACK); - tft.setTextFont(4); - tft.setTextColor(TFT_YELLOW); - - tft.drawString("DPad 5wire debug", 5, 5); - - tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE); - - tft.setTextColor(TFT_WHITE, TFT_BLACK); - - tft.drawString("UP:", 30, 75); - tft.drawString("DOWN:", 30, 100); - tft.drawString("CONFIRM:", 30, 125); - tft.drawString("BACK:", 30, 150); - tft.drawString("PROFILE0:", 30, 175); - tft.drawString("PROFILE1:", 30, 200); - tft.drawString("PROFILE2:", 30, 225); - tft.drawString("PROFILE3:", 30, 250); - tft.drawString("GAS:", 30, 275); - tft.drawString("BREMS:", 30, 300); - - m_labelRaw.start(); - m_labelUp.start(); - m_labelDown.start(); - m_labelBack.start(); - m_labelConfirm.start(); - m_labelProfile0.start(); - m_labelProfile1.start(); - m_labelProfile2.start(); - m_labelProfile3.start(); - m_labelGas.start(); - m_labelBrems.start(); -} - -void DPad5Wire2OutDebugDisplay::redraw() -{ - m_labelRaw.redraw(std::string{} + - (std::get<0>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<1>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<2>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<3>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<4>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<5>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<6>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<7>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<8>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<9>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<10>(dpad5wire_2out::lastState) ? '1' : '0') + ' ' + - (std::get<11>(dpad5wire_2out::lastState) ? '1' : '0')); - - m_labelUp.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelDown.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelBack.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelConfirm.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelProfile0.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelProfile1.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelProfile2.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelProfile3.redraw(std::get(dpad5wire_2out::lastState) ? "1" : "0"); - m_labelGas.redraw(raw_gas ? std::to_string(*raw_gas) : "?"); - m_labelBrems.redraw(raw_brems ? std::to_string(*raw_brems) : "?"); -} -#endif -} diff --git a/main/displays/dpad5wiredebugdisplay.cpp b/main/displays/dpad5wiredebugdisplay.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/main/displays/dpad5wiredebugdisplay.h b/main/displays/dpad5wiredebugdisplay.h deleted file mode 100644 index c0137be..0000000 --- a/main/displays/dpad5wiredebugdisplay.h +++ /dev/null @@ -1,90 +0,0 @@ -#pragma once - -#include "display.h" -#include "globals.h" -#include "widgets/label.h" -#include "dpad5wire.h" - -namespace { -#ifdef FEATURE_DPAD_5WIRESW -class DPad5WireDebugDisplay : public Display, public virtual DummyConfirm, public virtual DummyBack -{ -public: - void initScreen() override; - void redraw() override; - -private: - Label m_labelRaw{30, 50}; - Label m_labelUp{175, 75}; - Label m_labelDown{175, 100}; - Label m_labelBack{175, 125}; - Label m_labelConfirm{175, 150}; - Label m_labelProfile0{175, 175}; - Label m_labelProfile1{175, 200}; - Label m_labelProfile2{175, 225}; - Label m_labelProfile3{175, 250}; - Label m_labelGas{175, 275}; - Label m_labelBrems{175, 300}; -}; - -void DPad5WireDebugDisplay::initScreen() -{ - tft.fillScreen(TFT_BLACK); - tft.setTextFont(4); - tft.setTextColor(TFT_YELLOW); - - tft.drawString("DPad 5wire debug", 5, 5); - - tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE); - - tft.setTextColor(TFT_WHITE, TFT_BLACK); - - tft.drawString("UP:", 30, 75); - tft.drawString("DOWN:", 30, 100); - tft.drawString("CONFIRM:", 30, 125); - tft.drawString("BACK:", 30, 150); - tft.drawString("PROFILE0:", 30, 175); - tft.drawString("PROFILE1:", 30, 200); - tft.drawString("PROFILE2:", 30, 225); - tft.drawString("PROFILE3:", 30, 250); - tft.drawString("GAS:", 30, 275); - tft.drawString("BREMS:", 30, 300); - - m_labelRaw.start(); - m_labelUp.start(); - m_labelDown.start(); - m_labelBack.start(); - m_labelConfirm.start(); - m_labelProfile0.start(); - m_labelProfile1.start(); - m_labelProfile2.start(); - m_labelProfile3.start(); - m_labelGas.start(); - m_labelBrems.start(); -} - -void DPad5WireDebugDisplay::redraw() -{ - m_labelRaw.redraw(std::string{} + - (std::get<0>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<1>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<2>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<3>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<4>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<5>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<6>(dpad5wire::lastState) ? '1' : '0') + ' ' + - (std::get<7>(dpad5wire::lastState) ? '1' : '0')); - - m_labelUp.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelDown.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelBack.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelConfirm.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelProfile0.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelProfile1.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelProfile2.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelProfile3.redraw(std::get(dpad5wire::lastState) ? "1" : "0"); - m_labelGas.redraw(raw_gas ? std::to_string(*raw_gas) : "?"); - m_labelBrems.redraw(raw_brems ? std::to_string(*raw_brems) : "?"); -} -#endif -} diff --git a/main/displays/dpad6wiredebugdisplay.cpp b/main/displays/dpad6wiredebugdisplay.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/main/displays/dpad6wiredebugdisplay.h b/main/displays/dpad6wiredebugdisplay.h deleted file mode 100644 index 783651c..0000000 --- a/main/displays/dpad6wiredebugdisplay.h +++ /dev/null @@ -1,92 +0,0 @@ -#pragma once - -#include "display.h" -#include "globals.h" -#include "widgets/label.h" -#include "dpad6wire.h" - -namespace { -#ifdef FEATURE_DPAD_6WIRESW -class DPad6WireDebugDisplay : public Display, public virtual DummyConfirm, public virtual DummyBack -{ -public: - void initScreen() override; - void redraw() override; - -private: - Label m_labelRaw{0, 50}; - Label m_labelUp{175, 75}; - Label m_labelDown{175, 100}; - Label m_labelBack{175, 125}; - Label m_labelConfirm{175, 150}; - Label m_labelProfile0{175, 175}; - Label m_labelProfile1{175, 200}; - Label m_labelProfile2{175, 225}; - Label m_labelProfile3{175, 250}; - Label m_labelGas{175, 275}; - Label m_labelBrems{175, 300}; -}; - -void DPad6WireDebugDisplay::initScreen() -{ - tft.fillScreen(TFT_BLACK); - tft.setTextFont(4); - tft.setTextColor(TFT_YELLOW); - - tft.drawString("DPad 5wire debug", 5, 5); - - tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE); - - tft.setTextColor(TFT_WHITE, TFT_BLACK); - - tft.drawString("UP:", 30, 75); - tft.drawString("DOWN:", 30, 100); - tft.drawString("CONFIRM:", 30, 125); - tft.drawString("BACK:", 30, 150); - tft.drawString("PROFILE0:", 30, 175); - tft.drawString("PROFILE1:", 30, 200); - tft.drawString("PROFILE2:", 30, 225); - tft.drawString("PROFILE3:", 30, 250); - tft.drawString("GAS:", 30, 275); - tft.drawString("BREMS:", 30, 300); - - m_labelRaw.start(); - m_labelUp.start(); - m_labelDown.start(); - m_labelBack.start(); - m_labelConfirm.start(); - m_labelProfile0.start(); - m_labelProfile1.start(); - m_labelProfile2.start(); - m_labelProfile3.start(); - m_labelGas.start(); - m_labelBrems.start(); -} - -void DPad6WireDebugDisplay::redraw() -{ - m_labelRaw.redraw(std::string{} + - (std::get<0>(dpad6wire::lastState) ? 'Z' : '0') + ' ' + - (std::get<1>(dpad6wire::lastState) ? '1' : '0') + ' ' + - (std::get<2>(dpad6wire::lastState) ? '2' : '0') + ' ' + - (std::get<3>(dpad6wire::lastState) ? '3' : '0') + ' ' + - (std::get<4>(dpad6wire::lastState) ? '4' : '0') + ' ' + - (std::get<5>(dpad6wire::lastState) ? '5' : '0') + ' ' + - (std::get<6>(dpad6wire::lastState) ? '6' : '0') + ' ' + - (std::get<7>(dpad6wire::lastState) ? '7' : '0') + ' ' + - (std::get<8>(dpad6wire::lastState) ? '8' : '0') + ' ' + - (std::get<9>(dpad6wire::lastState) ? '9' : '0')); - - m_labelUp.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelDown.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelBack.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelConfirm.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelProfile0.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelProfile1.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelProfile2.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelProfile3.redraw(std::get(dpad6wire::lastState) ? "1" : "0"); - m_labelGas.redraw(raw_gas ? std::to_string(*raw_gas) : "?"); - m_labelBrems.redraw(raw_brems ? std::to_string(*raw_brems) : "?"); -} -#endif -} diff --git a/main/displays/menus/timesettingsmenu.cpp b/main/displays/menus/timesettingsmenu.cpp index 1a44506..5a37766 100644 --- a/main/displays/menus/timesettingsmenu.cpp +++ b/main/displays/menus/timesettingsmenu.cpp @@ -8,6 +8,7 @@ #include "changevaluedisplay.h" #include "changevaluedisplay_daylightsavingmode.h" #include "changevaluedisplay_sntp_sync_mode_t.h" +#include "changevaluedisplay_string.h" #include "actions/switchscreenaction.h" #include "actions/dummyaction.h" #include "icons/back.h" @@ -69,6 +70,14 @@ using DaylightSavingModeChangeDisplay = espgui::makeComponent< >; #ifdef FEATURE_NTP +using TimeServerChangeDisplay = espgui::makeComponent< + BobbyChangeValueDisplay, + espgui::StaticText, + TimeServerAccessor, + espgui::ConfirmActionInterface>, + espgui::BackActionInterface> +>; + using TimeSyncModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, espgui::StaticText, @@ -96,17 +105,16 @@ public: #endif } // namespace -using namespace espgui; - TimeSettingsMenu::TimeSettingsMenu() { + using namespace espgui; constructMenuItem, DummyAction>>(); constructMenuItem, DummyAction>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); #ifdef FEATURE_NTP constructMenuItem, BobbyCheckbox, TimeServerEnabledAccessor>>(); - constructMenuItem, DummyAction>>(); + constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem>(); @@ -121,5 +129,5 @@ std::string TimeSettingsMenu::text() const void TimeSettingsMenu::back() { - switchScreen(); + espgui::switchScreen(); } diff --git a/main/main.cpp b/main/main.cpp index d9d2d41..1e0e1ff 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -71,14 +71,6 @@ extern "C" void app_main() bootLabel.redraw("switchScreen"); -#if defined(FEATURE_DPAD_5WIRESW) && defined(DPAD_5WIRESW_DEBUG) - switchScreen(); -#elif defined(FEATURE_DPAD_5WIRESW_2OUT) && defined(DPAD_5WIRESW_DEBUG) - switchScreen(); -#elif defined(FEATURE_DPAD_6WIRESW) && defined(DPAD_6WIRESW_DEBUG) - switchScreen(); -#else - if (settings.lockscreen.keepLockedAfterReboot && settings.lockscreen.locked) { espgui::switchScreen(); @@ -92,7 +84,6 @@ extern "C" void app_main() espgui::switchScreen(); } } -#endif while (true) {