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

fix compiling

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-10-13 12:04:07 +02:00
parent acb56100d6
commit 2cc1ca6ab7
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
main/displays/menus/selectbatterytypemenu.h
View File

@ -20,30 +20,13 @@ namespace {
class BatteryTypeMenu; class BatteryTypeMenu;
class BatteryMenu; class BatteryMenu;
class BatterySelectType22PAction : public virtual ActionInterface template<BatteryCellType T>
class BatterySelectTypeAction : public virtual ActionInterface
{ {
public: public:
void triggered() override { settings.battery.cellType = BATTERY_CELLTYPE_22P; saveSettings(); } void triggered() override { settings.battery.cellType = uint8_t(T); saveSettings(); }
}; };
} // namespace
class BatterySelectTypeHG2Action : public virtual ActionInterface
{
public:
void triggered() override { settings.battery.cellType = BATTERY_CELLTYPE_HG2; saveSettings(); }
};
class BatterySelectTypeMH1Action : public virtual ActionInterface
{
public:
void triggered() override { settings.battery.cellType = BATTERY_CELLTYPE_MH1; saveSettings(); }
};
class BatterySelectTypeVTC5Action : public virtual ActionInterface
{
public:
void triggered() override { settings.battery.cellType = BATTERY_CELLTYPE_VTC5; saveSettings(); }
};
}
namespace { namespace {
class BatteryTypeMenu : class BatteryTypeMenu :
@ -55,10 +38,10 @@ namespace {
BatteryTypeMenu() BatteryTypeMenu()
{ {
constructMenuItem<makeComponent<MenuItem, currentBatteryType, DisabledColor, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, currentBatteryType, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_22P>, BatterySelectType22PAction>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_22P>, BatterySelectTypeAction<BatteryCellType::_22P>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_HG2>, BatterySelectTypeHG2Action>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_HG2>, BatterySelectTypeAction<BatteryCellType::HG2>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_MH1>, BatterySelectTypeMH1Action>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_MH1>, BatterySelectTypeAction<BatteryCellType::MH1>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_VTC5>, BatterySelectTypeVTC5Action>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_TYPE_VTC5>, BatterySelectTypeAction<BatteryCellType::VTC5>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
} }
}; };