feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More refactorings

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-28 02:06:24 +01:00
parent 1a3fb0a0a9
commit 9ac12cec05
46 changed files with 430 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/CMakeLists.txt
View File

@ -53,6 +53,7 @@ set(headers
debugtexthelpers.h
displays/bmsdisplay.h
displays/bobbydisplay.h
displays/bobbydisplaywithtitle.h
displays/bobbychangevaluedisplay.h
displays/bobbymenudisplay.h
displays/calibratedisplay.h
@ -274,6 +275,7 @@ set(sources
debugtexthelpers.cpp
displays/bmsdisplay.cpp
displays/bobbydisplay.cpp
displays/bobbydisplaywithtitle.cpp
displays/bobbychangevaluedisplay.cpp
displays/bobbymenudisplay.cpp
displays/calibratedisplay.cpp

21
main/displays/bmsdisplay.cpp
View File

@ -11,6 +11,8 @@ using namespace espgui;
void BmsDisplay::initScreen()
{
Base::initScreen();
tft.fillScreen(TFT_BLACK);
tft.setTextColor(TFT_WHITE, TFT_BLACK);
@ -43,6 +45,8 @@ void BmsDisplay::initScreen()
void BmsDisplay::redraw()
{
Base::redraw();
if (bluetoothSerial.hasClient())
tft.setTextColor(TFT_GREEN, TFT_BLACK);
else
@ -90,16 +94,15 @@ void BmsDisplay::redraw()
m_cycleLabel.clear();
}
void BmsDisplay::rotate(int offset)
void BmsDisplay::buttonPressed(espgui::Button button)
{
if (offset < 0)
switchScreen<MetersDisplay>();
else if (offset > 0)
switchScreen<StatusDisplay>();
}
Base::buttonPressed(button);
void BmsDisplay::confirm()
{
switchScreen<MainMenu>();
switch (button)
{
case Button::Right: switchScreen<MainMenu>(); break;
case Button::Up: switchScreen<MetersDisplay>(); break;
case Button::Down: switchScreen<StatusDisplay>();
}
}
#endif

18
main/displays/bmsdisplay.h
View File

@ -3,24 +3,26 @@
#if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
// 3rdparty lib includes
#include <fmt/core.h>
#include <actions/switchscreenaction.h>
#include <widgets/label.h>
#include <screenmanager.h>
// local includes
#include "display.h"
#include "actions/switchscreenaction.h"
#include "globals.h"
#include "bmsutils.h"
#include "widgets/label.h"
#include "screenmanager.h"
#include "bobbydisplay.h"
class BmsDisplay :
public espgui::Display,
public espgui::DummyBack
public BobbyDisplay,
public espgui::DummyBack
{
using Base = BobbyDisplay;
public:
void initScreen() override;
void redraw() override;
void confirm() override;
void rotate(int offset) override;
void buttonPressed(espgui::Button button) override;
espgui::Label m_statusLabel{200, 0};

66
main/displays/bobbydisplaywithtitle.cpp Normal file
View File

@ -0,0 +1,66 @@
#include "bobbydisplaywithtitle.h"
void BobbyDisplayWithTitle::rawButtonPressed(uint8_t button)
{
Base::rawButtonPressed(button);
switch (button)
{
using espgui::Button;
case 0: buttonPressed(Button::Left); break;
case 1: buttonPressed(Button::Right); break;
case 2: buttonPressed(Button::Up); break;
case 3: buttonPressed(Button::Down); break;
case 4: buttonPressed(Button(BobbyButton::Profile0)); break;
case 5: buttonPressed(Button(BobbyButton::Profile1)); break;
case 6: buttonPressed(Button(BobbyButton::Profile2)); break;
case 7: buttonPressed(Button(BobbyButton::Profile3)); break;
case 8: buttonPressed(Button(BobbyButton::Left2)); break;
case 9: buttonPressed(Button(BobbyButton::Right2)); break;
case 10: buttonPressed(Button(BobbyButton::Up2)); break;
case 11: buttonPressed(Button(BobbyButton::Down2)); break;
}
}
void BobbyDisplayWithTitle::rawButtonReleased(uint8_t button)
{
Base::rawButtonReleased(button);
switch (button)
{
using espgui::Button;
case 0: buttonReleased(Button::Left); break;
case 1: buttonReleased(Button::Right); break;
case 2: buttonReleased(Button::Up); break;
case 3: buttonReleased(Button::Down); break;
case 4: buttonReleased(Button(BobbyButton::Profile0)); break;
case 5: buttonReleased(Button(BobbyButton::Profile1)); break;
case 6: buttonReleased(Button(BobbyButton::Profile2)); break;
case 7: buttonReleased(Button(BobbyButton::Profile3)); break;
case 8: buttonReleased(Button(BobbyButton::Left2)); break;
case 9: buttonReleased(Button(BobbyButton::Right2)); break;
case 10: buttonReleased(Button(BobbyButton::Up2)); break;
case 11: buttonReleased(Button(BobbyButton::Down2)); break;
}
}
void BobbyDisplayWithTitle::buttonPressed(espgui::Button button)
{
Base::buttonPressed(button);
switch (BobbyButton(button))
{
case BobbyButton::Profile0: /* TODO */ break;
case BobbyButton::Profile1: /* TODO */ break;
case BobbyButton::Profile2: /* TODO */ break;
case BobbyButton::Profile3: /* TODO */ break;
case BobbyButton::Left2: /* TODO */ break;
case BobbyButton::Right2: /* TODO */ break;
case BobbyButton::Up2: /* TODO */ break;
case BobbyButton::Down2: /* TODO */ break;
default:;
}
}
void BobbyDisplayWithTitle::buttonReleased(espgui::Button button)
{
Base::buttonReleased(button);
}

22
main/displays/bobbydisplaywithtitle.h Normal file
View File

@ -0,0 +1,22 @@
#pragma once
// system includes
#include <type_traits>
// 3rdparty lib includes
#include <displaywithtitle.h>
// local includes
#include "bobbydisplay.h"
class BobbyDisplayWithTitle : public espgui::DisplayWithTitle
{
using Base = espgui::DisplayWithTitle;
public:
void rawButtonPressed(uint8_t button) override;
void rawButtonReleased(uint8_t button) override;
void buttonPressed(espgui::Button button) override;
void buttonReleased(espgui::Button button) override;
};

164
main/displays/calibratedisplay.cpp
View File

@ -168,97 +168,107 @@ void CalibrateDisplay::stop()
}
}
void CalibrateDisplay::rotate(int offset)
void CalibrateDisplay::buttonPressed(espgui::Button button)
{
Base::rotate(offset);
Base::buttonPressed(button);
m_selectedButton += offset;
if (m_selectedButton < 0)
m_selectedButton = 1;
if (m_selectedButton > 1)
m_selectedButton = 0;
}
void CalibrateDisplay::confirm()
{
switch (m_selectedButton)
switch (button)
{
case 0: // left button pressed
if (!raw_gas || !raw_brems || !m_gas || !m_brems)
return;
using espgui::Button;
case Button::Up:
m_selectedButton--;
if (m_selectedButton < 0)
m_selectedButton = 1;
break;
case Button::Down:
m_selectedButton++;
if (m_selectedButton > 1)
m_selectedButton = 0;
break;
case Button::Left:
back:
switch (m_status)
{
case Status::Begin:
m_status = Status::GasMin;
break;
case Status::GasMin:
m_gasMin = *raw_gas;
m_status = Status::GasMax;
break;
case Status::GasMax:
m_gasMax = *raw_gas;
m_status = Status::BremsMin;
{
const auto dead = (m_gasMax - m_gasMin)/20;
m_gasMin += dead;
m_gasMax -= dead;
}
break;
case Status::BremsMin:
m_bremsMin = *raw_brems;
m_status = Status::BremsMax;
break;
case Status::BremsMax:
m_bremsMax = *raw_brems;
m_status = Status::Confirm;
{
const auto dead = (m_bremsMax - m_bremsMin)/20;
m_bremsMin += dead;
m_bremsMax -= dead;
}
break;
case Status::Confirm:
if (*m_gas > 100 || *m_brems > 100)
return;
copyToSettings();
saveSettings();
if (m_bootup)
espgui::switchScreen<StatusDisplay>();
else if (settings.lockscreen.keepLockedAfterReboot && settings.lockscreen.locked)
{
espgui::switchScreen<MainMenu>();
settings.lockscreen.locked = false;
saveSettings();
}
else
espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
break;
case Status::GasMin:
case Status::GasMax:
case Status::BremsMin:
case Status::BremsMax:
case Status::Confirm:
m_selectedButton = 0;
m_status = Status::Begin;
copyFromSettings();
}
break;
case 1: // right button pressed
back();
}
}
void CalibrateDisplay::back()
{
switch (m_status)
{
case Status::Begin:
if (m_bootup)
espgui::switchScreen<StatusDisplay>();
else if (settings.lockscreen.keepLockedAfterReboot && settings.lockscreen.locked)
{
espgui::switchScreen<MainMenu>();
settings.lockscreen.locked = false;
saveSettings();
}
else
espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
break;
case Status::GasMin:
case Status::GasMax:
case Status::BremsMin:
case Status::BremsMax:
case Status::Confirm:
m_selectedButton = 0;
m_status = Status::Begin;
copyFromSettings();
case Button::Right:
switch (m_selectedButton)
{
case 0: // left button pressed
if (!raw_gas || !raw_brems || !m_gas || !m_brems)
return;
switch (m_status)
{
case Status::Begin:
m_status = Status::GasMin;
break;
case Status::GasMin:
m_gasMin = *raw_gas;
m_status = Status::GasMax;
break;
case Status::GasMax:
m_gasMax = *raw_gas;
m_status = Status::BremsMin;
{
const auto dead = (m_gasMax - m_gasMin)/20;
m_gasMin += dead;
m_gasMax -= dead;
}
break;
case Status::BremsMin:
m_bremsMin = *raw_brems;
m_status = Status::BremsMax;
break;
case Status::BremsMax:
m_bremsMax = *raw_brems;
m_status = Status::Confirm;
{
const auto dead = (m_bremsMax - m_bremsMin)/20;
m_bremsMin += dead;
m_bremsMax -= dead;
}
break;
case Status::Confirm:
if (*m_gas > 100 || *m_brems > 100)
return;
copyToSettings();
saveSettings();
if (m_bootup)
espgui::switchScreen<StatusDisplay>();
else
espgui::switchScreen<BoardcomputerHardwareSettingsMenu>();
}
break;
case 1: // right button pressed
goto back;
}
break;
}
}

13
main/displays/calibratedisplay.h
View File

@ -7,24 +7,24 @@
// 3rdparty lib includes
#include <fmt/core.h>
#include <cpputils.h>
#include <displaywithtitle.h>
#include <actions/switchscreenaction.h>
#include <widgets/label.h>
#include <widgets/progressbar.h>
// local includes
#include "bobbydisplaywithtitle.h"
#include "globals.h"
#include "utils.h"
#include "texts.h"
#include "modes/ignoreinputmode.h"
class CalibrateDisplay : public espgui::DisplayWithTitle
class CalibrateDisplay : public BobbyDisplayWithTitle
{
using Base = espgui::DisplayWithTitle;
using Base = BobbyDisplayWithTitle;
public:
CalibrateDisplay() = default;
CalibrateDisplay(bool bootup);
explicit CalibrateDisplay(bool bootup);
std::string text() const override;
void start() override;
@ -33,10 +33,7 @@ public:
void redraw() override;
void stop() override;
void rotate(int offset) override;
void confirm() override;
void back() override;
void buttonPressed(espgui::Button button) override;
private:
void copyFromSettings();

16
main/displays/calibratevoltagedisplay.h
View File

@ -1,21 +1,23 @@
#pragma once
// 3rdparty lib includes
#include <menuitem.h>
#include <icons/back.h>
#include <actions/dummyaction.h>
#include <actions/switchscreenaction.h>
#include <widgets/label.h>
// Local includes
#include "menudisplay.h"
#include "bobbymenudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "icons/back.h"
#include "icons/settings.h"
#include "texts.h"
#include "actions/dummyaction.h"
#include "actions/switchscreenaction.h"
#include "battery.h"
#include "menus/batterymenu.h"
#include "widgets/label.h"
#include "globals.h"
class CalibrateVoltageDisplay :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BATTERY_CALIBRATE>
{
public:

25
main/displays/gameoflifedisplay.cpp
View File

@ -11,18 +11,24 @@
void GameOfLifeDisplay::start()
{
Base::start();
m_grid = std::make_unique<std::bitset<GRIDX*GRIDY>>();
m_newgrid = std::make_unique<std::bitset<GRIDX*GRIDY>>();
}
void GameOfLifeDisplay::initScreen()
{
Base::initScreen();
espgui::tft.setRotation(3);
espgui::tft.fillScreen(TFT_BLACK);
}
void GameOfLifeDisplay::redraw()
{
Base::redraw();
if (gen == 0)
{
espgui::tft.fillScreen(TFT_BLACK);
@ -40,19 +46,26 @@ void GameOfLifeDisplay::redraw()
void GameOfLifeDisplay::stop()
{
Base::stop();
espgui::tft.setRotation(0);
m_grid = nullptr;
m_newgrid = nullptr;
}
void GameOfLifeDisplay::confirm()
void GameOfLifeDisplay::buttonPressed(espgui::Button button)
{
espgui::switchScreen<DemosMenu>();
}
Base::buttonPressed(button);
void GameOfLifeDisplay::back()
{
espgui::switchScreen<DemosMenu>();
switch (button)
{
using espgui::Button;
case Button::Left:
case Button::Right:
espgui::switchScreen<DemosMenu>();
break;
default:;
}
}
void GameOfLifeDisplay::drawGrid()

9
main/displays/gameoflifedisplay.h
View File

@ -5,11 +5,11 @@
#include <memory>
// local includes
#include "display.h"
#include "bobbydisplay.h"
class GameOfLifeDisplay : public espgui::Display
class GameOfLifeDisplay : public BobbyDisplay
{
using Base = espgui::Display;
using Base = BobbyDisplay;
public:
void start() override;
@ -17,8 +17,7 @@ public:
void redraw() override;
void stop() override;
void confirm() override;
void back() override;
void buttonPressed(espgui::Button button);
private:

35
main/displays/garagedisplay.cpp
View File

@ -19,10 +19,13 @@
#ifdef FEATURE_GARAGE
void GarageDisplay::start()
{
Base::start();
}
void GarageDisplay::initScreen()
{
Base::initScreen();
espgui::tft.fillScreen(TFT_BLACK);
espgui::tft.setTextFont(4);
espgui::tft.setTextColor(TFT_YELLOW);
@ -38,22 +41,30 @@ void GarageDisplay::initScreen()
void GarageDisplay::redraw()
{
Base::redraw();
}
void GarageDisplay::confirm()
void GarageDisplay::buttonPressed(espgui::Button button)
{
#ifdef FEATURE_ESPNOW
if (const auto error = espnow::send_espnow_message(fmt::format("BOBBYOPEN:garage:{}", "TOKEN")); error != ESP_OK)
Base::buttonPressed(button);
switch (button)
{
ESP_LOGE("BOBBY", "send_espnow_message() failed with: %s", esp_err_to_name(error));
return;
using espgui::Button;
case Button::Left:
espgui::switchScreen<MainMenu>();
break;
case Button::Right:
#ifdef FEATURE_ESPNOW
if (const auto error = espnow::send_espnow_message(fmt::format("BOBBYOPEN:garage:{}", "TOKEN")); error != ESP_OK)
{
ESP_LOGE("BOBBY", "send_espnow_message() failed with: %s", esp_err_to_name(error));
return;
}
#endif
espgui::switchScreen<MainMenu>();
break;
default:;
}
espgui::switchScreen<MainMenu>();
#endif
}
void GarageDisplay::back()
{
espgui::switchScreen<MainMenu>();
}
#endif

10
main/displays/garagedisplay.h
View File

@ -1,17 +1,19 @@
#pragma once
// local includes
#include "display.h"
#include "bobbydisplay.h"
#ifdef FEATURE_GARAGE
class GarageDisplay : public espgui::Display
class GarageDisplay : public BobbyDisplay
{
using Base = BobbyDisplay;
public:
void start() override;
void initScreen() override;
void redraw() override;
void confirm() override;
void back() override;
void buttonPressed(espgui::Button button) override;
private:
};

108
main/displays/ledstripcolorsdisplay.cpp
View File

@ -23,6 +23,7 @@
#include "displays/menus/ledstripmenu.h"
#ifdef FEATURE_LEDSTRIP
namespace {
int8_t selected_side = 7;
int8_t selected_color;
bool state_select_color{false};
@ -49,25 +50,13 @@ const std::array<uint16_t, 8> tft_colors = {
TFT_BLUE,
TFT_MAGENTA
};
} // namespace
std::string LedstripColorsDisplay::text() const
{
return TEXT_LEDSTRIPCOLORMENU;
}
void LedstripColorsDisplay::back()
{
if(!state_select_color)
{
espgui::switchScreen<LedstripMenu>();
}
else
{
state_select_color = false;
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
}
}
void LedstripColorsDisplay::initScreen()
{
Base::initScreen();
@ -102,10 +91,42 @@ void LedstripColorsDisplay::redraw()
}
}
void LedstripColorsDisplay::rotate(int offset)
void LedstripColorsDisplay::buttonPressed(espgui::Button button)
{
if (offset < 0)
Base::buttonPressed(button);
switch (button)
{
using espgui::Button;
case Button::Left:
if(!state_select_color)
{
espgui::switchScreen<LedstripMenu>();
}
else
{
state_select_color = false;
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
}
break;
case Button::Right:
if(!state_select_color)
{
state_select_color = true;
drawColors();
}
else
{
ledstrip_custom_colors[selected_side] = Colors[selected_color];
// Uncomment to close select color menu on color select
/*
state_select_color = false;
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
*/
}
break;
case Button::Up:
if (state_select_color)
{
selected_color++;
@ -122,9 +143,21 @@ void LedstripColorsDisplay::rotate(int offset)
selected_side = 0;
}
}
}
else if (offset > 0)
{
/* TODO commander: move into redraw method */
if (state_select_color)
{
drawColors();
}
else
{
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
clearSides();
drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
}
break;
case Button::Down:
if (state_select_color)
{
selected_color--;
@ -141,35 +174,20 @@ void LedstripColorsDisplay::rotate(int offset)
selected_side = 7;
}
}
}
if (state_select_color)
{
drawColors();
}
else
{
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
clearSides();
drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
}
}
/* TODO commander: move into redraw method */
if (state_select_color)
{
drawColors();
}
else
{
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
clearSides();
drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
}
void LedstripColorsDisplay::confirm()
{
if(!state_select_color)
{
state_select_color = true;
drawColors();
}
else
{
ledstrip_custom_colors[selected_side] = Colors[selected_color];
// Uncomment to close select color menu on color select
/*
state_select_color = false;
espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
*/
break;
}
}

23
main/displays/ledstripcolorsdisplay.h
View File

@ -4,33 +4,32 @@
#include <array>
// 3rdparty lib includes
#include <displaywithtitle.h>
#include <FastLED.h>
// local includes
#include "bobbydisplaywithtitle.h"
#include "ledstrip.h"
#ifdef FEATURE_LEDSTRIP
extern int8_t selected_side;
extern int8_t selected_color;
extern bool state_select_color;
extern bool last_state;
//extern int8_t selected_side;
//extern int8_t selected_color;
//extern bool state_select_color;
//extern bool last_state;
extern const std::array<CRGB, 8> Colors;
//extern const std::array<CRGB, 8> Colors;
extern const std::array<uint16_t, 8> tft_colors;
//extern const std::array<uint16_t, 8> tft_colors;
class LedstripColorsDisplay : public espgui::DisplayWithTitle
class LedstripColorsDisplay : public BobbyDisplayWithTitle
{
using Base = espgui::DisplayWithTitle;
using Base = BobbyDisplayWithTitle;
public:
std::string text() const override;
void back() override;
void initScreen() override;
void redraw() override;
void rotate(int offset) override;
void confirm() override;
void buttonPressed(espgui::Button button) override;
void drawColors();
void drawSide(Bobbycar_Side side, unsigned int color);

6
main/displays/menus/aboutmenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include <menudisplay.h>
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class AboutMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_ABOUT>
{
public:

4
main/displays/menus/accesspointwifisettingsmenu.h
View File

@ -1,11 +1,11 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class AccessPointWifiSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_ACCESSPOINTWIFISETTINGS>
{
public:

4
main/displays/menus/batterydebugmenu.h
View File

@ -1,20 +1,20 @@
#pragma once
// 3rdparty lib includes
#include <menudisplay.h>
#include <menuitem.h>
#include <icons/back.h>
#include <actions/dummyaction.h>
#include <actions/switchscreenaction.h>
// Local includes
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "icons/settings.h"
#include "texts.h"
#include "battery.h"
class BatteryDebugMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BATTERYDEBUG>
{
public:

7
main/displays/menus/batterymenu.h
View File

@ -1,13 +1,13 @@
#pragma once
// 3rdparty lib includes
#include <menudisplay.h>
#include <menuitem.h>
#include <icons/back.h>
#include <actions/dummyaction.h>
#include <actions/switchscreenaction.h>
// Local includes
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "icons/settings.h"
#include "texts.h"
@ -16,10 +16,11 @@
#include "widgets/doubleprogressbar.h"
class BatteryMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BATTERY>
{
using Base = espgui::MenuDisplay;
using Base = BobbyMenuDisplay;
public:
BatteryMenu();

4
main/displays/menus/blesettingsmenu.h
View File

@ -1,13 +1,13 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
#ifdef FEATURE_BLE
class BleSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BLESETTINGS>
{
public:

4
main/displays/menus/bluetoothsettingsmenu.h
View File

@ -5,7 +5,7 @@
#ifdef FEATURE_BLUETOOTH
#include "changevaluedisplay_bluetoothmode.h"
#endif
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "menuitem.h"
#include "actions/dummyaction.h"
#ifdef FEATURE_BLUETOOTH
@ -37,7 +37,7 @@ using AutoBluetoothModeChangeDisplay = makeComponent<
>;
class BluetoothSettingsMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<TEXT_BLUETOOTHSETTINGS>,
public BackActionInterface<SwitchScreenAction<SettingsMenu>>
{

4
main/displays/menus/bmsmenu.h
View File

@ -2,11 +2,11 @@
#if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class BmsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BMS>
{
public:

4
main/displays/menus/boardcomputerhardwaresettingsmenu.h
View File

@ -1,11 +1,11 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class BoardcomputerHardwareSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>
{
public:

6
main/displays/menus/buzzermenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class BuzzerMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_BUZZER>
{
public:

6
main/displays/menus/cloudsettingsmenu.h
View File

@ -1,14 +1,12 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
#ifdef FEATURE_CLOUD
class CloudSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_CLOUDSETTINGS>
{
public:

4
main/displays/menus/commanddebugmenu.h
View File

@ -1,7 +1,7 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "actions/dummyaction.h"
@ -15,7 +15,7 @@ using namespace espgui;
namespace {
template<const char *Ttext, typename Ttexts>
class CommandDebugMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<Ttext>,
public BackActionInterface<SwitchScreenAction<DebugMenu>>
{

6
main/displays/menus/controllerhardwaresettingsmenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class ControllerHardwareSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_CONTROLLERHARDWARESETTINGS>
{
public:

4
main/displays/menus/crashmenu.h
View File

@ -1,13 +1,13 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
using namespace espgui;
class CrashMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<TEXT_CRASHMENU>
{
public:

6
main/displays/menus/debugmenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class DebugMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_DEBUG>
{
public:

6
main/displays/menus/defaultmodesettingsmenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class DefaultModeSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_DEFAULTMODESETTIGNS>
{
public:

6
main/displays/menus/demosmenu.h
View File

@ -1,13 +1,11 @@
#pragma once
// 3rdparty lib includes
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class DemosMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_DEMOS>
{
public:

4
main/displays/menus/dynamicdebugmenu.h
View File

@ -11,7 +11,7 @@
#include <esprandom.h>
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "actions/switchscreenaction.h"
@ -125,7 +125,7 @@ constexpr char TEXT_STATICICON[] = "Static icon";
constexpr char TEXT_DEBUGTOGGLE[] = "Toggle";
class DynamicDebugMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public RandomText,
public BackActionInterface<SwitchScreenAction<DebugMenu>>
{

4
main/displays/menus/enablemenu.h
View File

@ -1,13 +1,13 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
using namespace espgui;
class EnableMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<TEXT_SETENABLED>
{
public:

7
main/displays/menus/espnowmenu.h
View File

@ -2,6 +2,7 @@
#ifdef FEATURE_ESPNOW
// 3rdparty lib includes
#include <accessorinterface.h>
#include <actioninterface.h>
#include <espchrono.h>
@ -10,6 +11,8 @@
#include <textinterface.h>
#include <texts.h>
// local includes
#include "displays/bobbymenudisplay.h"
#include "espnowfunctions.h"
using namespace espgui;
@ -31,8 +34,8 @@ public:
} // namespace
class EspNowMenu :
public espgui::MenuDisplay,
public espgui::StaticText<TEXT_ESPNOW_MENU>
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_ESPNOW_MENU>
{
public:
EspNowMenu();

7
main/displays/menus/espnowsettingsmenu.h
View File

@ -2,6 +2,7 @@
#ifdef FEATURE_ESPNOW
// 3rdparty lib includes
#include <accessorinterface.h>
#include <actioninterface.h>
#include <espchrono.h>
@ -10,6 +11,8 @@
#include <textinterface.h>
#include <texts.h>
// local includes
#include "displays/bobbymenudisplay.h"
#include "espnowfunctions.h"
using namespace espgui;
@ -18,8 +21,8 @@ namespace espnowsettingsmenu {
} // namespace
class EspNowSettingsMenu :
public espgui::MenuDisplay,
public espgui::StaticText<TEXT_ESPNOW_SETTINGS>
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_ESPNOW_SETTINGS>
{
public:
EspNowSettingsMenu();

4
main/displays/menus/feedbackdebugmenu.h
View File

@ -1,7 +1,7 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "actions/dummyaction.h"
@ -17,7 +17,7 @@ using namespace espgui;
namespace {
template<const char *Ttext, typename Ttexts, template<int> class ColorInterface>
class FeedbackDebugMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<Ttext>,
public BackActionInterface<SwitchScreenAction<DebugMenu>>
{

4
main/displays/menus/gametrakmodesettingsmenu.h
View File

@ -1,7 +1,7 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "actions/switchscreenaction.h"
@ -13,7 +13,7 @@ using namespace espgui;
namespace {
#ifdef FEATURE_GAMETRAK
class ContainerModeSettingsMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<TEXT_GAMETRAKMODESETTINGS>,
public BackActionInterface<SwitchScreenAction<ModesSettingsMenu>>
{

4
main/displays/menus/genericwifisettingsmenu.h
View File

@ -1,7 +1,7 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "changevaluedisplay.h"
#include "menuitem.h"
#include "actions/dummyaction.h"
@ -17,7 +17,7 @@ using namespace espgui;
namespace {
class GenericWifiSettingsMenu :
public MenuDisplay,
public BobbyMenuDisplay,
public StaticText<TEXT_GENERICWIFISETTINGS>,
public BackActionInterface<SwitchScreenAction<WifiSettingsMenu>>
{

4
main/displays/menus/graphsmenu.h
View File

@ -1,11 +1,11 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class GraphsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_GRAPHS>
{
public:

2
main/displays/menus/greenpassmenu.h
View File

@ -13,8 +13,6 @@ class GreenPassMenu :
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_GREENPASS>
{
using Base = BobbyMenuDisplay;
public:
GreenPassMenu();
void back() override;

5
main/displays/menus/handbremssettingsmenu.h
View File

@ -1,10 +1,11 @@
#pragma once
#include "menudisplay.h"
// local includes
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class HandbremsSettingsMenu :
public espgui::MenuDisplay,
public BobbyMenuDisplay,
public espgui::StaticText<TEXT_DEBUG>
{
public:

2
main/displays/menus/invertmenu.h
View File

@ -1,7 +1,7 @@
#pragma once
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
using namespace espgui;

2
main/displays/menus/larsmmodesettingsmenu.h
View File

@ -3,7 +3,7 @@
// 3rdparty lib includes
// local includes
#include "menudisplay.h"
#include "displays/bobbymenudisplay.h"
#include "texts.h"
class LarsmModeSettingsMenu :

28
main/displays/statusdisplay.cpp
View File

@ -181,28 +181,28 @@ clearIp:
m_labelProfile.redraw(profile ? std::to_string(*profile) : "-");
}
void StatusDisplay::confirm()
void StatusDisplay::buttonPressed(espgui::Button button)
{
switchScreen<MainMenu>();
}
Base::buttonPressed(button);
void StatusDisplay::back()
{
}
void StatusDisplay::rotate(int offset)
{
Base::rotate(offset);
if (offset < 0)
switch (button)
{
using espgui::Button;
case Button::Left:
case Button::Right:
switchScreen<MainMenu>();
break;
case Button::Up:
#ifdef FEATURE_BMS
switchScreen<BmsDisplay>();
#else
switchScreen<MetersDisplay>();
#endif
else if (offset > 0)
break;
case Button::Down:
switchScreen<MetersDisplay>();
break;
}
}
StatusDisplay::BoardStatus::BoardStatus(int y) :

10
main/displays/statusdisplay.h
View File

@ -4,13 +4,13 @@
#include <esp_heap_caps.h>
// 3rdparty lib includes
#include <display.h>
#include <actions/switchscreenaction.h>
#include <widgets/label.h>
#include <widgets/progressbar.h>
#include <espchrono.h>
// local includes
#include "bobbydisplay.h"
#include "modeinterface.h"
#include "globals.h"
#include "utils.h"
@ -18,17 +18,15 @@
#include "battery.h"
class StatusDisplay :
public espgui::Display
public BobbyDisplay
{
using Base = espgui::Display;
using Base = BobbyDisplay;
public:
void initScreen() override;
void redraw() override;
void confirm() override;
void back() override;
void rotate(int offset) override;
void buttonPressed(espgui::Button button) override;
private:
class BoardStatus

7
main/widgets/menudisplaywithtime.cpp
View File

@ -1,5 +1,10 @@
#include "menudisplaywithtime.h"
#include "tftinstance.h"
// 3rdparty lib includes
#include <tftinstance.h>
#include <fmt/core.h>
// local includes
#include "utils.h"
using namespace espgui;

13
main/widgets/menudisplaywithtime.h
View File

@ -1,20 +1,19 @@
#pragma once
// system includes
#include <cstdint>
// 3rdparty lib includes
#include <menudisplay.h>
// local includes
#include "displays/bobbymenudisplay.h"
namespace bobbygui {
class MenuDisplayWithTime :
public espgui::MenuDisplay
public BobbyMenuDisplay
{
using Base = espgui::MenuDisplay;
using Base = BobbyMenuDisplay;
public:
void start() override;
void redraw() override;
espgui::Label m_label_currentTime{145, 6};
private:
virtual bool use_big_font() const
{