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

Merge pull request #209 from bobbycar-graz/cleanup

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-01 17:39:43 +01:00
committed by GitHub
parent 048e1d9482 ba92deb4a9
commit e5ac773e39
2 changed files with 72 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
main/displays/menus/extrabuttoncalibratemenu.cpp
View File

@@ -49,7 +49,10 @@ public:
int color() const override int color() const override
{ {
return (status == currentStatus || currentStatus == Idle) ? TFT_WHITE : color565(50,50,50); if ((status == currentStatus) || (currentStatus == Idle))
return TFT_WHITE;
else
return color565(50,50,50);
} }
std::string text() const override std::string text() const override
@@ -90,11 +93,6 @@ void ExtraButtonCalibrateMenu::start()
currentStatus = Idle; currentStatus = Idle;
} }
void ExtraButtonCalibrateMenu::update()
{
Base::update();
}
void ExtraButtonCalibrateMenu::stop() void ExtraButtonCalibrateMenu::stop()
{ {
Base::stop(); Base::stop();
@@ -113,9 +111,7 @@ void ExtraButtonCalibrateMenu::rawButtonPressed(uint8_t button)
{ {
Base::rawButtonPressed(button); Base::rawButtonPressed(button);
} }
else else if (validateNewButton(button))
{
if (validateNewButton(button))
{ {
ESP_LOGI(TAG, "Valid new button: %i", button); ESP_LOGI(TAG, "Valid new button: %i", button);
switch(currentStatus) switch(currentStatus)
@@ -186,15 +182,6 @@ void ExtraButtonCalibrateMenu::rawButtonPressed(uint8_t button)
ESP_LOGE(TAG, "Invalid new button: %i", button); ESP_LOGE(TAG, "Invalid new button: %i", button);
currentStatus = Idle; currentStatus = Idle;
} }
}
}
void ExtraButtonCalibrateMenu::rawButtonReleased(uint8_t button)
{
// if (currentStatus == Idle)
// {
// Base::rawButtonReleased(button);
// }
} }
void ExtraButtonCalibrateMenu::buttonPressed(espgui::Button button) void ExtraButtonCalibrateMenu::buttonPressed(espgui::Button button)
@@ -217,14 +204,6 @@ void ExtraButtonCalibrateMenu::buttonPressed(espgui::Button button)
} }
} }
void ExtraButtonCalibrateMenu::buttonReleased(espgui::Button button)
{
// if (currentStatus == Idle)
// {
// Base::buttonReleased(button);
// }
}
std::string ExtraButtonCalibrateMenu::text() const std::string ExtraButtonCalibrateMenu::text() const
{ {
return TEXT_EXTRABUTTONCALIBRATEMENU; return TEXT_EXTRABUTTONCALIBRATEMENU;
@@ -238,9 +217,9 @@ void ExtraButtonCalibrateMenu::back()
bool ExtraButtonCalibrateMenu::validateNewButton(uint8_t button) bool ExtraButtonCalibrateMenu::validateNewButton(uint8_t button)
{ {
return ( return (
button != configs.dpadMappingDown.value && (button != configs.dpadMappingDown.value) &&
button != configs.dpadMappingUp.value && (button != configs.dpadMappingUp.value) &&
button != configs.dpadMappingLeft.value && (button != configs.dpadMappingLeft.value) &&
button != configs.dpadMappingRight.value (button != configs.dpadMappingRight.value)
); );
} }

3
main/displays/menus/extrabuttoncalibratemenu.h
View File

@@ -30,13 +30,10 @@ public:
void back() override; void back() override;
void start() override; void start() override;
void update() override;
void stop() override; void stop() override;
void rawButtonPressed(uint8_t button) override; void rawButtonPressed(uint8_t button) override;
void rawButtonReleased(uint8_t button) override;
void buttonPressed(espgui::Button button) override; void buttonPressed(espgui::Button button) override;
void buttonReleased(espgui::Button button) override;
private: private:
ModeInterface *m_oldMode; ModeInterface *m_oldMode;