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

fix building

Browse Source
This commit is contained in:
Peter Poetzi
2021-12-29 05:13:28 +01:00
parent 65a77fee44
commit 16b81ee300
4 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/displays/menus/garagenmenu.cpp
View File

@@ -13,16 +13,7 @@ using namespace espgui;
GarageMenu::GarageMenu()
{
for (uint8_t index = 0; index < stringSettings.wirelessDoors.size(); index++)
{
const auto &wirelessDoor = stringSettings.wirelessDoors[index];
if (wirelessDoor.doorId.empty() || wirelessDoor.doorToken.empty())
continue;
auto &menuitem = constructMenuItem<makeComponentArgs<MenuItem, garagenmenu::SendEspNowMessageAction, ChangeableText>>(index);
menuitem.setTitle(wirelessDoor.doorId);
}
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
}
void GarageMenu::back()

6
main/displays/menus/garagenmenu.h
View File

@@ -18,11 +18,7 @@ public:
SendEspNowMessageAction(uint8_t index) : m_index{index} {}
void triggered() override
{
if (const auto error = espnow::send_espnow_message(fmt::format("BOBBYOPEN:{}:{}", stringSettings.wirelessDoors[m_index].doorId, stringSettings.wirelessDoors[m_index].doorToken)); error != ESP_OK)
{
ESP_LOGE("BOBBY", "send_espnow_message() failed with: %s", esp_err_to_name(error));
return;
}
}
private:
uint8_t m_index;

2
main/presets.cpp
View File

@@ -61,6 +61,8 @@ StringSettings makeDefaultStringSettings()
.otaServerBranch = {},
#endif
.webserver_password = {},
.esp_now_door_id = {},
.esp_now_door_token = {}
};
}
} // namespace presets

20
main/stringsettings.h
View File

@@ -58,12 +58,8 @@ struct StringSettings
std::string webserver_password;
#ifdef FEATURE_ESPNOW
struct ConfiguredWirelessDoors {
std::string doorId;
std::string doorToken;
};
std::array<ConfiguredWirelessDoors, 5> wirelessDoors;
std::string esp_now_door_id;
std::string esp_now_door_token;
#endif
};
@@ -141,17 +137,9 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
callable("webpw", webserver_password);
#ifdef FEATURE_ESPNOW
callable("doorId0", wirelessDoors[0].doorId);
callable("doorToken0", wirelessDoors[0].doorToken);
callable("doorId1", wirelessDoors[1].doorId);
callable("doorToken1", wirelessDoors[1].doorToken);
callable("doorId2", wirelessDoors[2].doorId);
callable("doorToken2", wirelessDoors[2].doorToken);
callable("doorId3", wirelessDoors[3].doorId);
callable("doorToken3", wirelessDoors[3].doorToken);
callable("doorId4", wirelessDoors[4].doorId);
callable("doorToken4", wirelessDoors[4].doorToken);
#endif
callable("espnow_doorId", esp_now_door_id);
callable("espnow_doorToken", esp_now_door_token);
}
template<typename T>