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

cleanups

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

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

@ -49,7 +49,10 @@ public:
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
@ -90,11 +93,6 @@ void ExtraButtonCalibrateMenu::start()
currentStatus = Idle;
}
void ExtraButtonCalibrateMenu::update()
{
Base::update();
}
void ExtraButtonCalibrateMenu::stop()
{
Base::stop();
@ -113,88 +111,77 @@ void ExtraButtonCalibrateMenu::rawButtonPressed(uint8_t button)
{
Base::rawButtonPressed(button);
}
else
else if (validateNewButton(button))
{
if (validateNewButton(button))
ESP_LOGI(TAG, "Valid new button: %i", button);
switch(currentStatus)
{
ESP_LOGI(TAG, "Valid new button: %i", button);
switch(currentStatus)
case WaitingUp2:
if (auto result = configs.write_config(configs.dpadMappingUp2, button); !result)
{
case WaitingUp2:
if (auto result = configs.write_config(configs.dpadMappingUp2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingDown2:
if (auto result = configs.write_config(configs.dpadMappingDown2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingLeft2:
if (auto result = configs.write_config(configs.dpadMappingLeft2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingRight2:
if (auto result = configs.write_config(configs.dpadMappingRight2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile0:
if (auto result = configs.write_config(configs.dpadMappingProfile0, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile1:
if (auto result = configs.write_config(configs.dpadMappingProfile1, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile2:
if (auto result = configs.write_config(configs.dpadMappingProfile2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile3:
if (auto result = configs.write_config(configs.dpadMappingProfile3, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
default:
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
currentStatus = Idle;
}
else
{
ESP_LOGE(TAG, "Invalid new button: %i", button);
currentStatus = Idle;
break;
case WaitingDown2:
if (auto result = configs.write_config(configs.dpadMappingDown2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingLeft2:
if (auto result = configs.write_config(configs.dpadMappingLeft2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingRight2:
if (auto result = configs.write_config(configs.dpadMappingRight2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile0:
if (auto result = configs.write_config(configs.dpadMappingProfile0, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile1:
if (auto result = configs.write_config(configs.dpadMappingProfile1, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile2:
if (auto result = configs.write_config(configs.dpadMappingProfile2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
case WaitingProfile3:
if (auto result = configs.write_config(configs.dpadMappingProfile3, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
break;
}
break;
default:
break;
}
currentStatus = Idle;
}
else
{
ESP_LOGE(TAG, "Invalid new button: %i", button);
currentStatus = Idle;
}
}
void ExtraButtonCalibrateMenu::rawButtonReleased(uint8_t button)
{
// if (currentStatus == Idle)
// {
// Base::rawButtonReleased(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
{
return TEXT_EXTRABUTTONCALIBRATEMENU;
@ -238,9 +217,9 @@ void ExtraButtonCalibrateMenu::back()
bool ExtraButtonCalibrateMenu::validateNewButton(uint8_t button)
{
return (
button != configs.dpadMappingDown.value &&
button != configs.dpadMappingUp.value &&
button != configs.dpadMappingLeft.value &&
button != configs.dpadMappingRight.value
(button != configs.dpadMappingDown.value) &&
(button != configs.dpadMappingUp.value) &&
(button != configs.dpadMappingLeft.value) &&
(button != configs.dpadMappingRight.value)
);
}

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

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