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

Adding our own back/checked/unchecked icons

Browse Source
This commit is contained in:
CommanderRedYT
2022-12-25 17:35:58 +01:00
parent 9e3ca7f605
commit eee58bdd51
91 changed files with 384 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
icons/checked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 B

BIN
icons/unchecked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 471 B

23
main/CMakeLists.txt
View File

@@ -70,18 +70,25 @@ set(BOBBY_HEADERS
globals.h
guihelpers/bobbychangevaluedisplay.h
guihelpers/bobbycheckbox.h
guihelpers/bobbycheckboxicon.h
guihelpers/bobbydisplay.h
guihelpers/bobbydisplaywithtitle.h
guihelpers/bobbyerrorhandler.h
guihelpers/bobbygraphdisplay.h
guihelpers/bobbymenudisplay.h
guihelpers/bobbypopupdisplay.h
guihelpers/bobbysplitgraphdisplay.h
guihelpers/menudisplaywithtime.cpp
guihelpers/menudisplaywithtime.h
handbremse.h
icons/alert.h
icons/back.h
icons/battery.h
icons/bluetooth.h
icons/bms.h
icons/bobbycar.h
icons/buzzer.h
icons/checked.h
icons/close.h
icons/demos.h
icons/git.h
@@ -101,6 +108,7 @@ set(BOBBY_HEADERS
icons/shortcircuit.h
icons/statistics.h
icons/time.h
icons/unchecked.h
icons/update.h
icons/wifi.h
ledstrip.h
@@ -136,8 +144,6 @@ set(BOBBY_HEADERS
screens/bmsdisplay.h
screens/bmsmenu.h
screens/boardcomputerhardwaresettingsmenu.h
guihelpers/bobbygraphdisplay.h
guihelpers/bobbysplitgraphdisplay.h
screens/buzzermenu.h
screens/calibratevoltagedisplay.h
screens/candebugmenu.h
@@ -176,8 +182,6 @@ set(BOBBY_HEADERS
screens/lockscreensettingsmenu.h
screens/mainmenu.h
screens/manageprofilesmenu.h
guihelpers/menudisplaywithtime.cpp
guihelpers/menudisplaywithtime.h
screens/metersdisplay.h
screens/mickmodesettingsmenu.h
screens/modessettingsmenu.h
@@ -188,7 +192,7 @@ set(BOBBY_HEADERS
screens/networksettingsmenu.h
screens/otamenu.h
screens/pingpongdisplay.h
screens/poweroffdisplay.h
screens/poweroffdisplay.h
screens/powersupplydisplay.h
screens/profilesmenu.h
screens/qrcodedebug.h
@@ -308,15 +312,19 @@ set(BOBBY_SOURCES
guihelpers/bobbydisplay.cpp
guihelpers/bobbydisplaywithtitle.cpp
guihelpers/bobbyerrorhandler.cpp
guihelpers/bobbygraphdisplay.cpp
guihelpers/bobbymenudisplay.cpp
guihelpers/bobbypopupdisplay.cpp
guihelpers/bobbysplitgraphdisplay.cpp
handbremse.cpp
icons/alert.cpp
icons/back.cpp
icons/battery.cpp
icons/bluetooth.cpp
icons/bms.cpp
icons/bobbycar.cpp
icons/buzzer.cpp
icons/checked.cpp
icons/close.cpp
icons/demos.cpp
icons/git.cpp
@@ -336,6 +344,7 @@ set(BOBBY_SOURCES
icons/shortcircuit.cpp
icons/statistics.cpp
icons/time.cpp
icons/unchecked.cpp
icons/update.cpp
icons/wifi.cpp
ledstrip.cpp
@@ -367,8 +376,6 @@ set(BOBBY_SOURCES
screens/bmsdisplay.cpp
screens/bmsmenu.cpp
screens/boardcomputerhardwaresettingsmenu.cpp
guihelpers/bobbygraphdisplay.cpp
guihelpers/bobbysplitgraphdisplay.cpp
screens/buzzermenu.cpp
screens/calibratevoltagedisplay.cpp
screens/candebugmenu.cpp
@@ -411,7 +418,7 @@ set(BOBBY_SOURCES
screens/networksettingsmenu.cpp
screens/otamenu.cpp
screens/pingpongdisplay.cpp
screens/poweroffdisplay.cpp
screens/poweroffdisplay.cpp
screens/powersupplydisplay.cpp
screens/profilesmenu.cpp
screens/qrcodedebug.cpp

2
main/changevaluedisplay_bluetoothmode.h
View File

@@ -32,7 +32,7 @@ ChangeValueDisplay<BluetoothMode>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BluetoothMode>, StaticText<TEXT_OFF>>>(BluetoothMode::Off, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BluetoothMode>, StaticText<TEXT_MASTER>>>(BluetoothMode::Master, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BluetoothMode>, StaticText<TEXT_SLAVE>>>(BluetoothMode::Slave, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<BluetoothMode>::start()

4
main/changevaluedisplay_bobbyquickactions.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib includes
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -41,7 +41,7 @@ ChangeValueDisplay<BobbyQuickActions>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BobbyQuickActions>, StaticText<TEXT_QUICKACTION_TEMPOMAT>>>(BobbyQuickActions::PWMOMAT, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BobbyQuickActions>, StaticText<TEXT_QUICKACTION_COMPRESSOR>>>(BobbyQuickActions::COMPRESSOR_TOGGLE, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<BobbyQuickActions>, StaticText<TEXT_QUICKACTION_HUPE>>>(BobbyQuickActions::HUPE, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<BobbyQuickActions>::start()

4
main/changevaluedisplay_controlmode.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib includes
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -32,7 +32,7 @@ ChangeValueDisplay<bobbycar::protocol::ControlMode>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlMode>, StaticText<TEXT_VOLTAGE>>>(ControlMode::Voltage, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlMode>, StaticText<TEXT_SPEED>>>(ControlMode::Speed, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlMode>, StaticText<TEXT_TORQUE>>>(ControlMode::Torque, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<bobbycar::protocol::ControlMode>::start()

4
main/changevaluedisplay_controltype.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib includes
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -30,7 +30,7 @@ ChangeValueDisplay<bobbycar::protocol::ControlType>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlType>, StaticText<TEXT_COMMUTATION>>>(ControlType::Commutation, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlType>, StaticText<TEXT_SINUSOIDAL>>>(ControlType::Sinusoidal, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<ControlType>, StaticText<TEXT_FIELDORIENTEDCONTROL>>>(ControlType::FieldOrientedControl, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<bobbycar::protocol::ControlType>::start()

4
main/changevaluedisplay_handbremsmode.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib includes
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -30,7 +30,7 @@ ChangeValueDisplay<HandbremseMode>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<HandbremseMode>, StaticText<TEXT_HANDBREMS_MOSFETS_OFF>>>(HandbremseMode::MOSFETS_OFF, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<HandbremseMode>, StaticText<TEXT_HANDBREMS_OPENMODE>>>(HandbremseMode::OPENMODE, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<HandbremseMode>, StaticText<TEXT_HANDBREMS_SPEED0>>>(HandbremseMode::SPEED_0, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<HandbremseMode>::start()

4
main/changevaluedisplay_larsmmode_mode.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib inclues
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -31,7 +31,7 @@ ChangeValueDisplay<LarsmModeMode>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<LarsmModeMode>, StaticText<TEXT_LARSMMODE2>>>(LarsmModeMode::Mode2, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<LarsmModeMode>, StaticText<TEXT_LARSMMODE3>>>(LarsmModeMode::Mode3, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<LarsmModeMode>, StaticText<TEXT_LARSMMODE4>>>(LarsmModeMode::Mode4, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<LarsmModeMode>::start()

4
main/changevaluedisplay_unifiedmodelmode.cpp
View File

@@ -9,9 +9,9 @@
// 3rdparty lib includes
#include <actions/setvalueaction.h>
#include <actions/backproxyaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace espgui {
@@ -33,7 +33,7 @@ ChangeValueDisplay<UnifiedModelMode>::ChangeValueDisplay()
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<UnifiedModelMode>, StaticText<TEXT_FOCVOLTAGE>>>(UnifiedModelMode::FocVoltage, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<UnifiedModelMode>, StaticText<TEXT_FOCSPEED>>>(UnifiedModelMode::FocSpeed, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, SetValueAction<UnifiedModelMode>, StaticText<TEXT_FOCTORQUE>>>(UnifiedModelMode::FocTorque, *this, *this, *this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&espgui::icons::back>>>(*this);
constructMenuItem<makeComponentArgs<MenuItem, BackProxyAction, StaticText<TEXT_BACK>, StaticMenuItemIcon<&bobbyicons::back>>>(*this);
}
void ChangeValueDisplay<UnifiedModelMode>::start()

4
main/guihelpers/bobbycheckbox.h
View File

@@ -2,16 +2,16 @@
// 3rdparty lib includes
#include <actions/toggleboolaction.h>
#include <checkboxicon.h>
// local includes
#include "bobbycheckboxicon.h"
#include "bobbyerrorhandler.h"
namespace bobby {
class BobbyCheckbox :
public virtual espgui::ToggleBoolAction,
public virtual espgui::CheckboxIcon,
public virtual BobbyCheckboxIcon,
public virtual BobbyErrorHandler
{
};

20
main/guihelpers/bobbycheckboxicon.h Normal file
View File

@@ -0,0 +1,20 @@
#pragma once
// 3rdparty lib includes
#include <menuitem.h>
#include <accessorinterface.h>
// local includes
#include "icons/checked.h"
#include "icons/unchecked.h"
namespace bobby {
class BobbyCheckboxIcon : public virtual espgui::MenuItemIconInterface, public virtual espgui::AccessorInterface<bool>
{
public:
const espgui::MenuItemIcon *icon() const override
{
return getValue() ? &bobbyicons::checked : &bobbyicons::unchecked;
}
};
} // namespace bobby

30
main/icons/back.cpp Normal file
View File

@@ -0,0 +1,30 @@
#include "back.h"
namespace bobbyicons {
const espgui::Icon<24, 24> back{{
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x016C,0x014B,0x010B,0x01AC,0x018C,0x018C,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x014B,0x0009,0x0000,0x2AD0,0x3331,0x00CB,0x09CD,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x012B,0x0007,0x0000,0x1A6F,0x5CD7,0x5C96,0x0003,0x09ED,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x010B,0x0006,0xFFFF,0x022F,0x6518,0x75FB,0x5C96,0x0000,0x1AB0,0x2312,0x22F1,0x1AB0,0x1A6F,0x0A0E,0x016C,0x0048,0x00EA,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x010A,0x0029,0x0000,0x022F,0x6538,0x761B,0x761B,0x5CD7,0x024F,0x22D0,0x22D0,0x1AB0,0x1A6F,0x124F,0x01CD,0x002A,0x0000,0x018C,0x0007,0x014B,0x0000,0x0000,
0x0002,0x0003,0x0A2E,0x0000,0x1A90,0x6518,0x7E3C,0x761C,0x761C,0x6E1C,0x65BB,0x5D9A,0x5D7A,0x5539,0x54F8,0x4CB7,0x4C76,0x3BD4,0x2B11,0x1A6F,0x016C,0x43F5,0x012B,0x00A6,
0x0006,0x024F,0x0000,0x22F1,0x6518,0x7E3C,0x7E5C,0x765C,0x765C,0x6E3C,0x661C,0x65FC,0x5DBB,0x559A,0x4D5A,0x44F9,0x44D8,0x3C97,0x4456,0x3BD4,0x2AF1,0x09CD,0x5D7C,0x00AA,
0x022F,0x0000,0x2AF1,0x6518,0x863C,0x7E3C,0x6E3C,0x663C,0x663D,0x5E3D,0x5E1C,0x5DFC,0x55DB,0x559B,0x4D5A,0x4519,0x3CB8,0x3477,0x3436,0x33F5,0x3BD4,0x2AF1,0x018C,0x0000,
0x014B,0x22B0,0x54B7,0x5D9A,0x4D7A,0x3D7B,0x357B,0x2D9C,0x2DDC,0x2DDC,0x2DBC,0x2D7B,0x355A,0x3D5A,0x453A,0x4519,0x3CD8,0x3477,0x3436,0x2BD5,0x2BB5,0x3394,0x1A6F,0x014C,
0x016B,0x1A90,0x3436,0x24D9,0x14D9,0x1D1A,0x1D5B,0x1D9C,0x25DD,0x25DD,0x1D9C,0x1D5B,0x1D1A,0x1CD9,0x1CB8,0x2CB8,0x3CB8,0x3477,0x2C36,0x2BD5,0x2394,0x33D5,0x22F1,0x11CC,
0x022F,0x0004,0x1AD0,0x2C57,0x24F9,0x1D1A,0x1D5B,0x1D7C,0x1DBC,0x25BC,0x1D9C,0x1D5B,0x1D1A,0x1CD9,0x1C98,0x1457,0x1C37,0x2C36,0x2C16,0x23D5,0x2394,0x23B5,0x2B32,0x11CD,
0x0000,0x0A0E,0x0000,0x22F1,0x2C77,0x251A,0x1D3A,0x1D5B,0x1D7B,0x1D7B,0x1D5B,0x1D3A,0x1CFA,0x1CB9,0x1C78,0x1457,0x1416,0x13D5,0x23D5,0x23B5,0x1B94,0x1B94,0x2B52,0x11ED,
0x0023,0x0000,0x0A4F,0x0000,0x22F1,0x3497,0x251A,0x1D1A,0x1D3A,0x2D5B,0x2D3A,0x2D1A,0x24F9,0x24D9,0x1478,0x1437,0x13F6,0x13B5,0x1394,0x1B74,0x1B74,0x1B94,0x2B52,0x11ED,
0x0000,0x0087,0x0000,0x124F,0x0000,0x1AB0,0x3497,0x1D1A,0x1CFA,0x3497,0x1B32,0x2373,0x2393,0x2BD4,0x3415,0x2C57,0x13F6,0x1395,0x1374,0x1353,0x1354,0x2394,0x2B32,0x11ED,
0x0000,0x0000,0x0000,0x00EA,0x00EA,0x0000,0x126F,0x3497,0x24D9,0x3435,0x0000,0x1270,0x0000,0x0029,0x01AC,0x22F1,0x33F5,0x1395,0x1354,0x1333,0x0B33,0x2394,0x22F1,0x22B0,
0x0000,0x0000,0x0000,0x0000,0x010B,0x0008,0x0000,0x1A6F,0x3477,0x3435,0x0006,0x09ED,0x0027,0x00EA,0x01AC,0x0000,0x22B0,0x2BB4,0x0B33,0x1333,0x0B34,0x2B73,0x22B0,0x09AD,
0x0000,0x0000,0x0000,0x0000,0x0000,0x012B,0x0009,0x0000,0x1A90,0x3352,0x004A,0x09CD,0x0000,0x0000,0x010A,0x012B,0x09CD,0x2B53,0x1354,0x0B33,0x1B54,0x2B32,0x228F,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x014B,0x010B,0x0007,0x018D,0x01AC,0x01AC,0x0000,0x0000,0x0000,0x014B,0x09CD,0x2B32,0x1374,0x0B33,0x2353,0x2AF1,0x08EA,0x1A0D,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x01AD,0x09ED,0x00CA,0x018C,0x018C,0x0000,0x0000,0x0000,0x018C,0x09ED,0x2B53,0x1354,0x1B53,0x2B32,0x224E,0x2B11,0x0800,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00A8,0x09ED,0x122E,0x2B73,0x1B54,0x2B53,0x32D0,0x43D4,0x0004,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0049,0x451B,0x1AB0,0x2BB4,0x2B53,0x32F0,0x5D3A,0x0008,0x00C9,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x018C,0x010B,0x3332,0x3393,0x2AD0,0x873F,0x012B,0x11ED,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0109,0x01AD,0x018C,0x22B0,0x32F0,0x761E,0x016C,0x1A2E,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x014B,0x018C,0x018C,0x09CD,0x4C77,0x012B,0x1A0E,0x0000,0x0000,0x0000,0x0000,
}, "back"};
} // namespace bobbyicons

7
main/icons/back.h Normal file
View File

@@ -0,0 +1,7 @@
#pragma once
#include "icon.h"
namespace bobbyicons {
extern const espgui::Icon<24, 24> back;
} // namespace bobbyicons

30
main/icons/checked.cpp Normal file
View File

@@ -0,0 +1,30 @@
#include "checked.h"
namespace bobbyicons {
const espgui::Icon<24, 24> checked{{
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0395,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0000,0x0000,0x0000,
0x0000,0x0396,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x4499,0xBEDD,0xEFBF,0xFFFF,0xBEDD,0x5D3A,0x0376,0x0356,0x0000,
0x0000,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x7DBB,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x7DBB,0x0376,0x0395,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x653A,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x4499,0x0376,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0xBEDD,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xBEDD,0x0376,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xEFBF,0x0376,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0xEFBF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0376,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0xBEDD,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xBEDD,0x0377,
0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x4499,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x5D3A,0x0376,
0x0395,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x85BB,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x85BB,0x0376,0x0000,
0x0000,0x0396,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x653A,0xBEDD,0xFFFF,0xEFBF,0xBEDD,0x4499,0x0376,0x0356,0x0000,
0x0000,0x0000,0x0000,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0376,0x0395,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
}, "checked"};
} // namespace bobbyicons

7
main/icons/checked.h Normal file
View File

@@ -0,0 +1,7 @@
#pragma once
#include "icon.h"
namespace bobbyicons {
extern const espgui::Icon<24, 24> checked;
} // namespace bobbyicons

30
main/icons/unchecked.cpp Normal file
View File

@@ -0,0 +1,30 @@
#include "unchecked.h"
namespace bobbyicons {
const espgui::Icon<24, 24> unchecked{{
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x0000,0x0000,0x0000,
0x0000,0x7410,0x73F0,0x73F0,0x73D0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73D0,0x73F0,0x73F0,0x7410,0x0000,
0x0000,0x73F0,0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73F0,0x73F0,0x7390,
0x73F0,0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73F0,0x73F0,
0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73D0,0x73F0,
0x73F0,0x0000,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x7410,0x73F0,
0x73F0,0x7390,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73F0,
0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73D0,0x73F0,
0x73F0,0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73F0,0x73F0,
0x7410,0x73F0,0x73F0,0x7410,0x73F0,0x73F0,0x73F0,0x73F0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x73F0,0x73F0,0x0000,
0x0000,0x7410,0x73F0,0x73F0,0x7410,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x7410,0x7410,0x73F0,0x73F0,0x7410,0x0000,
0x0000,0x0000,0x0000,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x73F0,0x7410,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
}, "unchecked"};
} // namespace bobbyicons

7
main/icons/unchecked.h Normal file
View File

@@ -0,0 +1,7 @@
#pragma once
#include "icon.h"
namespace bobbyicons {
extern const espgui::Icon<24, 24> unchecked;
} // namespace bobbyicons

5
main/screens/aboutmenu.cpp
View File

@@ -7,11 +7,10 @@
#include <fmt/core.h>
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "texthelpers/esptexthelpers.h"
#include "utils.h"
namespace bobby {
namespace {
@@ -59,7 +58,7 @@ AboutMenu::AboutMenu()
constructMenuItem<makeComponent<MenuItem, EspSketchSizeText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspSketchMd5Text, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspFreeSketchSpaceText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string AboutMenu::text() const

16
main/screens/batterydebugmenu.cpp
View File

@@ -1,17 +1,17 @@
#include "batterydebugmenu.h"
// 3rdparty lib includes
#include "menuitem.h"
#include "icons/back.h"
#include "actions/dummyaction.h"
#include "actions/popscreenaction.h"
#include "fmt/core.h"
#include <menuitem.h>
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "utils.h"
#include "icons/settings.h"
#include "battery.h"
#include "icons/back.h"
#include "icons/settings.h"
#include "utils.h"
namespace bobby {
@@ -83,7 +83,7 @@ BatteryDebugMenu::BatteryDebugMenu()
constructMenuItem<makeComponent<MenuItem, BatteryDebug2Text, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, BatteryDebug3Text, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, CurrentAdvancedBatteryPercentageText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BatteryDebugMenu::text() const

5
main/screens/batterymenu.cpp
View File

@@ -5,7 +5,6 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
#include <tftcolors.h>
@@ -15,12 +14,12 @@
#include "accessors/settingsaccessors.h"
#include "battery.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "icons/graph.h"
#include "icons/settings.h"
#include "screens/batterygraphdisplay.h"
#include "screens/calibratevoltagedisplay.h"
#include "typesafeenumchangemenu.h"
#include "utils.h"
namespace bobby {
@@ -85,7 +84,7 @@ BatteryMenu::BatteryMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SHOW_BATTERY_GRAPH>, PushScreenAction<BatteryGraphDisplay>, StaticMenuItemIcon<&bobbyicons::graph>>>();
constructMenuItem<makeComponent<MenuItem, WhStatisticsText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_CALIBRATE>, PushScreenAction<CalibrateVoltageDisplay>, StaticMenuItemIcon<&bobbyicons::settings>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BatteryMenu::text() const

6
main/screens/blesettingsmenu.cpp
View File

@@ -6,14 +6,14 @@
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <changevaluedisplay_string.h>
#include <icons/back.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "screens/settingsmenu.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/settingsmenu.h"
#include "texthelpers/bletexthelpers.h"
namespace bobby {
@@ -43,7 +43,7 @@ BleSettingsMenu::BleSettingsMenu()
constructMenuItem<makeComponent<MenuItem, BleServerPeerDevicesText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, BleCharacSubscribedText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_NAME_FORMATTED, BluetoothNameAccessor>, PushScreenAction<ApSsidChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BleSettingsMenu::text() const

2
main/screens/bluetoothsettingsmenu.h
View File

@@ -56,7 +56,7 @@ public:
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHEND>, BluetoothEndAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHDISCONNECT>, BluetoothDisconnectAction>>();
// constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_AUTOBLUETOOTHMODE>, SwitchScreenAction<AutoBluetoothModeChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::back>>>();
}
};
#endif

2
main/screens/bmsmenu.cpp
View File

@@ -26,7 +26,7 @@ BmsMenu::BmsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TURNOFFCHARGE>, BmsTurnOffChargeAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TURNONDISCHARGE>, BmsTurnOnDischargeAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TURNOFFDISCHARGE>, BmsTurnOffDischargeAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void BmsMenu::back()

4
main/screens/boardcomputerhardwaresettingsmenu.cpp
View File

@@ -6,7 +6,6 @@
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <textwithvaluehelper.h>
// local includes
@@ -14,6 +13,7 @@
#include "actions/setupactions.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "icons/lock.h"
#include "screens/extrabuttoncalibratemenu.h"
#include "screens/lockscreensettingsmenu.h"
@@ -227,7 +227,7 @@ BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
#endif
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TIMERS>, PushScreenAction<TimersMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BoardcomputerHardwareSettingsMenu::text() const

18
main/screens/buzzermenu.cpp
View File

@@ -1,19 +1,17 @@
#include "buzzermenu.h"
// 3rdparty lib includes
#include "changevaluedisplay.h"
#include "menuitem.h"
#include "actions/pushscreenaction.h"
#include "actions/popscreenaction.h"
#include "icons/back.h"
#include <changevaluedisplay.h>
#include <menuitem.h>
#include <actions/pushscreenaction.h>
#include <actions/popscreenaction.h>
// local includes
#include "guihelpers/bobbychangevaluedisplay.h"
#include "utils.h"
#include "globals.h"
#include "accessors/settingsaccessors.h"
#include "screens/settingsmenu.h"
#include "globals.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
namespace bobby {
@@ -109,7 +107,7 @@ BuzzerMenu::BuzzerMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REVERSEBEEPFREQ1>, PushScreenAction<ReverseBeepFreq1ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REVERSEBEEPDURATION0>, PushScreenAction<ReverseBeepDuration0ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REVERSEBEEPDURATION1>, PushScreenAction<ReverseBeepDuration1ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BuzzerMenu::text() const

13
main/screens/calibratevoltagedisplay.cpp
View File

@@ -2,21 +2,18 @@
// 3rdparty lib includes
#include <menuitem.h>
#include <icons/back.h>
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <widgets/label.h>
#include <fmt/core.h>
// Local includes
#include "utils.h"
#include "icons/settings.h"
#include "battery.h"
#include "batterymenu.h"
#include "newsettings.h"
#include "screens/batterymenu.h"
#include "accessors/settingsaccessors.h"
#include "batterymenu.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "newsettings.h"
#include "utils.h"
namespace bobby {
@@ -124,7 +121,7 @@ CalibrateVoltageDisplay::CalibrateVoltageDisplay()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_VOLTAGECALIBRATION_30V>, Save30VCalibrationAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_VOLTAGECALIBRATION_50V>, Save50VCalibrationAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_APPLYCALIB>, BobbyCheckbox, BatteryApplyCalibrationAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();

16
main/screens/candebugmenu.cpp
View File

@@ -9,17 +9,15 @@
#include "esp_log.h"
// 3rdparty lib includes
#include "fmt/core.h"
// 3rdparty lib includes
#include "menuitem.h"
#include "actions/popscreenaction.h"
#include "actions/dummyaction.h"
#include "icons/back.h"
#include "screenmanager.h"
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
#include <menuitem.h>
#include <screenmanager.h>
// local includes
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
namespace bobby {
@@ -259,7 +257,7 @@ CanDebugMenu::CanDebugMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TWAI_START>, CanStartAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TWAI_UNINSTALL>, CanUninstallAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TWAI_INSTALL>, CanInstallAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string CanDebugMenu::text() const

22
main/screens/cloudsettingsmenu.cpp
View File

@@ -1,23 +1,23 @@
#include "cloudsettingsmenu.h"
// 3rdparty lib includes
#include "actions/dummyaction.h"
#include "actions/popscreenaction.h"
#include "actions/pushscreenaction.h"
#include "changevaluedisplay.h"
#include "changevaluedisplay_string.h"
#include "fmt/core.h"
#include "icons/back.h"
#include "menuitem.h"
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <changevaluedisplay_string.h>
#include <fmt/core.h>
#include <menuitem.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbycheckbox.h"
#include "cloud.h"
#include "texthelpers/cloudtexthelpers.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/settingsmenu.h"
#include "texthelpers/cloudtexthelpers.h"
namespace bobby {
@@ -97,7 +97,7 @@ CloudSettingsMenu::CloudSettingsMenu()
constructMenuItem<makeComponent<MenuItem, CloudBufferLengthText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDCOLLECTRATE>, PushScreenAction<CloudCollectRateChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDSENDRATE>, PushScreenAction<CloudSendRateChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string CloudSettingsMenu::text() const

2
main/screens/commanddebugmenu.h
View File

@@ -25,7 +25,7 @@ public:
constructMenuItem<makeComponent<MenuItem, typename Ttexts::BuzzerPatternText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::PoweroffText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::LedText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
private:

18
main/screens/controllerhardwaresettingsmenu.cpp
View File

@@ -4,20 +4,20 @@
#include <ratio>
// 3rdparty lib includes
#include "actions/popscreenaction.h"
#include "actions/pushscreenaction.h"
#include "changevaluedisplay.h"
#include "icons/back.h"
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
// local includes
#include "guihelpers/bobbychangevaluedisplay.h"
#include "utils.h"
#include "globals.h"
#include "accessors/settingsaccessors.h"
#include "globals.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/enablemenu.h"
#include "screens/invertmenu.h"
#include "screens/settingsmenu.h"
#include "guihelpers/bobbycheckbox.h"
#include "utils.h"
namespace bobby {
@@ -96,7 +96,7 @@ ControllerHardwareSettingsMenu::ControllerHardwareSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CANRESETONERROR>, BobbyCheckbox, CanResetOnErrorAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CANREINSTALLDRIVER>, BobbyCheckbox, CanReinstallDriverAccessor>>();
#endif
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string ControllerHardwareSettingsMenu::text() const

6
main/screens/crashmenu.cpp
View File

@@ -1,12 +1,12 @@
#include "crashmenu.h"
// 3rdparty lib includes
#include "actions/popscreenaction.h"
#include "icons/back.h"
#include <actions/popscreenaction.h>
// local includes
#include "actions/assertaction.h"
#include "actions/dividebyzeroaction.h"
#include "icons/back.h"
namespace bobby {
@@ -22,7 +22,7 @@ CrashMenu::CrashMenu()
using namespace espgui;
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CRASH_ASSERT>, AssertAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CRASH_DIVZERO>, DivideByZeroAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string CrashMenu::text() const

4
main/screens/debugmenu.cpp
View File

@@ -4,7 +4,6 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
@@ -18,6 +17,7 @@
#include "screens/taskmanagermenu.h"
#include "screens/qrcodedebug.h"
#include "screens/xydebugdisplay.h"
#include "icons/back.h"
#include "icons/battery.h"
#include "icons/info.h"
#include "icons/lock.h"
@@ -117,7 +117,7 @@ DebugMenu::DebugMenu()
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESET_NVS_NEW>, ResetNVSAction, StaticMenuItemIcon<&bobbyicons::info>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DYNAMICMENU>, PushScreenAction<DynamicDebugMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string DebugMenu::text() const

6
main/screens/defaultmodesettingsmenu.cpp
View File

@@ -5,15 +5,15 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "changevaluedisplay_unifiedmodelmode.h"
#include "guihelpers/bobbycheckbox.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/handbremssettingsmenu.h"
#include "utils.h"
@@ -140,7 +140,7 @@ DefaultModeSettingsMenu::DefaultModeSettingsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SUBBRAKEVAL, DefaultModeBrems2WertAccessor>, PushScreenAction<DefaultModeBrems2WertChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_ADDGASVAL, DefaultModeGas1WertAccessor>, PushScreenAction<DefaultModeGas1WertChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_ADDBRAKEVAL, DefaultModeBrems1WertAccessor>, PushScreenAction<DefaultModeBrems1WertChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string DefaultModeSettingsMenu::text() const

12
main/screens/demosmenu.cpp
View File

@@ -1,16 +1,16 @@
#include "demosmenu.h"
// 3rdparty lib includes
#include <menuitem.h>
#include <actions/pushscreenaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <screens/starfielddisplay.h>
#include <actions/pushscreenaction.h>
#include <menuitem.h>
#include <screens/gameoflifedisplay.h>
#include <screens/pingpongdisplay.h>
#include <screens/spirodisplay.h>
#include <screens/gameoflifedisplay.h>
#include <screens/starfielddisplay.h>
// local includes
#include "icons/back.h"
#include "utils.h"
namespace bobby {
@@ -31,7 +31,7 @@ DemosMenu::DemosMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PINGPONG>, PushScreenAction<PingPongDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SPIRO>, PushScreenAction<SpiroDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GAMEOFLIFE>, PushScreenAction<GameOfLifeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string DemosMenu::text() const

8
main/screens/dynamicdebugmenu.cpp
View File

@@ -14,17 +14,17 @@
#include <espchrono.h>
#include <esprandom.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <menuitem.h>
#include <randomutils.h>
#include <tftcolors.h>
// local includes
#include "guihelpers/bobbychangevaluedisplay.h"
#include "utils.h"
#include "icons/lock.h"
#include "guihelpers/bobbycheckbox.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "icons/lock.h"
#include "utils.h"
namespace bobby {
@@ -176,7 +176,7 @@ DynamicDebugMenu::DynamicDebugMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void DynamicDebugMenu::back()

2
main/screens/enablemenu.cpp
View File

@@ -24,7 +24,7 @@ EnableMenu::EnableMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLEFRONTRIGHT>, BobbyCheckbox, FrontRightEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLEBACKLEFT>, BobbyCheckbox, BackLeftEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLEBACKRIGHT>, BobbyCheckbox, BackRightEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string EnableMenu::text() const

5
main/screens/espnowmenu.cpp
View File

@@ -6,13 +6,12 @@
#include <actions/pushscreenaction.h>
#include <espchrono.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <menudisplay.h>
#include <textinterface.h>
// local includes
#include "espnowfunctions.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "icons/settings.h"
#include "icons/time.h"
#include "screens/espnowsettingsmenu.h"
@@ -63,7 +62,7 @@ EspNowMenu::EspNowMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_RECEIVETS>, BobbyCheckbox, ReceiveTimeStampAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_RECEIVETSFROMBOBBY>, BobbyCheckbox, ReceiveTsFromOtherBobbycarsAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_SETTINGS>, PushScreenAction<EspNowSettingsMenu>, StaticMenuItemIcon<&bobbyicons::settings>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string EspNowMenu::text() const

8
main/screens/espnowsettingsmenu.cpp
View File

@@ -1,13 +1,13 @@
#include "espnowsettingsmenu.h"
// 3rdparty lib includes
#include "actions/popscreenaction.h"
#include "icons/back.h"
#include "textinterface.h"
#include <actions/popscreenaction.h>
#include <textinterface.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
namespace bobby {
@@ -26,7 +26,7 @@ EspNowSettingsMenu::EspNowSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_SYNCTIME>, BobbyCheckbox, ESPNowSyncTimeEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_SYNCWITHOTHERS>, BobbyCheckbox, ESPNowSyncTimeWithOthersEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW_SYNCBLINK>, BobbyCheckbox, ESPNowSyncBlinkEnabledAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string EspNowSettingsMenu::text() const

6
main/screens/extrabuttoncalibratemenu.cpp
View File

@@ -5,7 +5,6 @@
// 3rd party includes
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
#include <tftcolors.h>
@@ -13,9 +12,10 @@
// local includes
#include "accessors/settingsaccessors.h"
#include "screens/boardcomputerhardwaresettingsmenu.h"
#include "globals.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "screens/boardcomputerhardwaresettingsmenu.h"
namespace bobby {
@@ -97,7 +97,7 @@ ExtraButtonCalibrateMenu::ExtraButtonCalibrateMenu()
constructMenuItem<ButtonCalibrateMenuItem<TEXT_BUTTON_EXTRA3, ButtonExtra3Accessor, Status::WaitingExtra3>>();
constructMenuItem<ButtonCalibrateMenuItem<TEXT_BUTTON_EXTRA4, ButtonExtra4Accessor, Status::WaitingExtra4>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void ExtraButtonCalibrateMenu::start()

10
main/screens/featureflagsmenu.cpp
View File

@@ -2,15 +2,13 @@
// 3rdparty lib includes
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <strutils.h>
// local includes
#include "guihelpers/bobbypopupdisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "guihelpers/bobbypopupdisplay.h"
#include "icons/checked.h"
#include "icons/unchecked.h"
#include "newsettings.h"
#include "taskmanager.h"
@@ -84,7 +82,7 @@ public:
const espgui::MenuItemIcon *icon() const override
{
return m_flag.isEnabled.value() ? &espgui::icons::checked : &espgui::icons::unchecked;
return m_flag.isEnabled.value() ? &bobbyicons::checked : &bobbyicons::unchecked;
}
private:
ConfiguredFeatureFlag &m_flag;

4
main/screens/feedbackdebugmenu.h
View File

@@ -3,12 +3,12 @@
// 3rdparty lib includes
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "debugcolorhelpers.h"
#include "guihelpers/bobbymenudisplay.h"
#include "icons/back.h"
#include "screens/debugmenu.h"
#include "texthelpers/debugtexthelpers.h"
#include "utils.h"
@@ -30,7 +30,7 @@ public:
//constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempText, ColorInterface<TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempFixedText, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::TimeoutCntSerialText, StaticFont<2>, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
private:

2
main/screens/gametrakmodesettingsmenu.h
View File

@@ -16,7 +16,7 @@ class ContainerModeSettingsMenu :
public:
ContainerModeSettingsMenu()
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string text() const override

13
main/screens/garagemenu.cpp
View File

@@ -1,16 +1,17 @@
#include "garagemenu.h"
// esp-idf includes
#include <esp_log.h>
// 3rd party libs
#include "icons/back.h"
#include "menuitem.h"
#include "actioninterface.h"
#include "esp_log.h"
#include "menuitem.h"
#include <actioninterface.h>
#include <menuitem.h>
// local includes
#include "actions/popscreenaction.h"
#include "espnowfunctions.h"
#include "globals.h"
#include "icons/back.h"
#include "newsettings.h"
namespace bobby {
@@ -43,7 +44,7 @@ GarageMenu::GarageMenu()
menuitem.setTitle(wirelessDoor.doorId.value());
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string GarageMenu::text() const

4
main/screens/gitmenu.cpp
View File

@@ -4,10 +4,10 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
// local includes
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "icons/info.h"
#include "icons/modes.h"
#include "screens/qrdisplay.h"
@@ -62,7 +62,7 @@ GitMenu::GitMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT_COMMIT_SHORT>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT_MESSAGE_TITLE>, OpenPopupAction, StaticMenuItemIcon<&bobbyicons::info>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GITHUB_URL>, GitQrAction, StaticMenuItemIcon<&bobbyicons::modes>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string GitMenu::text() const

4
main/screens/graphsmenu.cpp
View File

@@ -4,12 +4,12 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <graphdisplay.h>
#include <icons/back.h>
#include <splitgraphdisplay.h>
// local includes
#include "guihelpers/bobbygraphdisplay.h"
#include "guihelpers/bobbysplitgraphdisplay.h"
#include "icons/back.h"
#include "statistics.h"
namespace bobby {
@@ -211,7 +211,7 @@ GraphsMenu::GraphsMenu()
#endif
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOTORCURRENTS>, PushScreenAction<MotorCurrentsGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RSSI>, PushScreenAction<RssiGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string GraphsMenu::text() const

8
main/screens/greenpassmenu.cpp
View File

@@ -7,14 +7,14 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
// local includes
#include "actions/qraction.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "qrimport.h"
#include "screens/qrdisplay.h"
#include "screens/qrimportdisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "qrimport.h"
namespace bobby {
@@ -89,7 +89,7 @@ GreenPassMenu::GreenPassMenu()
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DELCERT>, BobbyCheckbox, DeleteModeAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string GreenPassMenu::text() const

6
main/screens/handbremssettingsmenu.cpp
View File

@@ -5,15 +5,15 @@
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "changevaluedisplay_handbremsmode.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "screens/typesafeenumchangemenu.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/typesafeenumchangemenu.h"
namespace bobby {
@@ -43,7 +43,7 @@ HandbremsSettingsMenu::HandbremsSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_HANDBREMSE_VISUALIZE>, BobbyCheckbox, HandbremsVisualizeAccessor>>();
constructMenuItem<PushScreenTypeSafeChangeMenuItem<HandbremseMode, TEXT_HANDBREMSE_MODE>>(&configs.handbremse.mode);
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_HANDBREMSE_TRIGGERTIMEOUT, HandbremsTimeoutAccessor>, PushScreenAction<HandBremsTriggerTimeoutChangeValueDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string HandbremsSettingsMenu::text() const

6
main/screens/invertmenu.cpp
View File

@@ -1,12 +1,10 @@
#include "invertmenu.h"
// 3rdparty lib includes
#include <icons/back.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "actions/popscreenaction.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
namespace bobby {
@@ -26,7 +24,7 @@ InvertMenu::InvertMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_INVERTFRONTRIGHT>, BobbyCheckbox, FrontRightInvertedAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_INVERTBACKLEFT>, BobbyCheckbox, BackLeftInvertedAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_INVERTBACKRIGHT>, BobbyCheckbox, BackRightInvertedAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string InvertMenu::text() const

4
main/screens/larsmmodesettingsmenu.cpp
View File

@@ -5,13 +5,13 @@
#include <menuitem.h>
#include <actions/pushscreenaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "changevaluedisplay_larsmmode_mode.h"
#include "changevaluedisplay_unifiedmodelmode.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "utils.h"
namespace bobby {
@@ -53,7 +53,7 @@ LarsmModeSettingsMenu::LarsmModeSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODELMODE>, PushScreenAction<LarsmModeModelModeChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETMODE>, PushScreenAction<LarsmModeModeChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETITERATIONS>, PushScreenAction<LarsmModeIterationsChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LarsmModeSettingsMenu::text() const

2
main/screens/ledstripcolorsdisplay.cpp
View File

@@ -4,7 +4,6 @@
#include <esp_log.h>
// 3rdparty lib includes
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
#include <tftcolors.h>
@@ -12,6 +11,7 @@
// local includes
#include "globals.h"
#include "icons/back.h"
#include "icons/bobbycar.h"
#include "utils.h"

12
main/screens/ledstripmenu.cpp
View File

@@ -5,21 +5,21 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "globals.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "ledstrip.h"
#include "ledstripselectblinkmenu.h"
#include "screens/ledstripcolorsdisplay.h"
#include "screens/ledstripselectotamode.h"
#include "screens/mainmenu.h"
#include "screens/typesafeenumchangemenu.h"
#include "globals.h"
#include "guihelpers/bobbycheckbox.h"
#include "ledstrip.h"
#include "ledstripselectblinkmenu.h"
namespace bobby {
@@ -182,7 +182,7 @@ LedstripMenu::LedstripMenu()
if (!simplified) { constructMenuItem<makeComponent<MenuItem, LedStripMaxCurrentText, espgui::PushScreenAction<LedStripMaxAmpereChangeScreen>>>(); }
constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_LEDSTRIP_BRAKE_USE_ACCEL>, BobbyCheckbox, LedstripBrakeLightUseAccelAccessor>>();
constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_LEDSTRIP_BRAKE_USE_POWER>, BobbyCheckbox, LedstripBrakeLightUsePowerAccessor>>();
constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_BACK>, espgui::PushScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_BACK>, espgui::PushScreenAction<MainMenu>, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LedstripMenu::text() const

4
main/screens/ledstripselectblinkmenu.cpp
View File

@@ -3,12 +3,12 @@
// 3rdparty lib includes
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "actions/ledstripblinkactions.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "ledstrip.h"
#include "ledstripdefines.h"
@@ -43,7 +43,7 @@ LedstripSelectBlinkMenu::LedstripSelectBlinkMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ANIMATION_BLINKBOTH>, LedstripAnimationBlinkBothAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDSTRIP_EN_BLINK_ANIM>, BobbyCheckbox, LedstripEnableBlinkAnimationAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDSTRIP_VISUALIZE_BLINK>, BobbyCheckbox, LedstripEnableVisualizeBlinkAnimationAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LedstripSelectBlinkMenu::text() const

4
main/screens/ledstripselectotamode.cpp
View File

@@ -3,9 +3,9 @@
// 3rdparty lib includes
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "ledstrip.h"
#include "newsettings.h"
#include "utils.h"
@@ -36,7 +36,7 @@ LedstripOtaAnimationChangeMenu::LedstripOtaAnimationChangeMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_OTAANIM_NONE>, LedstripChangeOtaAnimModeAction<OtaAnimationModes::None>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_OTAANIM_PROGRESS>, LedstripChangeOtaAnimModeAction<OtaAnimationModes::GreenProgressBar>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_OTAANIM_COLOR>, LedstripChangeOtaAnimModeAction<OtaAnimationModes::ColorChangeAll>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LedstripOtaAnimationChangeMenu::text() const

4
main/screens/limitssettingsmenu.cpp
View File

@@ -4,13 +4,13 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "utils.h"
namespace bobby {
@@ -79,7 +79,7 @@ LimitsSettingsMenu::LimitsSettingsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_NMOTMAX, NMotMaxRpmAccessor>, PushScreenAction<NMotMaxRpmChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_FIELDWEAKMAX, FieldWeakMaxAccessor>, PushScreenAction<FieldWeakMaxChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_PHASEADVMAX, PhaseAdvMaxAccessor>, PushScreenAction<PhaseAdvMaxChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LimitsSettingsMenu::text() const

6
main/screens/lockscreensettingsmenu.cpp
View File

@@ -4,15 +4,15 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "globals.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
namespace bobby {
@@ -68,7 +68,7 @@ LockscreenSettingsMenu::LockscreenSettingsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_PINDIGIT1, LockscreenPinDigitAccessor<1>>, PushScreenAction<LockscreenPinDigit1ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_PINDIGIT2, LockscreenPinDigitAccessor<2>>, PushScreenAction<LockscreenPinDigit2ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_PINDIGIT3, LockscreenPinDigitAccessor<3>>, PushScreenAction<LockscreenPinDigit3ChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string LockscreenSettingsMenu::text() const

5
main/screens/mainmenu.cpp
View File

@@ -3,7 +3,6 @@
// 3rdparty lib includes
#include <actions/pushscreenaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
// local includes
#include "screens/selectmodemenu.h"
@@ -46,6 +45,8 @@
#include "icons/greenpass.h"
#include "icons/time.h"
#include "screens/statusdisplay.h"
#include "icons/back.h"
namespace bobby {
@@ -86,7 +87,7 @@ MainMenu::MainMenu()
using namespace espgui;
// constructMenuItem<makeComponent<MenuItem, mainmenu::CurrentTimeText, DummyAction, StaticMenuItemIcon<&bobbyicons::time>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>, PushScreenAction<StatusDisplay>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>, PushScreenAction<StatusDisplay>, StaticMenuItemIcon<&bobbyicons::back>>>();
if (configs.feature.ledstrip.isEnabled.value())
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDSTRIP>, PushScreenAction<LedstripMenu>, StaticMenuItemIcon<&bobbyicons::neopixel>>>();

4
main/screens/manageprofilesmenu.cpp
View File

@@ -3,11 +3,11 @@
// 3rdparty lib includes
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <icons/back.h>
// local includes
#include "globals.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "mainmenu.h"
#include "presets.h"
#include "settingsutils.h"
@@ -231,7 +231,7 @@ ManageProfilesMenu::ManageProfilesMenu()
constructMenuItem<ManageProfileMenuItem>(*this, i);
}
constructMenuItem<ManageProfileModeMenuItem>(*this);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, espgui::PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, espgui::PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void ManageProfilesMenu::start()

4
main/screens/mickmodesettingsmenu.cpp
View File

@@ -4,13 +4,13 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "changevaluedisplay_unifiedmodelmode.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
namespace bobby {
@@ -42,7 +42,7 @@ MickModeSettingsMenu::MickModeSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODELMODE>, PushScreenAction<MickModeModelModeChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MICKMODE_SMOOTHING>, PushScreenAction<MickModeSmoothingChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string MickModeSettingsMenu::text() const

4
main/screens/modessettingsmenu.cpp
View File

@@ -2,10 +2,10 @@
// 3rdparty lib includes
#include <actions/pushscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "icons/back.h"
#include "screens/defaultmodesettingsmenu.h"
#include "screens/gametrakmodesettingsmenu.h"
#include "screens/larsmmodesettingsmenu.h"
@@ -34,7 +34,7 @@ ModesSettingsMenu::ModesSettingsMenu()
#ifdef FEATURE_GAMETRAK
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GAMETRAKMODESETTINGS>, SwitchScreenAction<GametrakModeSettingsMenu>>>();
#endif
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string ModesSettingsMenu::text() const

4
main/screens/mosfetsmenu.cpp
View File

@@ -7,10 +7,10 @@
// 3rdparty lib includes
#include <accessorinterface.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
// local includes
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "types.h"
namespace bobby {
@@ -41,7 +41,7 @@ MosfetsMenu::MosfetsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOSFET0>, BobbyCheckbox, Mosfet0Accessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOSFET1>, BobbyCheckbox, Mosfet1Accessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOSFET2>, BobbyCheckbox, Mosfet2Accessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string MosfetsMenu::text() const

10
main/screens/motorfeedbackdebugmenu.h
View File

@@ -1,14 +1,14 @@
#pragma once
// 3rdparty lib includes
#include "actions/dummyaction.h"
#include "actions/popscreenaction.h"
#include "icons/back.h"
#include "menuitem.h"
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <menuitem.h>
// local includes
#include "debugcolorhelpers.h"
#include "guihelpers/bobbymenudisplay.h"
#include "icons/back.h"
#include "texthelpers/debugtexthelpers.h"
#include "utils.h"
@@ -41,7 +41,7 @@ public:
constructMenuItem<makeComponent<MenuItem, typename Ttexts::HallText, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::IqText, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::IdText, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
private:

4
main/screens/motorstatedebugmenu.h
View File

@@ -3,11 +3,11 @@
// 3rdparty lib includes
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "guihelpers/bobbymenudisplay.h"
#include "icons/back.h"
#include "texthelpers/debugtexthelpers.h"
#include "utils.h"
@@ -34,7 +34,7 @@ public:
constructMenuItem<makeComponent<MenuItem, typename Ttexts::PhaseAdvMaxText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::CruiseCtrlEnaText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, typename Ttexts::NCruiseMotTgtText, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
private:

4
main/screens/motortestmodesettingsmenu.cpp
View File

@@ -4,12 +4,12 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "utils.h"
namespace bobby {
@@ -43,7 +43,7 @@ MotortestModeSettingsMenu::MotortestModeSettingsMenu()
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOTORTESTMULTIPLIKATOR>, PushScreenAction<MotortestMultiplikatorChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOTORTESTMAXPWM>, PushScreenAction<MotortestMaxPwmChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string MotortestModeSettingsMenu::text() const

6
main/screens/networksettingsmenu.cpp
View File

@@ -5,13 +5,13 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <fmt/format.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
// local includes
#include "screens/qrdisplay.h"
#include "globals.h"
#include "icons/back.h"
#include "screens/qrdisplay.h"
#include "texthelpers/networktexthelpers.h"
#include "utils.h"
#include "wifiapsettingsmenu.h"
@@ -39,7 +39,7 @@ NetworkSettingsMenu::NetworkSettingsMenu()
constructMenuItem<makeComponentArgs<MenuItem, DnsText, DummyAction>>(uint8_t{1});
constructMenuItem<makeComponentArgs<MenuItem, DnsText, DummyAction>>(uint8_t{2});
constructMenuItem<makeComponent<MenuItem, WifiTxPowerText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string NetworkSettingsMenu::text() const

8
main/screens/otamenu.cpp
View File

@@ -5,15 +5,15 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <icons/back.h>
// local includes
#include "icons/back.h"
#include "icons/presets.h"
#include "icons/update.h"
#include "screens/selectbuildserverbranch.h"
#include "screens/selectbuildservermenu.h"
#include "screens/selectotabuildmenu.h"
#include "screens/updatedisplay.h"
#include "icons/presets.h"
#include "icons/update.h"
namespace bobby {
@@ -33,7 +33,7 @@ OtaMenu::OtaMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECT_BRANCH>, PushScreenAction<SelectBuildserverBranchMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATENOW>, PushScreenAction<UpdateDisplay>, StaticMenuItemIcon<&bobbyicons::update>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECTBUILDSERVERMENU>, PushScreenAction<SelectBuildServerMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string OtaMenu::text() const

4
main/screens/profilesmenu.cpp
View File

@@ -2,11 +2,11 @@
// 3rdparty lib includes
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <menudisplay.h>
// local includes
#include "actions/switchprofileaction.h"
#include "icons/back.h"
namespace bobby {
@@ -25,7 +25,7 @@ ProfilesMenu::ProfilesMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILE1>, SwitchProfileAction<1>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILE2>, SwitchProfileAction<2>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILE3>, SwitchProfileAction<3>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string ProfilesMenu::text() const

4
main/screens/recoverymenu.cpp
View File

@@ -8,8 +8,10 @@
#include "actions/resetnvsaction.h"
#include "guihelpers/bobbycheckbox.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/checked.h"
#include "icons/info.h"
#include "icons/reboot.h"
#include "icons/unchecked.h"
#include "newsettings.h"
#include "screens/rebootscreen.h"
@@ -40,7 +42,7 @@ public:
const espgui::MenuItemIcon *icon() const override
{
return m_flag.isEnabled.value() ? &espgui::icons::checked : &espgui::icons::unchecked;
return m_flag.isEnabled.value() ? &bobbyicons::checked : &bobbyicons::unchecked;
}
private:
ConfiguredFeatureFlag &m_flag;

4
main/screens/remotecontrolmodesettingsmenu.cpp
View File

@@ -4,13 +4,13 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "changevaluedisplay_unifiedmodelmode.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
namespace bobby {
@@ -33,7 +33,7 @@ RemoteControlModeSettingsMenu::RemoteControlModeSettingsMenu()
using namespace espgui;
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODELMODE>, PushScreenAction<RemoteControlModeModelModeChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string RemoteControlModeSettingsMenu::text() const

6
main/screens/selectbatterytypemenu.cpp
View File

@@ -4,15 +4,15 @@
#include <actioninterface.h>
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "battery.h"
#include "batterymenu.h"
#include "icons/back.h"
#include "newsettings.h"
#include "screens/batterymenu.h"
#include "screens/mainmenu.h"
#include "newsettings.h"
#include "utils.h"
namespace bobby {
@@ -59,7 +59,7 @@ BatteryTypeMenu::BatteryTypeMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_MH1>, BatterySelectTypeAction<BatteryCellType::MH1>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_VTC5>, BatterySelectTypeAction<BatteryCellType::VTC5>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_BAK_25R>, BatterySelectTypeAction<BatteryCellType::BAK_25R>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string BatteryTypeMenu::text() const

6
main/screens/selectbuildserverbranch.cpp
View File

@@ -4,13 +4,13 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <espwifistack.h>
#include <icons/back.h>
#include <tftcolors.h>
#include <tftinterface.h>
// local includes
#include "buildserver.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "icons/reboot.h"
#include "newsettings.h"
@@ -88,7 +88,7 @@ SelectBuildserverBranchMenu::SelectBuildserverBranchMenu()
#define ERR_MESSAGE(text) \
constructMenuItem<makeComponent<MenuItem, StaticText<text>, DefaultFont, StaticColor<espgui::TFT_RED>, DummyAction>>(); \
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); \
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>(); \
return;
if (count_available_buildserver() < 1)
@@ -147,7 +147,7 @@ void SelectBuildserverBranchMenu::update()
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECT_BRANCH_CLEAR>, ClearBranchAction, StaticMenuItemIcon<&bobbyicons::reboot>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
Base::update();
}

4
main/screens/selectbuildservermenu.cpp
View File

@@ -7,12 +7,12 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <tftcolors.h>
#include <tftinterface.h>
// local includes
#include "buildserver.h"
#include "icons/back.h"
#include "newsettings.h"
#include "utils.h"
@@ -72,7 +72,7 @@ SelectBuildServerMenu::SelectBuildServerMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NOBUILDSERVERCONFIGURED>, DefaultFont, StaticColor<espgui::TFT_RED>, DummyAction>>();
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string SelectBuildServerMenu::text() const

4
main/screens/selectmodemenu.cpp
View File

@@ -3,7 +3,6 @@
// 3rdparty lib includes
#include <actions/multiaction.h>
#include <actions/popscreenaction.h>
#include <icons/back.h>
#include <textwithvaluehelper.h>
#include <actions/pushscreenaction.h>
@@ -22,6 +21,7 @@
#endif
#include "accessors/globalaccessors.h"
#include "mainmenu.h"
#include "icons/back.h"
namespace bobby {
@@ -75,7 +75,7 @@ SelectModeMenu::SelectModeMenu()
#ifdef FEATURE_JOYSTICK
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHEELCHAIR>, MultiAction<SetWheelchairModeAction, PopScreenAction>>>();
#endif
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string SelectModeMenu::text() const

14
main/screens/selectotabuildmenu.cpp
View File

@@ -6,16 +6,16 @@
#include <actions/pushscreenaction.h>
#include <espwifistack.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <tftcolors.h>
#include <tftinterface.h>
// local includes
#include "buildserver.h"
#include "screens/otamenu.h"
#include "globals.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "icons/back.h"
#include "newsettings.h"
#include "screens/otamenu.h"
#include "utils.h"
namespace bobby {
@@ -64,12 +64,12 @@ SelectBuildMenu::SelectBuildMenu()
if (buildserver::count_available_buildserver() < 1)
{
MESSAGE(TEXT_OTA_NOBUILDSERVERAVAILABLE);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
else if (configs.otaServerUrl.value().empty())
{
MESSAGE(TEXT_OTA_NOBUILDSERVERSELECTED);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
else
{
@@ -77,7 +77,7 @@ SelectBuildMenu::SelectBuildMenu()
if (staStatus != wifi_stack::WiFiStaStatus::CONNECTED)
{
MESSAGE(TEXT_OTA_NOCONNECTION);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
else
{
@@ -90,7 +90,7 @@ SelectBuildMenu::SelectBuildMenu()
auto hash = filename.substr(0, filename.length() - 4);
menuitem.setHash(hash);
menuitem.setUrl(serverUrl);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
else
{
@@ -141,7 +141,7 @@ void SelectBuildMenu::buildMenuFromJson()
menuitem.setHash(hash);
menuitem.setUrl(fmt::format(fmt::runtime(url_for_hashes), hash));
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void SelectBuildMenu::back()

4
main/screens/settingsmenu.cpp
View File

@@ -4,7 +4,6 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay_string.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
@@ -13,6 +12,7 @@
#include "globals.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "icons/bluetooth.h"
#include "icons/buzzer.h"
#include "icons/demos.h"
@@ -139,7 +139,7 @@ SettingsMenu::SettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CRASHMENU>, PushScreenAction<CrashMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ABOUT>, PushScreenAction<AboutMenu>, StaticMenuItemIcon<&bobbyicons::info>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT>, PushScreenAction<GitMenu>, StaticMenuItemIcon<&bobbyicons::git>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string SettingsMenu::text() const

4
main/screens/setupquickactionsmenu.cpp
View File

@@ -3,7 +3,6 @@
// 3rdparty lib includes
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <icons/back.h>
#include <textwithvaluehelper.h>
// local includes
@@ -11,6 +10,7 @@
#include "bobbyquickactions.h"
#include "changevaluedisplay_bobbyquickactions.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
namespace bobby {
@@ -48,7 +48,7 @@ SetupQuickActionsMenu::SetupQuickActionsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SETUPEXTRA2, QuickActionExtra2Accessor>, PushScreenAction<QuickActionChangeValueDisplay<BobbyQuickActions, TEXT_SETUPEXTRA2, QuickActionExtra2Accessor>>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SETUPEXTRA3, QuickActionExtra3Accessor>, PushScreenAction<QuickActionChangeValueDisplay<BobbyQuickActions, TEXT_SETUPEXTRA3, QuickActionExtra3Accessor>>>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SETUPEXTRA4, QuickActionExtra4Accessor>, PushScreenAction<QuickActionChangeValueDisplay<BobbyQuickActions, TEXT_SETUPEXTRA4, QuickActionExtra4Accessor>>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string SetupQuickActionsMenu::text() const

4
main/screens/statisticsmenu.cpp
View File

@@ -5,11 +5,11 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <menuitem.h>
// local includes
#include "drivingstatistics.h"
#include "icons/back.h"
#include "icons/reboot.h"
#include "icons/time.h"
#include "icons/update.h"
@@ -188,7 +188,7 @@ StatisticsMenu::StatisticsMenu()
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSSAVE>, SaveKilometersAction, StaticMenuItemIcon<&bobbyicons::update>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSCLEAR>, ClearCurrentStatsAction, StaticMenuItemIcon<&bobbyicons::reboot>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string StatisticsMenu::text() const

4
main/screens/taskmanagermenu.cpp
View File

@@ -4,10 +4,10 @@
#include <actions/dummyaction.h>
#include <actions/popscreenaction.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <schedulertask.h>
// local includes
#include "icons/back.h"
#include "taskmanager.h"
namespace bobby {
@@ -39,7 +39,7 @@ TaskmanagerMenu::TaskmanagerMenu()
{
for (const auto &task : schedulerTasks)
constructMenuItem<makeComponentArgs<MenuItem, TaskText, DummyAction>>(task);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string TaskmanagerMenu::text() const

4
main/screens/tempomatmodesettingsmenu.cpp
View File

@@ -4,7 +4,6 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <textwithvaluehelper.h>
@@ -14,6 +13,7 @@
#include "actions/tempomatmodeapplycurrentpeedaction.h"
#include "changevaluedisplay_unifiedmodelmode.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "utils.h"
namespace bobby {
@@ -49,7 +49,7 @@ TempomatModeSettingsMenu::TempomatModeSettingsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_APPLY, AvgSpeedAccessor>, TempomatModeApplyCurrentSpeedAction>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_NCRUISEMOTTGT, TempomatModeCruiseMotTgtAccessor>, PushScreenAction<TempomatModeModelModeChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODELMODE>, PushScreenAction<TempomatModeModelModeChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string TempomatModeSettingsMenu::text() const

4
main/screens/timersmenu.cpp
View File

@@ -4,11 +4,11 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "icons/back.h"
#include "screens/boardcomputerhardwaresettingsmenu.h"
namespace bobby {
@@ -31,7 +31,7 @@ TimersMenu::TimersMenu()
{
using namespace espgui;
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSUPDATERATE>, espgui::PushScreenAction<StatsUpdateRateChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, espgui::PushScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, espgui::PushScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string TimersMenu::text() const

6
main/screens/timesettingsmenu.cpp
View File

@@ -13,14 +13,14 @@
#include <espchrono.h>
#include <espstrutils.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <sunset.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "screens/settingsmenu.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "screens/settingsmenu.h"
#include "utils.h"
namespace bobby {
@@ -136,7 +136,7 @@ TimeSettingsMenu::TimeSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NTPINTERVAL>, PushScreenAction<TimeSyncIntervalChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, NtpSyncStatusText, DummyAction>>();
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string TimeSettingsMenu::text() const

6
main/screens/typesafeenumchangemenu.h
View File

@@ -6,12 +6,12 @@
#include <actions/pushscreenaction.h>
#include <configwrapper.h>
#include <fmt/core.h>
#include <icons/back.h>
// local includes
#include "guihelpers/bobbymenudisplay.h"
#include "globals.h"
#include "guihelpers/bobbyerrorhandler.h"
#include "guihelpers/bobbymenudisplay.h"
#include "icons/back.h"
namespace bobby {
@@ -74,7 +74,7 @@ public:
iterateEnum<TEnum>::iterate([&](TEnum enum_value, const auto &string_value){
constructMenuItem<TypesafeEnumSetterMenuItem<TEnum>>(enum_value, m_config);
});
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string text() const override

14
main/screens/udpcloudsettingsmenu.cpp
View File

@@ -1,17 +1,17 @@
#include "udpcloudsettingsmenu.h"
// 3rdparty lib includes
#include "actions/popscreenaction.h"
#include "actions/pushscreenaction.h"
#include "changevaluedisplay_string.h"
#include "fmt/core.h"
#include "icons/back.h"
#include "menuitem.h"
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay_string.h>
#include <fmt/core.h>
#include <menuitem.h>
// local includes
#include "accessors/settingsaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
namespace bobby {
@@ -56,7 +56,7 @@ UdpCloudSettingsMenu::UdpCloudSettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UDPSENDRATE>, PushScreenAction<UdpCloudSendRateChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UDPHOST>, PushScreenAction<UdpCloudHostChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UDPPORT>, PushScreenAction<UdpCloudPortChangeDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string UdpCloudSettingsMenu::text() const

4
main/screens/wifiapclientsmenu.cpp
View File

@@ -12,11 +12,11 @@
#include <espwifistack.h>
#include <espwifiutils.h>
#include <fmt/format.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
// local includes
#include "icons/back.h"
#include "wifiapsettingsmenu.h"
#include "wifiguiutils.h"
@@ -53,7 +53,7 @@ private:
WifiApClientsMenu::WifiApClientsMenu() :
espgui::ChangeableText{"AP Clients"s}
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
void WifiApClientsMenu::back()

4
main/screens/wifiapsettingsmenu.cpp
View File

@@ -8,7 +8,6 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <espwifistack.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
#include <textwithvaluehelper.h>
@@ -21,6 +20,7 @@
#include "changevaluedisplay_wifi_auth_mode_t.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "networksettingsmenu.h"
#include "texthelpers/wifiaptexthelpers.h"
#include "wifiapclientsmenu.h"
@@ -119,7 +119,7 @@ WifiApSettingsMenu::WifiApSettingsMenu()
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_AUTHMODE_FORMATTED, WifiApAuthmodeAccessor>, PushScreenAction<ApAuthmodeChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, WifiApHostnameText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, WifiApClientsText, WifiApClientsAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiApSettingsMenu::text() const

4
main/screens/wifistaconfigentrymenu.cpp
View File

@@ -7,7 +7,6 @@
#include <changevaluedisplay.h>
#include <changevaluedisplay_ip_address_t.h>
#include <changevaluedisplay_string.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
#include <textwithvaluehelper.h>
@@ -16,6 +15,7 @@
#include "accessors/wifistaconfigaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "newsettings.h"
#include "wifistaconfigsmenu.h"
@@ -126,7 +126,7 @@ WifiStaConfigEntryMenu::WifiStaConfigEntryMenu(int index) :
constructMenuItem<StaStaticDns1MenuItem>(index);
constructMenuItem<StaStaticDns2MenuItem>(index);
constructMenuItem<makeComponentArgs<MenuItem, ClearConfigAction, StaticText<TEXT_DELETECONFIG>>>(index);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiStaConfigEntryMenu::text() const

4
main/screens/wifistaconfigsmenu.cpp
View File

@@ -6,12 +6,12 @@
#include <actions/pushscreenaction.h>
#include <espwifistack.h>
#include <fmt/core.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
#include <strutils.h>
// local includes
#include "icons/back.h"
#include "newsettings.h"
#include "wifistaconfigentrymenu.h"
#include "wifistasettingsmenu.h"
@@ -40,7 +40,7 @@ WifiStaConfigsMenu::WifiStaConfigsMenu()
{
for (int i = 0; i < configs.wifi_configs.size(); i++)
constructMenuItem<WifiStaConfigurationMenuItem>(i);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiStaConfigsMenu::text() const

4
main/screens/wifistascanentrymenu.cpp
View File

@@ -12,13 +12,13 @@
#include <actions/pushscreenaction.h>
#include <espwifiutils.h>
#include <fmt/format.h>
#include <icons/back.h>
#include <menuitem.h>
#include <richtextrenderer.h>
#include <screenmanager.h>
#include <strutils.h>
// local includes
#include "icons/back.h"
#include "newsettings.h"
#include "wifiguiutils.h"
#include "wifistaconfigentrymenu.h"
@@ -100,7 +100,7 @@ WifiStaScanEntryMenu::WifiStaScanEntryMenu(const wifi_ap_record_t &info) :
default: return std::to_string(m_info.country.policy);
}
}()));
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiStaScanEntryMenu::text() const

4
main/screens/wifistascanmenu.cpp
View File

@@ -9,7 +9,6 @@
#include <espwifistack.h>
#include <espwifiutils.h>
#include <fmt/format.h>
#include <icons/back.h>
#include <menuitem.h>
#include <richtextrenderer.h>
#include <screenmanager.h>
@@ -18,6 +17,7 @@
// local includes
#include "actions/wifistascanaction.h"
#include "actions/wifistascanclearaction.h"
#include "icons/back.h"
#include "newsettings.h"
#include "wifiguiutils.h"
#include "wifistascanentrymenu.h"
@@ -52,7 +52,7 @@ WifiStaScanMenu::WifiStaScanMenu()
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STARTSCAN>, WifiStaScanAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLEARRESULTS>, WifiStaScanClearAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiStaScanMenu::text() const

4
main/screens/wifistasettingsmenu.cpp
View File

@@ -5,7 +5,6 @@
#include <actions/popscreenaction.h>
#include <actions/pushscreenaction.h>
#include <changevaluedisplay.h>
#include <icons/back.h>
#include <menuitem.h>
#include <screenmanager.h>
#include <textwithvaluehelper.h>
@@ -14,6 +13,7 @@
#include "accessors/wifistaconfigaccessors.h"
#include "guihelpers/bobbychangevaluedisplay.h"
#include "guihelpers/bobbycheckbox.h"
#include "icons/back.h"
#include "texthelpers/wifistatexthelpers.h"
#include "wifistaconfigsmenu.h"
#include "wifistascanmenu.h"
@@ -58,7 +58,7 @@ WifiStaSettingsMenu::WifiStaSettingsMenu()
constructMenuItem<makeComponent<MenuItem, WifiStaIpv6LinklocalText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, WifiStaIpv6GlobalText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_MIN_RSSI_FORMATTED, WifiStaMinRssiAccessor>, PushScreenAction<StaMinRssiChangeScreen>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&bobbyicons::back>>>();
}
std::string WifiStaSettingsMenu::text() const