fix building
This commit is contained in:
@@ -13,16 +13,7 @@ using namespace espgui;
|
|||||||
|
|
||||||
GarageMenu::GarageMenu()
|
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()
|
void GarageMenu::back()
|
||||||
|
@@ -18,11 +18,7 @@ public:
|
|||||||
SendEspNowMessageAction(uint8_t index) : m_index{index} {}
|
SendEspNowMessageAction(uint8_t index) : m_index{index} {}
|
||||||
void triggered() override
|
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:
|
private:
|
||||||
uint8_t m_index;
|
uint8_t m_index;
|
||||||
|
@@ -61,6 +61,8 @@ StringSettings makeDefaultStringSettings()
|
|||||||
.otaServerBranch = {},
|
.otaServerBranch = {},
|
||||||
#endif
|
#endif
|
||||||
.webserver_password = {},
|
.webserver_password = {},
|
||||||
|
.esp_now_door_id = {},
|
||||||
|
.esp_now_door_token = {}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
} // namespace presets
|
} // namespace presets
|
||||||
|
@@ -58,12 +58,8 @@ struct StringSettings
|
|||||||
std::string webserver_password;
|
std::string webserver_password;
|
||||||
|
|
||||||
#ifdef FEATURE_ESPNOW
|
#ifdef FEATURE_ESPNOW
|
||||||
struct ConfiguredWirelessDoors {
|
std::string esp_now_door_id;
|
||||||
std::string doorId;
|
std::string esp_now_door_token;
|
||||||
std::string doorToken;
|
|
||||||
};
|
|
||||||
|
|
||||||
std::array<ConfiguredWirelessDoors, 5> wirelessDoors;
|
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -141,17 +137,9 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
|
|||||||
callable("webpw", webserver_password);
|
callable("webpw", webserver_password);
|
||||||
|
|
||||||
#ifdef FEATURE_ESPNOW
|
#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
|
#endif
|
||||||
|
callable("espnow_doorId", esp_now_door_id);
|
||||||
|
callable("espnow_doorToken", esp_now_door_token);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
Reference in New Issue
Block a user