diff --git a/main/actions/resetnvsaction.h b/main/actions/resetnvsaction.h index 68aecf8..6fd81e1 100644 --- a/main/actions/resetnvsaction.h +++ b/main/actions/resetnvsaction.h @@ -5,6 +5,7 @@ // 3rdparty lib includes #include +#include // local includes #include "newsettings.h" @@ -17,14 +18,14 @@ public: { if (reboot) { - tft.fillScreen(TFT_BLACK); - tft.setTextColor(TFT_YELLOW); + tft.fillScreen(espgui::TFT_BLACK); + tft.setTextColor(espgui::TFT_YELLOW); tft.drawString("Reboot", 5, 5, 4); - tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE); + tft.fillRect(0, 34, tft.width(), 3, espgui::TFT_WHITE); - tft.setTextColor(TFT_WHITE); + tft.setTextColor(espgui::TFT_WHITE); tft.drawString("Rebooting now...", 0, 50, 4); configs.reset(); diff --git a/main/displays/batterygraphdisplay.cpp b/main/displays/batterygraphdisplay.cpp index cc91189..f5ef2e6 100644 --- a/main/displays/batterygraphdisplay.cpp +++ b/main/displays/batterygraphdisplay.cpp @@ -21,7 +21,7 @@ namespace { void BatteryGraphDisplay::initScreen(espgui::TftInterface &tft) { Base::initScreen(tft); - drawBatteryCurve(); + drawBatteryCurve(tft); } std::string BatteryGraphDisplay::title() const @@ -36,7 +36,7 @@ std::string BatteryGraphDisplay::title() const void BatteryGraphDisplay::redraw(espgui::TftInterface &tft) { using namespace espgui; - Base::redraw(TFT); + Base::redraw(tft); if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage) { @@ -53,7 +53,7 @@ void BatteryGraphDisplay::redraw(espgui::TftInterface &tft) tft.fillRect(lastXOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, espgui::TFT_BLACK); tft.fillRect(xOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, espgui::TFT_WHITE); m_lastBatVoltage = *avgVoltage; - drawBatteryCurve(); + drawBatteryCurve(tft); } // tft.drawLine() code } @@ -73,7 +73,7 @@ void BatteryGraphDisplay::buttonPressed(espgui::Button button) } } -void BatteryGraphDisplay::drawBatteryCurve() +void BatteryGraphDisplay::drawBatteryCurve(espgui::TftInterface &tft) { const auto points = count_curve_points(configs.battery.cellType.value()); const auto max_height = tft.height() - 1; diff --git a/main/displays/batterygraphdisplay.h b/main/displays/batterygraphdisplay.h index 65600e0..074bc21 100644 --- a/main/displays/batterygraphdisplay.h +++ b/main/displays/batterygraphdisplay.h @@ -13,7 +13,7 @@ public: void buttonPressed(espgui::Button button) override; - static void drawBatteryCurve(); + static void drawBatteryCurve(espgui::TftInterface &tft); private: float m_lastBatVoltage{0}; diff --git a/main/displays/confiscationdisplay.cpp b/main/displays/confiscationdisplay.cpp index 42dd7c1..1b7acac 100644 --- a/main/displays/confiscationdisplay.cpp +++ b/main/displays/confiscationdisplay.cpp @@ -4,6 +4,7 @@ #include #include #include +#include // local includes #include "globals.h" @@ -32,33 +33,35 @@ void ConfiscationDisplay::initScreen(espgui::TftInterface &tft) { Base::initScreen(tft); + espgui::FontRenderer fontRenderer{tft}; + tft.pushImage(10, 70, bobbyicons::shortcircuit.WIDTH, bobbyicons::shortcircuit.HEIGHT, bobbyicons::shortcircuit.buffer); m_progressBar.start(tft); m_label.start(tft); - tft.setTextColor(TFT_WHITE, TFT_BLACK); - tft.setTextFont(2); + fontRenderer.setTextColor(TFT_WHITE, TFT_BLACK); + fontRenderer.setTextFont(2); auto y = 235; constexpr auto lineheight = 15; - tft.drawString("Bei erneuter, widerrechtlicher", 10, y+=lineheight); - tft.drawString("Beschlagnahmung wird die Selbst-", 10, y+=lineheight); - tft.drawString("Vernichtung durch Kurzschluss", 10, y+=lineheight); - tft.drawString(fmt::format("der Batterie eingeleitet (ca {:.2f}MJ)", calculateMegaJoules()), 10, y+=lineheight); + tft.drawString(tft, fontRenderer, "Bei erneuter, widerrechtlicher", 10, y+=lineheight); + tft.drawString(tft, fontRenderer, "Beschlagnahmung wird die Selbst-", 10, y+=lineheight); + tft.drawString(tft, fontRenderer, "Vernichtung durch Kurzschluss", 10, y+=lineheight); + tft.drawString(tft, fontRenderer, fmt::format("der Batterie eingeleitet (ca {:.2f}MJ)", calculateMegaJoules()), 10, y+=lineheight); } void ConfiscationDisplay::redraw(espgui::TftInterface &tft) { Base::redraw(tft); - m_progressBar.redraw(m_progress); + m_progressBar.redraw(tft, m_progress); tft.setTextColor(TFT_YELLOW, TFT_BLACK); tft.setTextFont(2); - m_label.redraw([](){ + m_label.redraw(tft, fontRenderer, [](){ if (const auto period = espchrono::millis_clock::now().time_since_epoch() % 6000ms; period < 2000ms) return "Halten Sie 10m Abstand."; else if (period < 4000ms) diff --git a/main/displays/joystickdebugdisplay.cpp b/main/displays/joystickdebugdisplay.cpp index 18f1c89..f0e14ef 100644 --- a/main/displays/joystickdebugdisplay.cpp +++ b/main/displays/joystickdebugdisplay.cpp @@ -26,7 +26,7 @@ void JoystickDebugDisplay::start() copyFromSettings(); } -std::string JoystickDebugDisplay::text() const +std::string JoystickDebugDisplay::title() const { return TEXT_JOYSTICK; } diff --git a/main/displays/joystickdebugdisplay.h b/main/displays/joystickdebugdisplay.h index dd1ff07..e75b8d8 100644 --- a/main/displays/joystickdebugdisplay.h +++ b/main/displays/joystickdebugdisplay.h @@ -16,7 +16,7 @@ class JoystickDebugDisplay : public BobbyDisplayWithTitle public: JoystickDebugDisplay(); - std::string text() const override; + std::string title() const override; void start() override; void update() override; void redraw() override; diff --git a/main/displays/ledstripcolorsdisplay.cpp b/main/displays/ledstripcolorsdisplay.cpp index 882a48e..64df10f 100644 --- a/main/displays/ledstripcolorsdisplay.cpp +++ b/main/displays/ledstripcolorsdisplay.cpp @@ -10,6 +10,7 @@ #include #include #include +#include // local includes #include "utils.h" @@ -71,16 +72,16 @@ void LedstripColorsDisplay::redraw(espgui::TftInterface &tft) last_state = state_select_color; } - tft.setTextFont(2); - tft.setTextColor(TFT_WHITE); - - tft.drawString(state_select_color ? - "Please select a color!" : - "Please select a side!", 50, y_pos); + espgui::FontRenderer fontRenderer{tft}; + fontRenderer.drawString(state_select_color ? + "Please select a color!" : + "Please select a side!", 50, y_pos, + espgui::TFT_WHITE, espgui::TFT_BLACK, + 2); if (!already_drew_circle) { - drawSide(static_cast(selected_side), TFT_GOLD); + drawSide(tft, static_cast(selected_side), TFT_GOLD); already_drew_circle = true; } } @@ -108,7 +109,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button) if(!state_select_color) { state_select_color = true; - drawColors(); + drawColors(tft); } else { @@ -141,13 +142,13 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button) /* TODO commander: move into redraw method */ if (state_select_color) { - drawColors(); + drawColors(tft); } else { tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK); clearSides(); - drawSide(static_cast(selected_side), TFT_GOLD); + drawSide(tft, static_cast(selected_side), TFT_GOLD); } break; @@ -172,7 +173,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button) /* TODO commander: move into redraw method */ if (state_select_color) { - drawColors(); + drawColors(tft); } else { @@ -185,7 +186,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button) } } -void LedstripColorsDisplay::drawColors() +void LedstripColorsDisplay::drawColors(espgui::TftInterface &tft) { uint16_t width = (tft.width() - 40); auto cube_width = width / 8; @@ -209,7 +210,7 @@ void LedstripColorsDisplay::clearSides() } } -void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color) +void LedstripColorsDisplay::drawSide(espgui::TftInterface &tft, Bobbycar_Side side, unsigned int color) { const auto middle = tft.width() / 2; const auto width = bobbyicons::bobbycar.WIDTH; diff --git a/main/displays/ledstripcolorsdisplay.h b/main/displays/ledstripcolorsdisplay.h index 9f4cf18..d7ed759 100644 --- a/main/displays/ledstripcolorsdisplay.h +++ b/main/displays/ledstripcolorsdisplay.h @@ -21,8 +21,8 @@ public: void buttonPressed(espgui::Button button) override; - void drawColors(); - void drawSide(Bobbycar_Side side, unsigned int color); + void drawColors(espgui::TftInterface &tft); + void drawSide(espgui::TftInterface &tft, Bobbycar_Side side, unsigned int color); void clearSides(); private: diff --git a/main/displays/lockscreen.cpp b/main/displays/lockscreen.cpp index ce73d00..177ae08 100644 --- a/main/displays/lockscreen.cpp +++ b/main/displays/lockscreen.cpp @@ -5,6 +5,7 @@ // 3rdparty lib includes #include +#include // local includes #include "globals.h" @@ -56,35 +57,30 @@ void Lockscreen::initScreen(espgui::TftInterface &tft) { Base::initScreen(tft); + espgui::FontRenderer fontRenderer{tft}; + tft.fillScreen(TFT_BLACK); - tft.setTextFont(4); - tft.setTextColor(TFT_YELLOW); - tft.drawString("Lock vehicle", 5, 5); + fontRenderer.drawString("Lock vehicle", 5, 5, 4, espgui::TFT_YELLOW, espgui::TFT_BLACK); - tft.fillRect(0, 34, tft.width(), 3, TFT_WHITE); + tft.fillRect(0, 34, tft.width(), 3, espgui::TFT_WHITE); - tft.setTextColor(TFT_WHITE); - tft.drawString("Enter code to unlock:", 0, 50); - - tft.setTextColor(TFT_WHITE, TFT_BLACK); + fontRenderer.drawString("Enter code to unlock:", 0, 50, 4, espgui::TFT_WHITE, espgui::TFT_BLACK); for(int i = 0; i <= 3; i++) { - drawRect(i, 3, TFT_WHITE); - drawRect(i, 4, TFT_WHITE); + drawRect(tft, i, 3, espgui::TFT_WHITE); + drawRect(tft, i, 4, espgui::TFT_WHITE); } for (auto &label : m_labels) label.start(tft); - tft.setTextFont(7); - - drawRect(m_currentIndex, 1, TFT_YELLOW); - drawRect(m_currentIndex, 2, TFT_YELLOW); + drawRect(tft, m_currentIndex, 1, espgui::TFT_YELLOW); + drawRect(tft, m_currentIndex, 2, espgui::TFT_YELLOW); for(int i = 0; i <= m_currentIndex; i++) - m_labels[i].redraw(std::to_string(m_numbers[i])); + m_labels[i].redraw(tft, fontRenderer, std::to_string(m_numbers[i]), espgui::TFT_WHITE, espgui::TFT_BLACK, 7); } void Lockscreen::update() @@ -98,8 +94,8 @@ void Lockscreen::redraw(espgui::TftInterface &tft) if (m_pressed || m_back_pressed) { - drawRect(m_currentIndex, 1, TFT_BLACK); - drawRect(m_currentIndex, 2, TFT_BLACK); + drawRect(tft, m_currentIndex, 1, TFT_BLACK); + drawRect(tft, m_currentIndex, 2, TFT_BLACK); if (!m_back_pressed && ++m_currentIndex>=4) { @@ -123,18 +119,19 @@ LOCKSCREEN_PLUGIN_FIXES_2 m_numbers = {0,0,0,0}; m_currentIndex = 0; - std::for_each(std::begin(m_labels) + 1, std::end(m_labels), [](auto &label){ label.redraw("0"); }); + std::for_each(std::begin(m_labels) + 1, std::end(m_labels), + [&tft](auto &label){ label.redraw(tft, "0"); }); } else if (m_back_pressed && m_currentIndex < 3) { - drawRect(m_currentIndex+1, 1, TFT_BLACK); - drawRect(m_currentIndex+1, 2, TFT_BLACK); + drawRect(tft, m_currentIndex+1, 1, TFT_BLACK); + drawRect(tft, m_currentIndex+1, 2, TFT_BLACK); } - m_labels[m_currentIndex].redraw(std::to_string(m_numbers[m_currentIndex])); + m_labels[m_currentIndex].redraw(tft, std::to_string(m_numbers[m_currentIndex])); - drawRect(m_currentIndex, 1, TFT_YELLOW); - drawRect(m_currentIndex, 2, TFT_YELLOW); + drawRect(tft, m_currentIndex, 1, TFT_YELLOW); + drawRect(tft, m_currentIndex, 2, TFT_YELLOW); m_pressed = false; m_back_pressed = false; @@ -204,7 +201,7 @@ void Lockscreen::buttonPressed(espgui::Button button) } } -void Lockscreen::drawRect(int index, int offset, uint32_t color) const +void Lockscreen::drawRect(espgui::TftInterface &tft, int index, int offset, uint32_t color) const { tft.drawRect(m_labels[index].x()-offset, m_labels[index].y()-offset, boxWidth+(offset*2), boxHeight+(offset*2), color); } diff --git a/main/displays/lockscreen.h b/main/displays/lockscreen.h index a7efefe..3718ae9 100644 --- a/main/displays/lockscreen.h +++ b/main/displays/lockscreen.h @@ -32,7 +32,7 @@ public: void buttonPressed(espgui::Button button) override; private: - void drawRect(int index, int offset, uint32_t color) const; + void drawRect(espgui::TftInterface &tft, int index, int offset, uint32_t color) const; std::array m_labels {{ espgui::Label{spacing, 100}, // boxWidth, boxHeight diff --git a/main/displays/menudisplaywithtime.cpp b/main/displays/menudisplaywithtime.cpp index b17ccd5..1fffd92 100644 --- a/main/displays/menudisplaywithtime.cpp +++ b/main/displays/menudisplaywithtime.cpp @@ -2,6 +2,7 @@ // 3rdparty lib includes #include +#include // local includes #include "utils.h" @@ -18,8 +19,7 @@ void MenuDisplayWithTime::initScreen(espgui::TftInterface &tft) void MenuDisplayWithTime::redraw(espgui::TftInterface &tft) { Base::redraw(tft); - tft.setTextFont(use_big_font() ? 4 : 2); - m_label_currentTime.redraw(tft, fontRenderer, fmt::format("&7Time: {}", local_clock_string())); + m_label_currentTime.redraw(tft, fmt::format("&7Time: {}", local_clock_string()), espgui::TFT_WHITE, espgui::TFT_BLACK, use_big_font() ? 4 : 2); } } // namespace diff --git a/main/displays/menus/batterydebugmenu.cpp b/main/displays/menus/batterydebugmenu.cpp index 92caeb3..8b53b5c 100644 --- a/main/displays/menus/batterydebugmenu.cpp +++ b/main/displays/menus/batterydebugmenu.cpp @@ -84,7 +84,7 @@ BatteryDebugMenu::BatteryDebugMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string BatteryDebugMenu::text() const +std::string BatteryDebugMenu::title() const { return TEXT_BATTERYDEBUG; } diff --git a/main/displays/menus/batterydebugmenu.h b/main/displays/menus/batterydebugmenu.h index e351982..49e6f21 100644 --- a/main/displays/menus/batterydebugmenu.h +++ b/main/displays/menus/batterydebugmenu.h @@ -8,7 +8,7 @@ class BatteryDebugMenu : public BobbyMenuDisplay public: BatteryDebugMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/batterymenu.cpp b/main/displays/menus/batterymenu.cpp index 1ea0997..bc9c662 100644 --- a/main/displays/menus/batterymenu.cpp +++ b/main/displays/menus/batterymenu.cpp @@ -9,6 +9,7 @@ #include #include #include +#include // Local includes #include "utils.h" @@ -52,7 +53,7 @@ class WhStatisticsText : public virtual espgui::TextInterface { public: std::str using BatteryCellSeriesChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BatterySeriesCellsAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -60,7 +61,7 @@ using BatteryCellSeriesChangeScreen = espgui::makeComponent< using BatteryCellParallelChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BatteryParallelCellsAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -68,7 +69,7 @@ using BatteryCellParallelChangeScreen = espgui::makeComponent< using BatteryWHperKMChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BatteryWHperKMAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -99,8 +100,8 @@ std::string BatteryMenu::title() const void BatteryMenu::initScreen(espgui::TftInterface &tft) { Base::initScreen(tft); - m_batPercentBootLabel.start(); - m_batPercentNowLabel.start(); + m_batPercentBootLabel.start(tft); + m_batPercentNowLabel.start(tft); } void BatteryMenu::start() @@ -121,11 +122,11 @@ void BatteryMenu::redraw(espgui::TftInterface &tft) m_doubleProgressBarBatPercentage.redraw(batPercent, *battery::bootBatPercentage); tft.setTextFont(2); - tft.setTextColor(TFT_DARKGREY, TFT_BLACK); + tft.setTextColor(espgui::TFT_DARKGREY, espgui::TFT_BLACK); m_batPercentNowLabel.redraw(fmt::format("{:.2f} %", batPercent)); m_batPercentBootLabel.redraw(fmt::format("{:.2f} %", *battery::bootBatPercentage)); tft.setTextFont(4); - tft.setTextColor(TFT_WHITE, TFT_BLACK); + tft.setTextColor(espgui::TFT_WHITE, espgui::TFT_BLACK); } } } diff --git a/main/displays/menus/blesettingsmenu.cpp b/main/displays/menus/blesettingsmenu.cpp index c98a0b1..0b60ac4 100644 --- a/main/displays/menus/blesettingsmenu.cpp +++ b/main/displays/menus/blesettingsmenu.cpp @@ -26,7 +26,7 @@ constexpr char TEXT_BACK[] = "Back"; using ApSsidChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BluetoothNameAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -44,7 +44,7 @@ BleSettingsMenu::BleSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string BleSettingsMenu::text() const +std::string BleSettingsMenu::title() const { return TEXT_BLESETTINGS; } diff --git a/main/displays/menus/blesettingsmenu.h b/main/displays/menus/blesettingsmenu.h index 2030627..4108658 100644 --- a/main/displays/menus/blesettingsmenu.h +++ b/main/displays/menus/blesettingsmenu.h @@ -8,7 +8,7 @@ class BleSettingsMenu : public BobbyMenuDisplay public: BleSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp b/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp index a2c4893..5eb909d 100644 --- a/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp +++ b/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp @@ -76,35 +76,35 @@ public: using SampleCountChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, SampleCountAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GasMinChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GasMinAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GasMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GasMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using BremsMinChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BremsMinAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using BremsMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BremsMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -114,14 +114,14 @@ using BremsMaxChangeScreen = espgui::makeComponent< #if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW) || defined(FEATURE_DPAD_5WIRESW_2OUT) || defined (FEATURE_DPAD_6WIRESW) || defined (DPAD_BOARDCOMPUTER_V2) using DPadDebounceChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DPadDebounceAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using ButtonDelayChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ButtonDelayAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -144,42 +144,42 @@ public: using GametrakXMinChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakXMinAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GametrakXMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakXMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GametrakYMinChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakYMinAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GametrakYMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakYMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GametrakDistMinChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakDistMinAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using GametrakDistMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, GametrakDistMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -229,7 +229,7 @@ BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string BoardcomputerHardwareSettingsMenu::text() const +std::string BoardcomputerHardwareSettingsMenu::title() const { return TEXT_BOARDCOMPUTERHARDWARESETTINGS; } diff --git a/main/displays/menus/boardcomputerhardwaresettingsmenu.h b/main/displays/menus/boardcomputerhardwaresettingsmenu.h index 3401014..a87798d 100644 --- a/main/displays/menus/boardcomputerhardwaresettingsmenu.h +++ b/main/displays/menus/boardcomputerhardwaresettingsmenu.h @@ -8,7 +8,7 @@ class BoardcomputerHardwareSettingsMenu : public BobbyMenuDisplay public: BoardcomputerHardwareSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/buzzermenu.cpp b/main/displays/menus/buzzermenu.cpp index 5c51e0c..d8a8b00 100644 --- a/main/displays/menus/buzzermenu.cpp +++ b/main/displays/menus/buzzermenu.cpp @@ -31,7 +31,7 @@ constexpr char TEXT_BACK[] = "Back"; struct FrontFreqAccessor : public espgui::RefAccessor { uint8_t &getRef() const override { return controllers.front.command.buzzer.freq; } }; using FrontFreqChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, FrontFreqAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -40,7 +40,7 @@ using FrontFreqChangeScreen = espgui::makeComponent< struct FrontPatternAccessor : public espgui::RefAccessor { uint8_t &getRef() const override { return controllers.front.command.buzzer.pattern; } }; using FrontPatternChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, FrontPatternAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -49,7 +49,7 @@ using FrontPatternChangeScreen = espgui::makeComponent< struct BackFreqAccessor : public espgui::RefAccessor { uint8_t &getRef() const override { return controllers.back.command.buzzer.freq; } }; using BackFreqChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BackFreqAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -58,7 +58,7 @@ using BackFreqChangeScreen = espgui::makeComponent< struct BackPatternAccessor : public espgui::RefAccessor { uint8_t &getRef() const override { return controllers.back.command.buzzer.pattern; } }; using BackPatternChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BackPatternAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -66,28 +66,28 @@ using BackPatternChangeScreen = espgui::makeComponent< using ReverseBeepFreq0ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ReverseBeepFreq0Accessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using ReverseBeepFreq1ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ReverseBeepFreq1Accessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using ReverseBeepDuration0ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ReverseBeepDuration0Accessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using ReverseBeepDuration1ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ReverseBeepDuration1Accessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -110,7 +110,7 @@ BuzzerMenu::BuzzerMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string BuzzerMenu::text() const +std::string BuzzerMenu::title() const { return TEXT_BUZZER; } diff --git a/main/displays/menus/buzzermenu.h b/main/displays/menus/buzzermenu.h index cfdc0bd..33d5a33 100644 --- a/main/displays/menus/buzzermenu.h +++ b/main/displays/menus/buzzermenu.h @@ -8,7 +8,7 @@ class BuzzerMenu : public BobbyMenuDisplay public: BuzzerMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/candebugmenu.cpp b/main/displays/menus/candebugmenu.cpp index 4c35b09..832bb04 100644 --- a/main/displays/menus/candebugmenu.cpp +++ b/main/displays/menus/candebugmenu.cpp @@ -260,7 +260,7 @@ CanDebugMenu::CanDebugMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string CanDebugMenu::text() const +std::string CanDebugMenu::title() const { return TEXT_CANDEBUG; } diff --git a/main/displays/menus/candebugmenu.h b/main/displays/menus/candebugmenu.h index d8d2ace..13b66ef 100644 --- a/main/displays/menus/candebugmenu.h +++ b/main/displays/menus/candebugmenu.h @@ -1,5 +1,7 @@ #pragma once +#include "sdkconfig.h" + // local includes #include "displays/bobbymenudisplay.h" @@ -18,7 +20,7 @@ class CanDebugMenu : public BobbyMenuDisplay public: CanDebugMenu(); - std::string text() const override; + std::string title() const override; void update() override; diff --git a/main/displays/menus/cloudsettingsmenu.cpp b/main/displays/menus/cloudsettingsmenu.cpp index 10555c1..f6c49be 100644 --- a/main/displays/menus/cloudsettingsmenu.cpp +++ b/main/displays/menus/cloudsettingsmenu.cpp @@ -32,7 +32,7 @@ constexpr char TEXT_BACK[] = "Back"; using CloudURLChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudURLAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -40,7 +40,7 @@ using CloudURLChangeScreen = espgui::makeComponent< using CloudKeyChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudKeyAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -48,7 +48,7 @@ using CloudKeyChangeScreen = espgui::makeComponent< using CloudTransmitTimeoutChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudTransmitTimeoutAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -65,7 +65,7 @@ public: using CloudCollectRateChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudCollectRateAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -73,7 +73,7 @@ using CloudCollectRateChangeDisplay = espgui::makeComponent< using CloudSendRateChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudSendRateAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -98,7 +98,7 @@ CloudSettingsMenu::CloudSettingsMenu() constructMenuItem, PushScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string CloudSettingsMenu::text() const +std::string CloudSettingsMenu::title() const { return TEXT_CLOUDSETTINGS; } diff --git a/main/displays/menus/cloudsettingsmenu.h b/main/displays/menus/cloudsettingsmenu.h index 99aedb1..76ba9ee 100644 --- a/main/displays/menus/cloudsettingsmenu.h +++ b/main/displays/menus/cloudsettingsmenu.h @@ -8,7 +8,7 @@ class CloudSettingsMenu : public BobbyMenuDisplay public: CloudSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/controllerhardwaresettingsmenu.cpp b/main/displays/menus/controllerhardwaresettingsmenu.cpp index e44b4d5..4c354ad 100644 --- a/main/displays/menus/controllerhardwaresettingsmenu.cpp +++ b/main/displays/menus/controllerhardwaresettingsmenu.cpp @@ -39,14 +39,14 @@ constexpr char TEXT_BACK[] = "Back"; using WheelDiameterMmChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WheelDiameterMmAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using WheelDiameterInchChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WheelDiameterInchAccessor, espgui::RatioNumberStep>, espgui::ConfirmActionInterface, @@ -54,7 +54,7 @@ using WheelDiameterInchChangeScreen = espgui::makeComponent< >; using NumMagnetPolesChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, NumMagnetPolesAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -62,14 +62,14 @@ using NumMagnetPolesChangeScreen = espgui::makeComponent< #ifdef FEATURE_CAN using CanTransmitTimeoutChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CanTransmitTimeoutAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using CanReceiveTimeoutChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CanReceiveTimeoutAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -97,7 +97,7 @@ ControllerHardwareSettingsMenu::ControllerHardwareSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string ControllerHardwareSettingsMenu::text() const +std::string ControllerHardwareSettingsMenu::title() const { return TEXT_CONTROLLERHARDWARESETTINGS; } diff --git a/main/displays/menus/controllerhardwaresettingsmenu.h b/main/displays/menus/controllerhardwaresettingsmenu.h index 6cdc7bf..9a665b5 100644 --- a/main/displays/menus/controllerhardwaresettingsmenu.h +++ b/main/displays/menus/controllerhardwaresettingsmenu.h @@ -8,7 +8,7 @@ class ControllerHardwareSettingsMenu : public BobbyMenuDisplay public: ControllerHardwareSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/crashmenu.cpp b/main/displays/menus/crashmenu.cpp index 22641c9..5dda47e 100644 --- a/main/displays/menus/crashmenu.cpp +++ b/main/displays/menus/crashmenu.cpp @@ -23,7 +23,7 @@ CrashMenu::CrashMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string CrashMenu::text() const +std::string CrashMenu::title() const { return TEXT_CRASHMENU; } diff --git a/main/displays/menus/crashmenu.h b/main/displays/menus/crashmenu.h index d8322ba..4cf509a 100644 --- a/main/displays/menus/crashmenu.h +++ b/main/displays/menus/crashmenu.h @@ -8,7 +8,7 @@ class CrashMenu : public BobbyMenuDisplay public: CrashMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/debugmenu.cpp b/main/displays/menus/debugmenu.cpp index 327a546..2756d03 100644 --- a/main/displays/menus/debugmenu.cpp +++ b/main/displays/menus/debugmenu.cpp @@ -118,7 +118,7 @@ DebugMenu::DebugMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string DebugMenu::text() const +std::string DebugMenu::title() const { return TEXT_DEBUG; } diff --git a/main/displays/menus/debugmenu.h b/main/displays/menus/debugmenu.h index ed03a16..568aa48 100644 --- a/main/displays/menus/debugmenu.h +++ b/main/displays/menus/debugmenu.h @@ -8,7 +8,7 @@ class DebugMenu : public BobbyMenuDisplay public: DebugMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/defaultmodesettingsmenu.cpp b/main/displays/menus/defaultmodesettingsmenu.cpp index 2a7309d..aae6f07 100644 --- a/main/displays/menus/defaultmodesettingsmenu.cpp +++ b/main/displays/menus/defaultmodesettingsmenu.cpp @@ -46,70 +46,70 @@ constexpr char TEXT_BACK[] = "Back"; using DefaultModeModelModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeModelModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeSmoothingChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeSmoothingAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeFwSmoothingLowerLimitChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeEnableFieldWeakSmoothingLowerLimitAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeFrontPercentageChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeFrontPercentageAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeBackPercentageChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeBackPercentageAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeAddSchwelleChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeAddSchwelleAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeGas1WertChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeGas1WertAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeGas2WertChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeGas2WertAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeBrems1WertChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeBrems1WertAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using DefaultModeBrems2WertChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DefaultModeBrems2WertAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/demosmenu.cpp b/main/displays/menus/demosmenu.cpp index b8e7d91..5ff43f3 100644 --- a/main/displays/menus/demosmenu.cpp +++ b/main/displays/menus/demosmenu.cpp @@ -32,7 +32,7 @@ DemosMenu::DemosMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string DemosMenu::text() const +std::string DemosMenu::title() const { return TEXT_DEMOS; } diff --git a/main/displays/menus/demosmenu.h b/main/displays/menus/demosmenu.h index 2ae12c6..af3e0fd 100644 --- a/main/displays/menus/demosmenu.h +++ b/main/displays/menus/demosmenu.h @@ -8,7 +8,7 @@ class DemosMenu : public BobbyMenuDisplay public: DemosMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/dynamicdebugmenu.cpp b/main/displays/menus/dynamicdebugmenu.cpp index 3e1e422..5a002c1 100644 --- a/main/displays/menus/dynamicdebugmenu.cpp +++ b/main/displays/menus/dynamicdebugmenu.cpp @@ -69,7 +69,7 @@ private: class RandomIcon : public virtual MenuItemIconInterface { public: - const MenuItemIcon *icon() const override; + const MenuItemIcon *icon(bool selected) const override; private: mutable std::optional m_nextUpdate; @@ -91,7 +91,7 @@ public: using ToggleChangeValueDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, ToggleAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -185,7 +185,7 @@ int RandomFont::font() const return m_font; } -const MenuItemIcon *RandomIcon::icon() const +const MenuItemIcon *RandomIcon::icon(bool selected) const { const auto now = espchrono::millis_clock::now(); if (!m_nextUpdate || now >= *m_nextUpdate) diff --git a/main/displays/menus/enablemenu.cpp b/main/displays/menus/enablemenu.cpp index 8275530..add8755 100644 --- a/main/displays/menus/enablemenu.cpp +++ b/main/displays/menus/enablemenu.cpp @@ -25,7 +25,7 @@ EnableMenu::EnableMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string EnableMenu::text() const +std::string EnableMenu::title() const { return TEXT_SETENABLED; } diff --git a/main/displays/menus/enablemenu.h b/main/displays/menus/enablemenu.h index 0b763d9..fbfdee1 100644 --- a/main/displays/menus/enablemenu.h +++ b/main/displays/menus/enablemenu.h @@ -8,7 +8,7 @@ class EnableMenu : public BobbyMenuDisplay public: EnableMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/espnowmenu.cpp b/main/displays/menus/espnowmenu.cpp index 5a26c07..ed5ccad 100644 --- a/main/displays/menus/espnowmenu.cpp +++ b/main/displays/menus/espnowmenu.cpp @@ -65,7 +65,7 @@ EspNowMenu::EspNowMenu() constructMenuItem, PushScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string EspNowMenu::text() const +std::string EspNowMenu::title() const { return TEXT_ESPNOW_MENU; } diff --git a/main/displays/menus/espnowmenu.h b/main/displays/menus/espnowmenu.h index cc69737..850032b 100644 --- a/main/displays/menus/espnowmenu.h +++ b/main/displays/menus/espnowmenu.h @@ -8,7 +8,7 @@ class EspNowMenu : public BobbyMenuDisplay public: EspNowMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/espnowsettingsmenu.cpp b/main/displays/menus/espnowsettingsmenu.cpp index 1ca4c92..0b6a6ef 100644 --- a/main/displays/menus/espnowsettingsmenu.cpp +++ b/main/displays/menus/espnowsettingsmenu.cpp @@ -27,7 +27,7 @@ EspNowSettingsMenu::EspNowSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string EspNowSettingsMenu::text() const +std::string EspNowSettingsMenu::title() const { return TEXT_ESPNOW_SETTINGS; } diff --git a/main/displays/menus/espnowsettingsmenu.h b/main/displays/menus/espnowsettingsmenu.h index 0e4eaaf..b4e3590 100644 --- a/main/displays/menus/espnowsettingsmenu.h +++ b/main/displays/menus/espnowsettingsmenu.h @@ -8,7 +8,7 @@ class EspNowSettingsMenu : public BobbyMenuDisplay public: EspNowSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/extrabuttoncalibratemenu.cpp b/main/displays/menus/extrabuttoncalibratemenu.cpp index b212d5f..2a36213 100644 --- a/main/displays/menus/extrabuttoncalibratemenu.cpp +++ b/main/displays/menus/extrabuttoncalibratemenu.cpp @@ -242,7 +242,7 @@ void ExtraButtonCalibrateMenu::buttonPressed(espgui::Button button) } } -std::string ExtraButtonCalibrateMenu::text() const +std::string ExtraButtonCalibrateMenu::title() const { return TEXT_EXTRABUTTONCALIBRATEMENU; } diff --git a/main/displays/menus/extrabuttoncalibratemenu.h b/main/displays/menus/extrabuttoncalibratemenu.h index 5249f7e..3b4a7e2 100644 --- a/main/displays/menus/extrabuttoncalibratemenu.h +++ b/main/displays/menus/extrabuttoncalibratemenu.h @@ -30,7 +30,7 @@ class ExtraButtonCalibrateMenu : using Base = BobbyMenuDisplay; public: ExtraButtonCalibrateMenu(); - std::string text() const override; + std::string title() const override; void back() override; void start() override; diff --git a/main/displays/menus/feedbackdebugmenu.h b/main/displays/menus/feedbackdebugmenu.h index 0cd7a93..7d7f6ce 100644 --- a/main/displays/menus/feedbackdebugmenu.h +++ b/main/displays/menus/feedbackdebugmenu.h @@ -10,6 +10,7 @@ #include "debugtexthelpers.h" #include "debugcolorhelpers.h" #include "displays/menus/debugmenu.h" +#include template class ColorInterface> class FeedbackDebugMenu : @@ -21,11 +22,11 @@ public: FeedbackDebugMenu() { using namespace espgui; - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, ColorInterface, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, ColorInterface, DummyAction>>(); constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } diff --git a/main/displays/menus/garagemenu.cpp b/main/displays/menus/garagemenu.cpp index f45ffa4..f3ba1c2 100644 --- a/main/displays/menus/garagemenu.cpp +++ b/main/displays/menus/garagemenu.cpp @@ -44,7 +44,7 @@ GarageMenu::GarageMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string GarageMenu::text() const +std::string GarageMenu::title() const { return TEXT_GARAGE; } diff --git a/main/displays/menus/garagemenu.h b/main/displays/menus/garagemenu.h index 495141b..ec01c23 100644 --- a/main/displays/menus/garagemenu.h +++ b/main/displays/menus/garagemenu.h @@ -8,7 +8,7 @@ class GarageMenu : public BobbyMenuDisplay public: GarageMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/gitmenu.cpp b/main/displays/menus/gitmenu.cpp index ddd523e..f194218 100644 --- a/main/displays/menus/gitmenu.cpp +++ b/main/displays/menus/gitmenu.cpp @@ -63,7 +63,7 @@ GitMenu::GitMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string GitMenu::text() const +std::string GitMenu::title() const { return TEXT_GIT; } diff --git a/main/displays/menus/gitmenu.h b/main/displays/menus/gitmenu.h index f733520..133fc44 100644 --- a/main/displays/menus/gitmenu.h +++ b/main/displays/menus/gitmenu.h @@ -8,7 +8,7 @@ class GitMenu : public bobbygui::MenuDisplayWithTime public: GitMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/graphsmenu.cpp b/main/displays/menus/graphsmenu.cpp index cc2f167..c56f802 100644 --- a/main/displays/menus/graphsmenu.cpp +++ b/main/displays/menus/graphsmenu.cpp @@ -213,7 +213,7 @@ GraphsMenu::GraphsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string GraphsMenu::text() const +std::string GraphsMenu::title() const { return TEXT_GRAPHS; } diff --git a/main/displays/menus/graphsmenu.h b/main/displays/menus/graphsmenu.h index 03e6763..58e7e43 100644 --- a/main/displays/menus/graphsmenu.h +++ b/main/displays/menus/graphsmenu.h @@ -8,7 +8,7 @@ class GraphsMenu : public BobbyMenuDisplay public: GraphsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/greenpassmenu.cpp b/main/displays/menus/greenpassmenu.cpp index ede4d38..8219aa5 100644 --- a/main/displays/menus/greenpassmenu.cpp +++ b/main/displays/menus/greenpassmenu.cpp @@ -89,7 +89,7 @@ GreenPassMenu::GreenPassMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string GreenPassMenu::text() const +std::string GreenPassMenu::title() const { return TEXT_GREENPASS; } diff --git a/main/displays/menus/greenpassmenu.h b/main/displays/menus/greenpassmenu.h index d165f1f..efc4906 100644 --- a/main/displays/menus/greenpassmenu.h +++ b/main/displays/menus/greenpassmenu.h @@ -8,7 +8,7 @@ class GreenPassMenu : public BobbyMenuDisplay public: GreenPassMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/handbremssettingsmenu.cpp b/main/displays/menus/handbremssettingsmenu.cpp index 6bb62e9..d88ff76 100644 --- a/main/displays/menus/handbremssettingsmenu.cpp +++ b/main/displays/menus/handbremssettingsmenu.cpp @@ -26,7 +26,7 @@ constexpr char TEXT_BACK[] = "Back"; using HandBremsTriggerTimeoutChangeValueDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, HandbremsTimeoutAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -44,7 +44,7 @@ HandbremsSettingsMenu::HandbremsSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string HandbremsSettingsMenu::text() const +std::string HandbremsSettingsMenu::title() const { return TEXT_HANDBREMSE; } diff --git a/main/displays/menus/handbremssettingsmenu.h b/main/displays/menus/handbremssettingsmenu.h index e958296..f70e7f7 100644 --- a/main/displays/menus/handbremssettingsmenu.h +++ b/main/displays/menus/handbremssettingsmenu.h @@ -8,7 +8,7 @@ class HandbremsSettingsMenu : public BobbyMenuDisplay public: HandbremsSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/invertmenu.cpp b/main/displays/menus/invertmenu.cpp index 4348757..8e1ccbd 100644 --- a/main/displays/menus/invertmenu.cpp +++ b/main/displays/menus/invertmenu.cpp @@ -25,7 +25,7 @@ InvertMenu::InvertMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string InvertMenu::text() const +std::string InvertMenu::title() const { return TEXT_SETINVERTED; } diff --git a/main/displays/menus/invertmenu.h b/main/displays/menus/invertmenu.h index c7bf50f..4a7516b 100644 --- a/main/displays/menus/invertmenu.h +++ b/main/displays/menus/invertmenu.h @@ -8,7 +8,7 @@ class InvertMenu : public BobbyMenuDisplay public: InvertMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/larsmmodesettingsmenu.cpp b/main/displays/menus/larsmmodesettingsmenu.cpp index 5a8c3bc..da39ea1 100644 --- a/main/displays/menus/larsmmodesettingsmenu.cpp +++ b/main/displays/menus/larsmmodesettingsmenu.cpp @@ -23,21 +23,21 @@ constexpr char TEXT_BACK[] = "Back"; using LarsmModeModelModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LarsmModeModelModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using LarsmModeModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LarsmModeModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using LarsmModeIterationsChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LarsmModeIterationsAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/ledstripmenu.cpp b/main/displays/menus/ledstripmenu.cpp index c4f108d..0a7b480 100644 --- a/main/displays/menus/ledstripmenu.cpp +++ b/main/displays/menus/ledstripmenu.cpp @@ -54,7 +54,7 @@ constexpr char TEXT_BACK[] = "Back"; using LedsCountChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LedsCountAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -62,7 +62,7 @@ using LedsCountChangeScreen = espgui::makeComponent< using CenterOffsetChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CenterOffsetAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -70,7 +70,7 @@ using CenterOffsetChangeScreen = espgui::makeComponent< using SmallOffsetChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, SmallOffsetAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -78,7 +78,7 @@ using SmallOffsetChangeScreen = espgui::makeComponent< using BigOffsetChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, BigOffsetAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -86,7 +86,7 @@ using BigOffsetChangeScreen = espgui::makeComponent< using LedStripMaxAmpereChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LedStripMaxAmpereAccessor, espgui::RatioNumberStep>, espgui::ConfirmActionInterface, @@ -95,7 +95,7 @@ using LedStripMaxAmpereChangeScreen = espgui::makeComponent< using StVOOffsetChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LedsStVOFrontOffsetAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -103,7 +103,7 @@ using StVOOffsetChangeScreen = espgui::makeComponent< using StVOLengthChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LedsStVOFrontLengthAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -111,7 +111,7 @@ using StVOLengthChangeScreen = espgui::makeComponent< using AnimationMultiplierChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, AnimationMultiplierAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -119,7 +119,7 @@ using AnimationMultiplierChangeScreen = espgui::makeComponent< using LedStripBrightnessChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LedstripBrightnessAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -186,7 +186,7 @@ LedstripMenu::LedstripMenu() constructMenuItem, espgui::PushScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string LedstripMenu::text() const +std::string LedstripMenu::title() const { return TEXT_LEDSTRIP; } diff --git a/main/displays/menus/ledstripmenu.h b/main/displays/menus/ledstripmenu.h index 2b8dce0..efca6ef 100644 --- a/main/displays/menus/ledstripmenu.h +++ b/main/displays/menus/ledstripmenu.h @@ -8,7 +8,7 @@ class LedstripMenu : public bobbygui::MenuDisplayWithTime public: LedstripMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/ledstripselectblinkmenu.cpp b/main/displays/menus/ledstripselectblinkmenu.cpp index cd67f2a..4ef2715 100644 --- a/main/displays/menus/ledstripselectblinkmenu.cpp +++ b/main/displays/menus/ledstripselectblinkmenu.cpp @@ -44,7 +44,7 @@ LedstripSelectBlinkMenu::LedstripSelectBlinkMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string LedstripSelectBlinkMenu::text() const +std::string LedstripSelectBlinkMenu::title() const { return TEXT_BLINKANIMATION; } diff --git a/main/displays/menus/ledstripselectblinkmenu.h b/main/displays/menus/ledstripselectblinkmenu.h index 77cdcb6..ec11e22 100644 --- a/main/displays/menus/ledstripselectblinkmenu.h +++ b/main/displays/menus/ledstripselectblinkmenu.h @@ -8,6 +8,6 @@ class LedstripSelectBlinkMenu : public BobbyMenuDisplay public: LedstripSelectBlinkMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/ledstripselectotamode.cpp b/main/displays/menus/ledstripselectotamode.cpp index 4355d06..bbcdaa9 100644 --- a/main/displays/menus/ledstripselectotamode.cpp +++ b/main/displays/menus/ledstripselectotamode.cpp @@ -37,7 +37,7 @@ LedstripOtaAnimationChangeMenu::LedstripOtaAnimationChangeMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string LedstripOtaAnimationChangeMenu::text() const +std::string LedstripOtaAnimationChangeMenu::title() const { return TEXT_BLINKANIMATION; } diff --git a/main/displays/menus/ledstripselectotamode.h b/main/displays/menus/ledstripselectotamode.h index 982f02c..4e0aa76 100644 --- a/main/displays/menus/ledstripselectotamode.h +++ b/main/displays/menus/ledstripselectotamode.h @@ -8,6 +8,6 @@ class LedstripOtaAnimationChangeMenu : public BobbyMenuDisplay public: LedstripOtaAnimationChangeMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/limitssettingsmenu.cpp b/main/displays/menus/limitssettingsmenu.cpp index 6b455a0..9ae9bb6 100644 --- a/main/displays/menus/limitssettingsmenu.cpp +++ b/main/displays/menus/limitssettingsmenu.cpp @@ -25,42 +25,42 @@ constexpr char TEXT_BACK[] = "Back"; using IMotMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, IMotMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using IDcMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, IDcMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using NMotMaxKmhChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, NMotMaxKmhAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using NMotMaxRpmChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, NMotMaxRpmAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using FieldWeakMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, FieldWeakMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using PhaseAdvMaxChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, PhaseAdvMaxAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -80,7 +80,7 @@ LimitsSettingsMenu::LimitsSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string LimitsSettingsMenu::text() const +std::string LimitsSettingsMenu::title() const { return TEXT_LIMITSSETTINGS; } diff --git a/main/displays/menus/limitssettingsmenu.h b/main/displays/menus/limitssettingsmenu.h index 998cfee..94e5932 100644 --- a/main/displays/menus/limitssettingsmenu.h +++ b/main/displays/menus/limitssettingsmenu.h @@ -8,7 +8,7 @@ class LimitsSettingsMenu : public BobbyMenuDisplay public: LimitsSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/lockscreensettingsmenu.cpp b/main/displays/menus/lockscreensettingsmenu.cpp index 0c3ef9d..5495218 100644 --- a/main/displays/menus/lockscreensettingsmenu.cpp +++ b/main/displays/menus/lockscreensettingsmenu.cpp @@ -26,7 +26,7 @@ constexpr char TEXT_BACK[] = "Back"; using LockscreenPinDigit0ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LockscreenPinDigitAccessor<0>, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -34,7 +34,7 @@ using LockscreenPinDigit0ChangeScreen = espgui::makeComponent< using LockscreenPinDigit1ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LockscreenPinDigitAccessor<1>, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -42,7 +42,7 @@ using LockscreenPinDigit1ChangeScreen = espgui::makeComponent< using LockscreenPinDigit2ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LockscreenPinDigitAccessor<2>, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -50,7 +50,7 @@ using LockscreenPinDigit2ChangeScreen = espgui::makeComponent< using LockscreenPinDigit3ChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, LockscreenPinDigitAccessor<3>, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -69,7 +69,7 @@ LockscreenSettingsMenu::LockscreenSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string LockscreenSettingsMenu::text() const +std::string LockscreenSettingsMenu::title() const { return TEXT_LOCKSCREENSETTINGS; } diff --git a/main/displays/menus/lockscreensettingsmenu.h b/main/displays/menus/lockscreensettingsmenu.h index f5054b9..baa662c 100644 --- a/main/displays/menus/lockscreensettingsmenu.h +++ b/main/displays/menus/lockscreensettingsmenu.h @@ -8,7 +8,7 @@ class LockscreenSettingsMenu : public BobbyMenuDisplay public: LockscreenSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/manageprofilesmenu.cpp b/main/displays/menus/manageprofilesmenu.cpp index 74a1f25..3cd901d 100644 --- a/main/displays/menus/manageprofilesmenu.cpp +++ b/main/displays/menus/manageprofilesmenu.cpp @@ -252,7 +252,7 @@ void ManageProfilesMenu::stop() } } -std::string ManageProfilesMenu::text() const +std::string ManageProfilesMenu::title() const { return TEXT_MANAGEPROFILESMENU; } diff --git a/main/displays/menus/manageprofilesmenu.h b/main/displays/menus/manageprofilesmenu.h index fc50511..6fc9161 100644 --- a/main/displays/menus/manageprofilesmenu.h +++ b/main/displays/menus/manageprofilesmenu.h @@ -24,7 +24,7 @@ public: void start() override; void stop() override; - std::string text() const override; + std::string title() const override; std::string action_text() const; void lock(); void unlock(); diff --git a/main/displays/menus/mickmodesettingsmenu.cpp b/main/displays/menus/mickmodesettingsmenu.cpp index 17f7a02..e77c6df 100644 --- a/main/displays/menus/mickmodesettingsmenu.cpp +++ b/main/displays/menus/mickmodesettingsmenu.cpp @@ -20,14 +20,14 @@ constexpr char TEXT_BACK[] = "Back"; using MickModeModelModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, MickModeModelModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface >; using MickModeSmoothingChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, MickModeSmoothingAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/modessettingsmenu.cpp b/main/displays/menus/modessettingsmenu.cpp index 5ec2f39..74677cd 100644 --- a/main/displays/menus/modessettingsmenu.cpp +++ b/main/displays/menus/modessettingsmenu.cpp @@ -35,7 +35,7 @@ ModesSettingsMenu::ModesSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string ModesSettingsMenu::text() const +std::string ModesSettingsMenu::title() const { return TEXT_MODESSETTINGS; } diff --git a/main/displays/menus/modessettingsmenu.h b/main/displays/menus/modessettingsmenu.h index fdf0e60..cb14560 100644 --- a/main/displays/menus/modessettingsmenu.h +++ b/main/displays/menus/modessettingsmenu.h @@ -8,7 +8,7 @@ class ModesSettingsMenu : public BobbyMenuDisplay public: ModesSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/mosfetsmenu.cpp b/main/displays/menus/mosfetsmenu.cpp index d7fd96c..24523f7 100644 --- a/main/displays/menus/mosfetsmenu.cpp +++ b/main/displays/menus/mosfetsmenu.cpp @@ -42,7 +42,7 @@ MosfetsMenu::MosfetsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string MosfetsMenu::text() const +std::string MosfetsMenu::title() const { return TEXT_MOSFETS; } diff --git a/main/displays/menus/mosfetsmenu.h b/main/displays/menus/mosfetsmenu.h index 7ecb488..22a4795 100644 --- a/main/displays/menus/mosfetsmenu.h +++ b/main/displays/menus/mosfetsmenu.h @@ -10,7 +10,7 @@ class MosfetsMenu : public BobbyMenuDisplay public: MosfetsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/motorfeedbackdebugmenu.h b/main/displays/menus/motorfeedbackdebugmenu.h index 9b67f35..81c0eb5 100644 --- a/main/displays/menus/motorfeedbackdebugmenu.h +++ b/main/displays/menus/motorfeedbackdebugmenu.h @@ -9,6 +9,7 @@ #include "icons/back.h" #include "debugtexthelpers.h" #include "debugcolorhelpers.h" +#include template class ColorInterface> class MotorFeedbackDebugMenu : @@ -21,22 +22,22 @@ public: { using namespace espgui; - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - //constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); - constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + //constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); + constructMenuItem, DummyAction>>(); constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } diff --git a/main/displays/menus/motortestmodesettingsmenu.cpp b/main/displays/menus/motortestmodesettingsmenu.cpp index d2a3ae7..2608e9c 100644 --- a/main/displays/menus/motortestmodesettingsmenu.cpp +++ b/main/displays/menus/motortestmodesettingsmenu.cpp @@ -20,7 +20,7 @@ constexpr char TEXT_BACK[] = "Back"; using MotortestMultiplikatorChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, MotortestModeMultiplikatorAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -28,7 +28,7 @@ using MotortestMultiplikatorChangeDisplay = espgui::makeComponent< using MotortestMaxPwmChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, MotortestMaxPwmAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/networksettingsmenu.cpp b/main/displays/menus/networksettingsmenu.cpp index 84124b2..b36af52 100644 --- a/main/displays/menus/networksettingsmenu.cpp +++ b/main/displays/menus/networksettingsmenu.cpp @@ -40,7 +40,7 @@ NetworkSettingsMenu::NetworkSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string NetworkSettingsMenu::text() const +std::string NetworkSettingsMenu::title() const { return "Network settings"; } diff --git a/main/displays/menus/networksettingsmenu.h b/main/displays/menus/networksettingsmenu.h index a7c9c4d..2681c53 100644 --- a/main/displays/menus/networksettingsmenu.h +++ b/main/displays/menus/networksettingsmenu.h @@ -8,7 +8,7 @@ class NetworkSettingsMenu : public BobbyMenuDisplay public: NetworkSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/otamenu.cpp b/main/displays/menus/otamenu.cpp index cdd5088..1174f47 100644 --- a/main/displays/menus/otamenu.cpp +++ b/main/displays/menus/otamenu.cpp @@ -34,7 +34,7 @@ OtaMenu::OtaMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string OtaMenu::text() const +std::string OtaMenu::title() const { return TEXT_UPDATE; } diff --git a/main/displays/menus/otamenu.h b/main/displays/menus/otamenu.h index 63ed7bc..b5ac1f0 100644 --- a/main/displays/menus/otamenu.h +++ b/main/displays/menus/otamenu.h @@ -8,7 +8,7 @@ class OtaMenu : public BobbyMenuDisplay public: OtaMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/profilesmenu.cpp b/main/displays/menus/profilesmenu.cpp index 08f58f5..2159c3f 100644 --- a/main/displays/menus/profilesmenu.cpp +++ b/main/displays/menus/profilesmenu.cpp @@ -24,7 +24,7 @@ ProfilesMenu::ProfilesMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string ProfilesMenu::text() const +std::string ProfilesMenu::title() const { return TEXT_PROFILES; } diff --git a/main/displays/menus/profilesmenu.h b/main/displays/menus/profilesmenu.h index fb2cd87..860c962 100644 --- a/main/displays/menus/profilesmenu.h +++ b/main/displays/menus/profilesmenu.h @@ -8,7 +8,7 @@ class ProfilesMenu : public BobbyMenuDisplay public: ProfilesMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/recoverymenu.cpp b/main/displays/menus/recoverymenu.cpp index fc621cf..d3f11e7 100644 --- a/main/displays/menus/recoverymenu.cpp +++ b/main/displays/menus/recoverymenu.cpp @@ -54,7 +54,7 @@ RecoveryMenu::RecoveryMenu() constructMenuItem, RebootAction, StaticMenuItemIcon<&bobbyicons::reboot>>>(); } -std::string RecoveryMenu::text() const +std::string RecoveryMenu::title() const { return "Recovery Menu"; } diff --git a/main/displays/menus/recoverymenu.h b/main/displays/menus/recoverymenu.h index 16cc3d1..c7e43ad 100644 --- a/main/displays/menus/recoverymenu.h +++ b/main/displays/menus/recoverymenu.h @@ -9,7 +9,7 @@ class RecoveryMenu : public BobbyMenuDisplay public: RecoveryMenu(); - std::string text() const override; + std::string title() const override; void back() override {} diff --git a/main/displays/menus/remotecontrolmodesettingsmenu.cpp b/main/displays/menus/remotecontrolmodesettingsmenu.cpp index 886686e..1979a1e 100644 --- a/main/displays/menus/remotecontrolmodesettingsmenu.cpp +++ b/main/displays/menus/remotecontrolmodesettingsmenu.cpp @@ -19,7 +19,7 @@ namespace { using RemoteControlModeModelModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, RemoteControlModeModelModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/selectbuildserverbranch.cpp b/main/displays/menus/selectbuildserverbranch.cpp index 88d0ae0..5aa9761 100644 --- a/main/displays/menus/selectbuildserverbranch.cpp +++ b/main/displays/menus/selectbuildserverbranch.cpp @@ -113,7 +113,7 @@ SelectBuildserverBranchMenu::SelectBuildserverBranchMenu() SelectBranch::start_descriptor_request(configs.otaServerUrl.value()); } -std::string SelectBuildserverBranchMenu::text() const +std::string SelectBuildserverBranchMenu::title() const { return TEXT_SELECT_BRANCH; } diff --git a/main/displays/menus/selectbuildserverbranch.h b/main/displays/menus/selectbuildserverbranch.h index 65f5eda..b98c423 100644 --- a/main/displays/menus/selectbuildserverbranch.h +++ b/main/displays/menus/selectbuildserverbranch.h @@ -9,7 +9,7 @@ class SelectBuildserverBranchMenu : public BobbyMenuDisplay public: SelectBuildserverBranchMenu(); - std::string text() const override; + std::string title() const override; void update() override; void back() override; diff --git a/main/displays/menus/selectbuildservermenu.cpp b/main/displays/menus/selectbuildservermenu.cpp index 15bd240..df2188c 100644 --- a/main/displays/menus/selectbuildservermenu.cpp +++ b/main/displays/menus/selectbuildservermenu.cpp @@ -71,7 +71,7 @@ SelectBuildServerMenu::SelectBuildServerMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string SelectBuildServerMenu::text() const +std::string SelectBuildServerMenu::title() const { return TEXT_SELECTBUILDSERVERMENU; } diff --git a/main/displays/menus/selectbuildservermenu.h b/main/displays/menus/selectbuildservermenu.h index 7a3b26e..4cb9f87 100644 --- a/main/displays/menus/selectbuildservermenu.h +++ b/main/displays/menus/selectbuildservermenu.h @@ -10,7 +10,7 @@ class SelectBuildServerMenu : public BobbyMenuDisplay public: SelectBuildServerMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/selectmodemenu.cpp b/main/displays/menus/selectmodemenu.cpp index 8c90ca4..dbe1ae3 100644 --- a/main/displays/menus/selectmodemenu.cpp +++ b/main/displays/menus/selectmodemenu.cpp @@ -76,7 +76,7 @@ SelectModeMenu::SelectModeMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string SelectModeMenu::text() const +std::string SelectModeMenu::title() const { return TEXT_SELECTMODE; } diff --git a/main/displays/menus/selectmodemenu.h b/main/displays/menus/selectmodemenu.h index 73d6c50..5b988b0 100644 --- a/main/displays/menus/selectmodemenu.h +++ b/main/displays/menus/selectmodemenu.h @@ -10,7 +10,7 @@ class SelectModeMenu : public BobbyMenuDisplay public: SelectModeMenu(); - std::string text() const override; + std::string title() const override; void start() override; void back() override; diff --git a/main/displays/menus/selectotabuildmenu.cpp b/main/displays/menus/selectotabuildmenu.cpp index e940724..9903cf6 100644 --- a/main/displays/menus/selectotabuildmenu.cpp +++ b/main/displays/menus/selectotabuildmenu.cpp @@ -99,7 +99,7 @@ SelectBuildMenu::SelectBuildMenu() } } -std::string SelectBuildMenu::text() const +std::string SelectBuildMenu::title() const { return TEXT_SELECTBUILD; } diff --git a/main/displays/menus/selectotabuildmenu.h b/main/displays/menus/selectotabuildmenu.h index efb434a..8df6d14 100644 --- a/main/displays/menus/selectotabuildmenu.h +++ b/main/displays/menus/selectotabuildmenu.h @@ -10,7 +10,7 @@ class SelectBuildMenu : public BobbyMenuDisplay public: SelectBuildMenu(); - std::string text() const override; + std::string title() const override; void update() override; void back() override; diff --git a/main/displays/menus/settingsmenu.cpp b/main/displays/menus/settingsmenu.cpp index b26e076..592b4f2 100644 --- a/main/displays/menus/settingsmenu.cpp +++ b/main/displays/menus/settingsmenu.cpp @@ -78,7 +78,7 @@ struct BackLedAccessor : public espgui::RefAccessor { bool &getRef() const using AnhaengerIdChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, AnhaengerIdAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -86,7 +86,7 @@ using AnhaengerIdChangeScreen = espgui::makeComponent< using UsernameChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, UsernameAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -139,7 +139,7 @@ SettingsMenu::SettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string SettingsMenu::text() const +std::string SettingsMenu::title() const { return TEXT_SETTINGS; } diff --git a/main/displays/menus/settingsmenu.h b/main/displays/menus/settingsmenu.h index 436efce..d0511ea 100644 --- a/main/displays/menus/settingsmenu.h +++ b/main/displays/menus/settingsmenu.h @@ -8,7 +8,7 @@ class SettingsMenu : public bobbygui::MenuDisplayWithTime public: SettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/setupquickactionsmenu.cpp b/main/displays/menus/setupquickactionsmenu.cpp index ebf0e2f..562cde0 100644 --- a/main/displays/menus/setupquickactionsmenu.cpp +++ b/main/displays/menus/setupquickactionsmenu.cpp @@ -27,7 +27,7 @@ constexpr char TEXT_BACK[] = "Back"; template using QuickActionChangeValueDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, Accessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -49,7 +49,7 @@ SetupQuickActionsMenu::SetupQuickActionsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string SetupQuickActionsMenu::text() const +std::string SetupQuickActionsMenu::title() const { return TEXT_SETUPQUICKACTIONS; } diff --git a/main/displays/menus/setupquickactionsmenu.h b/main/displays/menus/setupquickactionsmenu.h index 6f12331..838dd67 100644 --- a/main/displays/menus/setupquickactionsmenu.h +++ b/main/displays/menus/setupquickactionsmenu.h @@ -8,7 +8,7 @@ class SetupQuickActionsMenu : public BobbyMenuDisplay public: SetupQuickActionsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/statisticsmenu.cpp b/main/displays/menus/statisticsmenu.cpp index f7f651d..2aa7435 100644 --- a/main/displays/menus/statisticsmenu.cpp +++ b/main/displays/menus/statisticsmenu.cpp @@ -189,7 +189,7 @@ StatisticsMenu::StatisticsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string StatisticsMenu::text() const +std::string StatisticsMenu::title() const { return TEXT_STATISTICSMENU; } diff --git a/main/displays/menus/statisticsmenu.h b/main/displays/menus/statisticsmenu.h index fd5b59d..402949f 100644 --- a/main/displays/menus/statisticsmenu.h +++ b/main/displays/menus/statisticsmenu.h @@ -8,7 +8,7 @@ class StatisticsMenu : public bobbygui::MenuDisplayWithTime public: StatisticsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/taskmanagermenu.cpp b/main/displays/menus/taskmanagermenu.cpp index 9680365..9196a7f 100644 --- a/main/displays/menus/taskmanagermenu.cpp +++ b/main/displays/menus/taskmanagermenu.cpp @@ -40,7 +40,7 @@ TaskmanagerMenu::TaskmanagerMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string TaskmanagerMenu::text() const +std::string TaskmanagerMenu::title() const { return TEXT_TASKMANAGER; } diff --git a/main/displays/menus/taskmanagermenu.h b/main/displays/menus/taskmanagermenu.h index 59facf4..c55bbb7 100644 --- a/main/displays/menus/taskmanagermenu.h +++ b/main/displays/menus/taskmanagermenu.h @@ -8,7 +8,7 @@ class TaskmanagerMenu : public BobbyMenuDisplay public: TaskmanagerMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/tempomatmodesettingsmenu.cpp b/main/displays/menus/tempomatmodesettingsmenu.cpp index 1dc4d91..e704bd3 100644 --- a/main/displays/menus/tempomatmodesettingsmenu.cpp +++ b/main/displays/menus/tempomatmodesettingsmenu.cpp @@ -25,7 +25,7 @@ constexpr char TEXT_BACK[] = "Back"; using TempomatModeCruiseMotTgtChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TempomatModeCruiseMotTgtAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -33,7 +33,7 @@ using TempomatModeCruiseMotTgtChangeDisplay = espgui::makeComponent< using TempomatModeModelModeChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TempomatModeModelModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface diff --git a/main/displays/menus/timersmenu.cpp b/main/displays/menus/timersmenu.cpp index fa67fa0..f1fa8f5 100644 --- a/main/displays/menus/timersmenu.cpp +++ b/main/displays/menus/timersmenu.cpp @@ -18,7 +18,7 @@ constexpr char TEXT_BACK[] = "Back"; using StatsUpdateRateChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, StatsUpdateRateAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -32,7 +32,7 @@ TimersMenu::TimersMenu() constructMenuItem, espgui::PushScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string TimersMenu::text() const +std::string TimersMenu::title() const { return TEXT_TIMERS; } diff --git a/main/displays/menus/timersmenu.h b/main/displays/menus/timersmenu.h index f3a08e0..2240c85 100644 --- a/main/displays/menus/timersmenu.h +++ b/main/displays/menus/timersmenu.h @@ -8,7 +8,7 @@ class TimersMenu : public BobbyMenuDisplay public: TimersMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/timesettingsmenu.cpp b/main/displays/menus/timesettingsmenu.cpp index 521b865..c397390 100644 --- a/main/displays/menus/timesettingsmenu.cpp +++ b/main/displays/menus/timesettingsmenu.cpp @@ -70,7 +70,7 @@ public: using TimezoneOffsetChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TimezoneOffsetAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -78,7 +78,7 @@ using TimezoneOffsetChangeDisplay = espgui::makeComponent< using DaylightSavingModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, DaylightSavingModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -86,7 +86,7 @@ using DaylightSavingModeChangeDisplay = espgui::makeComponent< using TimeServerChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TimeServerAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -94,7 +94,7 @@ using TimeServerChangeDisplay = espgui::makeComponent< using TimeSyncModeChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TimeSyncModeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -102,7 +102,7 @@ using TimeSyncModeChangeDisplay = espgui::makeComponent< using TimeSyncIntervalChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, TimeSyncIntervalAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -137,7 +137,7 @@ TimeSettingsMenu::TimeSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string TimeSettingsMenu::text() const +std::string TimeSettingsMenu::title() const { return TEXT_TIME; } diff --git a/main/displays/menus/timesettingsmenu.h b/main/displays/menus/timesettingsmenu.h index 764825f..22c1989 100644 --- a/main/displays/menus/timesettingsmenu.h +++ b/main/displays/menus/timesettingsmenu.h @@ -8,7 +8,7 @@ class TimeSettingsMenu : public bobbygui::MenuDisplayWithTime public: TimeSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/udpcloudsettingsmenu.cpp b/main/displays/menus/udpcloudsettingsmenu.cpp index ca3373b..aeb277d 100644 --- a/main/displays/menus/udpcloudsettingsmenu.cpp +++ b/main/displays/menus/udpcloudsettingsmenu.cpp @@ -23,7 +23,7 @@ constexpr char TEXT_BACK[] = "Back"; using UdpCloudSendRateChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, UdpCloudSendIntervalAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -31,7 +31,7 @@ using UdpCloudSendRateChangeDisplay = espgui::makeComponent< using UdpCloudHostChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, UdpCloudHostAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -39,7 +39,7 @@ using UdpCloudHostChangeDisplay = espgui::makeComponent< using UdpCloudPortChangeDisplay = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, UdpCloudPortAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -57,7 +57,7 @@ UdpCloudSettingsMenu::UdpCloudSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -std::string UdpCloudSettingsMenu::text() const +std::string UdpCloudSettingsMenu::title() const { return TEXT_UDPCLOUDSETTINGS; } diff --git a/main/displays/menus/udpcloudsettingsmenu.h b/main/displays/menus/udpcloudsettingsmenu.h index 9719e0a..a3cec75 100644 --- a/main/displays/menus/udpcloudsettingsmenu.h +++ b/main/displays/menus/udpcloudsettingsmenu.h @@ -8,7 +8,7 @@ class UdpCloudSettingsMenu : public BobbyMenuDisplay public: UdpCloudSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/wifiapsettingsmenu.cpp b/main/displays/menus/wifiapsettingsmenu.cpp index 28ac7bd..69bba62 100644 --- a/main/displays/menus/wifiapsettingsmenu.cpp +++ b/main/displays/menus/wifiapsettingsmenu.cpp @@ -56,7 +56,7 @@ public: using ApSsidChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApSsidAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -64,7 +64,7 @@ using ApSsidChangeScreen = espgui::makeComponent< using ApKeyChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApKeyAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -72,7 +72,7 @@ using ApKeyChangeScreen = espgui::makeComponent< using ApIpChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApIpAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -80,7 +80,7 @@ using ApIpChangeScreen = espgui::makeComponent< using ApMaskChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApMaskAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -88,7 +88,7 @@ using ApMaskChangeScreen = espgui::makeComponent< using ApChannelChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApChannelAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -96,7 +96,7 @@ using ApChannelChangeScreen = espgui::makeComponent< using ApAuthmodeChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiApAuthmodeAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -120,7 +120,7 @@ WifiApSettingsMenu::WifiApSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiApSettingsMenu::text() const +std::string WifiApSettingsMenu::title() const { return "AP Settings"; } diff --git a/main/displays/menus/wifiapsettingsmenu.h b/main/displays/menus/wifiapsettingsmenu.h index 813419b..d83703d 100644 --- a/main/displays/menus/wifiapsettingsmenu.h +++ b/main/displays/menus/wifiapsettingsmenu.h @@ -8,6 +8,6 @@ class WifiApSettingsMenu : public BobbyMenuDisplay public: WifiApSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/wifistaconfigentrymenu.cpp b/main/displays/menus/wifistaconfigentrymenu.cpp index ad2af3c..46969db 100644 --- a/main/displays/menus/wifistaconfigentrymenu.cpp +++ b/main/displays/menus/wifistaconfigentrymenu.cpp @@ -127,7 +127,7 @@ WifiStaConfigEntryMenu::WifiStaConfigEntryMenu(int index) : constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiStaConfigEntryMenu::text() const +std::string WifiStaConfigEntryMenu::title() const { return fmt::format("Wifi Config {}", m_index + 1); } diff --git a/main/displays/menus/wifistaconfigentrymenu.h b/main/displays/menus/wifistaconfigentrymenu.h index c926654..9d42c6f 100644 --- a/main/displays/menus/wifistaconfigentrymenu.h +++ b/main/displays/menus/wifistaconfigentrymenu.h @@ -8,7 +8,7 @@ class WifiStaConfigEntryMenu : public BobbyMenuDisplay public: WifiStaConfigEntryMenu(int index); - std::string text() const override; + std::string title() const override; void back() override; private: diff --git a/main/displays/menus/wifistaconfigsmenu.cpp b/main/displays/menus/wifistaconfigsmenu.cpp index b8388c6..184ad8d 100644 --- a/main/displays/menus/wifistaconfigsmenu.cpp +++ b/main/displays/menus/wifistaconfigsmenu.cpp @@ -41,7 +41,7 @@ WifiStaConfigsMenu::WifiStaConfigsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiStaConfigsMenu::text() const +std::string WifiStaConfigsMenu::title() const { return "Configurations"; } diff --git a/main/displays/menus/wifistaconfigsmenu.h b/main/displays/menus/wifistaconfigsmenu.h index 97650f6..ca984ab 100644 --- a/main/displays/menus/wifistaconfigsmenu.h +++ b/main/displays/menus/wifistaconfigsmenu.h @@ -8,6 +8,6 @@ class WifiStaConfigsMenu : public BobbyMenuDisplay public: WifiStaConfigsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/menus/wifistascanentrymenu.cpp b/main/displays/menus/wifistascanentrymenu.cpp index fa09783..47382e6 100644 --- a/main/displays/menus/wifistascanentrymenu.cpp +++ b/main/displays/menus/wifistascanentrymenu.cpp @@ -101,7 +101,7 @@ WifiStaScanEntryMenu::WifiStaScanEntryMenu(const wifi_ap_record_t &info) : constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiStaScanEntryMenu::text() const +std::string WifiStaScanEntryMenu::title() const { return fmt::format("Scan entry {}", richTextEscape(std::string_view{reinterpret_cast(m_info.ssid)})); } diff --git a/main/displays/menus/wifistascanentrymenu.h b/main/displays/menus/wifistascanentrymenu.h index b1175ab..f5fc327 100644 --- a/main/displays/menus/wifistascanentrymenu.h +++ b/main/displays/menus/wifistascanentrymenu.h @@ -11,7 +11,7 @@ class WifiStaScanEntryMenu : public BobbyMenuDisplay public: WifiStaScanEntryMenu(const wifi_ap_record_t &info); - std::string text() const override; + std::string title() const override; void back() override; private: diff --git a/main/displays/menus/wifistascanmenu.cpp b/main/displays/menus/wifistascanmenu.cpp index 4265ec2..ed5d305 100644 --- a/main/displays/menus/wifistascanmenu.cpp +++ b/main/displays/menus/wifistascanmenu.cpp @@ -53,7 +53,7 @@ WifiStaScanMenu::WifiStaScanMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiStaScanMenu::text() const +std::string WifiStaScanMenu::title() const { const auto scanStatus = wifi_stack::get_scan_status(); auto text = fmt::format("Scan {}{}", diff --git a/main/displays/menus/wifistascanmenu.h b/main/displays/menus/wifistascanmenu.h index e3fdd7d..67f4913 100644 --- a/main/displays/menus/wifistascanmenu.h +++ b/main/displays/menus/wifistascanmenu.h @@ -10,7 +10,7 @@ class WifiStaScanMenu : public BobbyMenuDisplay public: WifiStaScanMenu(); - std::string text() const override; + std::string title() const override; void back() override; void start() override; diff --git a/main/displays/menus/wifistasettingsmenu.cpp b/main/displays/menus/wifistasettingsmenu.cpp index d2aa16e..0863dbb 100644 --- a/main/displays/menus/wifistasettingsmenu.cpp +++ b/main/displays/menus/wifistasettingsmenu.cpp @@ -29,7 +29,7 @@ constexpr char TEXT_BACK[] = "Back"; using StaMinRssiChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, WifiStaMinRssiAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -59,7 +59,7 @@ WifiStaSettingsMenu::WifiStaSettingsMenu() constructMenuItem, PopScreenAction, StaticMenuItemIcon<&icons::back>>>(); } -std::string WifiStaSettingsMenu::text() const +std::string WifiStaSettingsMenu::title() const { return "Sta Settings"; } diff --git a/main/displays/menus/wifistasettingsmenu.h b/main/displays/menus/wifistasettingsmenu.h index dc7feae..773fa68 100644 --- a/main/displays/menus/wifistasettingsmenu.h +++ b/main/displays/menus/wifistasettingsmenu.h @@ -8,6 +8,6 @@ class WifiStaSettingsMenu : public BobbyMenuDisplay public: WifiStaSettingsMenu(); - std::string text() const override; + std::string title() const override; void back() override; }; diff --git a/main/displays/potiscalibratedisplay.h b/main/displays/potiscalibratedisplay.h index 22ca598..12815d7 100644 --- a/main/displays/potiscalibratedisplay.h +++ b/main/displays/potiscalibratedisplay.h @@ -25,7 +25,7 @@ public: PotisCalibrateDisplay() = default; explicit PotisCalibrateDisplay(bool bootup) : m_bootup{bootup} {} - std::string text() const override; + std::string title() const override; void start() override; void initScreen(espgui::TftInterface &tft) override; void update() override; diff --git a/main/displays/setup/ask_calibrate_other_buttons.cpp b/main/displays/setup/ask_calibrate_other_buttons.cpp index 159a763..2893eb6 100644 --- a/main/displays/setup/ask_calibrate_other_buttons.cpp +++ b/main/displays/setup/ask_calibrate_other_buttons.cpp @@ -50,7 +50,7 @@ void SetupAskCalibrateOtherButtonsDisplay::buttonPressed(espgui::Button button) Base::buttonPressed(button); } -std::string SetupAskCalibrateOtherButtonsDisplay::text() const +std::string SetupAskCalibrateOtherButtonsDisplay::title() const { return "Other Buttons"; } diff --git a/main/displays/setup/ask_calibrate_other_buttons.h b/main/displays/setup/ask_calibrate_other_buttons.h index 95d6089..81c6641 100644 --- a/main/displays/setup/ask_calibrate_other_buttons.h +++ b/main/displays/setup/ask_calibrate_other_buttons.h @@ -12,7 +12,7 @@ public: void buttonPressed(espgui::Button button) override; - [[nodiscard]] std::string text() const override; + [[nodiscard]] std::string title() const override; private: bool m_next_screen{false}; }; diff --git a/main/displays/setup/ask_setup_clouds.cpp b/main/displays/setup/ask_setup_clouds.cpp index 6cffc6e..c465a28 100644 --- a/main/displays/setup/ask_setup_clouds.cpp +++ b/main/displays/setup/ask_setup_clouds.cpp @@ -47,7 +47,7 @@ void SetupAskSetupCloudsDisplay::buttonPressed(espgui::Button button) Base::buttonPressed(button); } -std::string SetupAskSetupCloudsDisplay::text() const +std::string SetupAskSetupCloudsDisplay::title() const { return "Cloud Setup"; } diff --git a/main/displays/setup/ask_setup_clouds.h b/main/displays/setup/ask_setup_clouds.h index 995ac6c..04d8001 100644 --- a/main/displays/setup/ask_setup_clouds.h +++ b/main/displays/setup/ask_setup_clouds.h @@ -12,5 +12,5 @@ public: void buttonPressed(espgui::Button button) override; - [[nodiscard]] std::string text() const override; + [[nodiscard]] std::string title() const override; }; diff --git a/main/displays/setup/final_information.cpp b/main/displays/setup/final_information.cpp index 88289e9..d5290ea 100644 --- a/main/displays/setup/final_information.cpp +++ b/main/displays/setup/final_information.cpp @@ -52,7 +52,7 @@ void SetupFinalInformationDisplay::buttonPressed(espgui::Button button) Base::buttonPressed(button); } -std::string SetupFinalInformationDisplay::text() const +std::string SetupFinalInformationDisplay::title() const { return "All done!"; } diff --git a/main/displays/setup/final_information.h b/main/displays/setup/final_information.h index be03744..e7057e4 100644 --- a/main/displays/setup/final_information.h +++ b/main/displays/setup/final_information.h @@ -16,5 +16,5 @@ public: void buttonPressed(espgui::Button button) override; - [[nodiscard]] std::string text() const override; + [[nodiscard]] std::string title() const override; }; diff --git a/main/displays/setup/information.cpp b/main/displays/setup/information.cpp index a564263..d082c27 100644 --- a/main/displays/setup/information.cpp +++ b/main/displays/setup/information.cpp @@ -57,7 +57,7 @@ void SetupInformationDisplay::buttonPressed(espgui::Button button) } } -[[nodiscard]] std::string SetupInformationDisplay::text() const +[[nodiscard]] std::string SetupInformationDisplay::title() const { return "First Steps"; } diff --git a/main/displays/setup/information.h b/main/displays/setup/information.h index 2227b2e..623faf0 100644 --- a/main/displays/setup/information.h +++ b/main/displays/setup/information.h @@ -18,7 +18,7 @@ public: void buttonPressed(espgui::Button button) override; - [[nodiscard]] std::string text() const override; + [[nodiscard]] std::string title() const override; private: espchrono::millis_clock::time_point m_menu_opened_timestamp; espgui::ProgressBar m_init_text_progressbar{10, tft.height()/2, tft.width()-20, 30, 0, 100}; diff --git a/main/displays/setup/setup_cloud.cpp b/main/displays/setup/setup_cloud.cpp index e7885d3..92684ab 100644 --- a/main/displays/setup/setup_cloud.cpp +++ b/main/displays/setup/setup_cloud.cpp @@ -23,7 +23,7 @@ constexpr const char TEXT_DONE[] = "Done"; using CloudUsernameChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, UsernameAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -31,7 +31,7 @@ using CloudUsernameChangeScreen = espgui::makeComponent< using CloudURLChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudURLAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -39,7 +39,7 @@ using CloudURLChangeScreen = espgui::makeComponent< using CloudKeyChangeScreen = espgui::makeComponent< BobbyChangeValueDisplay, - espgui::StaticText, + espgui::StaticTitle, CloudKeyAccessor, espgui::ConfirmActionInterface, espgui::BackActionInterface @@ -96,7 +96,7 @@ void SetupCloudDisplay::stop() void SetupCloudDisplay::back() {} -std::string SetupCloudDisplay::text() const +std::string SetupCloudDisplay::title() const { return "WebSocket Cloud"; } diff --git a/main/displays/setup/setup_cloud.h b/main/displays/setup/setup_cloud.h index 3db4996..52dcb9e 100644 --- a/main/displays/setup/setup_cloud.h +++ b/main/displays/setup/setup_cloud.h @@ -14,7 +14,7 @@ public: void back() override; - [[nodiscard]] std::string text() const override; + [[nodiscard]] std::string title() const override; private: const bool m_early_return; }; diff --git a/main/displays/speedinfodisplay.h b/main/displays/speedinfodisplay.h index dd95028..40b090f 100644 --- a/main/displays/speedinfodisplay.h +++ b/main/displays/speedinfodisplay.h @@ -4,6 +4,7 @@ #include #include #include +#include // local includes #include "bobbydisplay.h" @@ -20,8 +21,8 @@ public: private: espgui::Label m_labelSpeed{5, 5}; - espgui::ReverseProgressBar m_dischargingBar{10, 110, tft.width()/2 - 10, 25, 0, 40, TFT_GREEN}; - espgui::ProgressBar m_chargingBar{tft.width()/2, 110, tft.width()/2 - 10, 25, 0, 40, TFT_RED}; + espgui::ReverseProgressBar m_dischargingBar{10, 110, tft.width()/2 - 10, 25, 0, 40, espgui::TFT_GREEN}; + espgui::ProgressBar m_chargingBar{tft.width()/2, 110, tft.width()/2 - 10, 25, 0, 40, espgui::TFT_RED}; #define START_Y 150 espgui::Label m_batteryPercentLabel{5, START_Y};