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

Cleanups after rebase

Browse Source
This commit is contained in:
0xFEEDC0DE64
2020-06-01 02:27:19 +02:00
parent c52fa6fda6
commit d9038a1325
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/displays/menus/settingsmenu.h
View File

@ -32,7 +32,6 @@ class MainMenu;
}
namespace {
#ifdef GLUMP_CONTROLLER
class SettingsMenu;
using BluetoothModeChangeDisplay = makeComponent<
ChangeValueDisplay<BluetoothMode>,
@ -42,6 +41,7 @@ using BluetoothModeChangeDisplay = makeComponent<
SwitchScreenAction<SettingsMenu>
>;
#ifdef GLUMP_CONTROLLER
struct FrontLedAccessor : public RefAccessor<bool> { bool &getRef() const override { return front.command.led; } };
struct BackLedAccessor : public RefAccessor<bool> { bool &getRef() const override { return back.command.led; } };
#endif
@ -59,7 +59,6 @@ class SettingsMenu :
#endif
makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>, SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&icons::hardware>>,
makeComponent<MenuItem, StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>, SwitchScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&icons::hardware>>,
#endif
makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHMODE>, SwitchScreenAction<BluetoothModeChangeDisplay>>,
#ifdef FEATURE_BMS
makeComponent<MenuItem, StaticText<TEXT_AUTOCONNECTBMS>, ToggleBoolAction, CheckboxIcon, AutoConnectBmsAccessor>,

10
src/displays/statusdisplay.h
View File

@ -168,17 +168,11 @@ void StatusDisplay::initScreen()
m_labelLimit0.start();
tft.drawString("IP:", 0, bottomLines[1]);
m_labelIpAddress.start();
<<<<<<< HEAD
#ifdef GLUMP_CONTROLLER
tft.drawString("Limit1:", 160, bottomLines[1]);
m_labelLimit1.start();
tft.drawString("Performance:", 0, bottomLines[2]);
=======
#ifdef GLUMP_CONTROLLER
tft.drawString("Limit1:", 160, 281);
m_labelLimit1.start();
#endif
tft.drawString("Performance:", 0, 296);
>>>>>>> b343056... vesc control
tft.drawString("Performance:", 0, bottomLines[2]);
m_labelPerformance.start();
tft.drawString("Mode:", 125, bottomLines[2]);
m_labelMode.start();