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

Added button control

Browse Source
This commit is contained in:
CommanderRedYT
2022-06-12 20:56:29 +02:00
parent 0cf28d961a
commit 0fab6e72e1
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/bobbybuttons.h
View File

@ -21,7 +21,8 @@ enum BobbyButton
Extra3,
Extra4,
Confirm = espgui::Button::Right,
Back = espgui::Button::Left
Back = espgui::Button::Left,
ButtonMax = Back
};
[[nodiscard]] std::optional<espgui::Button> translateRawButton(uint8_t button);

58
main/cloud.cpp
View File

@ -983,6 +983,64 @@ void cloudEventHandler(void *event_handler_arg, esp_event_base_t event_base, int
{
send_ota_status();
}
else if (type == "rawBtnPrssd")
{
uint8_t button;
JsonVariant btn_id = doc["btn"];
if (btn_id.isNull())
{
ESP_LOGE(TAG, "btnPressed: btn is null");
return;
}
if (auto parsed = cpputils::fromString<decltype(button)>(btn_id.as<std::string>()))
{
button = *parsed;
}
else
{
ESP_LOGE(TAG, "btnPressed: btn is not a number");
return;
}
if (!espgui::currentDisplay)
{
ESP_LOGW(TAG, "espgui::currentDisplay is null");
return;
}
espgui::currentDisplay->rawButtonPressed(button);
espgui::currentDisplay->rawButtonReleased(button);
}
else if (type == "btnPressed")
{
espgui::Button button;
JsonVariant btn_id = doc["btn"];
if (btn_id.isNull())
{
ESP_LOGE(TAG, "btnPressed: btn is null");
return;
}
if (auto parsed = cpputils::fromString<std::underlying_type_t<espgui::Button>>(btn_id.as<std::string>()))
{
button = espgui::Button(*parsed);
}
else
{
ESP_LOGE(TAG, "btnPressed: btn is not a number");
return;
}
if (!espgui::currentDisplay)
{
ESP_LOGW(TAG, "espgui::currentDisplay is null");
return;
}
espgui::currentDisplay->buttonPressed(button);
espgui::currentDisplay->buttonReleased(button);
}
else
{
ESP_LOGE(TAG, "unknown type: %s", type.c_str());