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

String inputs in webserver implemented

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-30 00:00:31 +01:00
parent 68e8c9ea4a
commit 81701b4096
10 changed files with 367 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/displays/lockscreen.cpp
View File

@ -8,9 +8,9 @@
#include "globals.h"
#include "utils.h"
#include "texts.h"
#include "buttons.h"
#include "displays/menus/mainmenu.h"
#include "displays/calibratedisplay.h"
#include "bobbybuttons.h"
void Lockscreen::start()
{
@ -24,7 +24,6 @@ void Lockscreen::start()
m_oldMode = currentMode;
currentMode = &m_mode;
profileButtonDisabled = !settings.lockscreen.allowPresetSwitch;
isLocked = true;
if (settings.lockscreen.keepLockedAfterReboot && !settings.lockscreen.locked)
{
@ -71,9 +70,6 @@ void Lockscreen::initScreen()
void Lockscreen::update()
{
Base::update();
// just in case someone changes that settings somehow
profileButtonDisabled = !settings.lockscreen.allowPresetSwitch;
}
void Lockscreen::redraw()
@ -147,7 +143,6 @@ void Lockscreen::stop()
currentMode = m_oldMode;
}
profileButtonDisabled = false;
isLocked = false;
if (!(!gas || !brems || *gas > 200.f || *brems > 200.f))
{
@ -161,6 +156,8 @@ void Lockscreen::stop()
void Lockscreen::buttonPressed(espgui::Button button)
{
if (settings.lockscreen.allowPresetSwitch ||
!cpputils::is_in(button, BobbyButton::Profile0, BobbyButton::Profile1, BobbyButton::Profile2, BobbyButton::Profile3))
Base::buttonPressed(button);
switch (button)