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

Fixed compiling

Browse Source
This commit is contained in:
CommanderRedYT
2021-11-14 14:40:38 +01:00
parent bce722eec0
commit b81afae5be
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/displays/menus/wifisettingsmenu.cpp
View File

@ -14,18 +14,22 @@
using namespace espgui; using namespace espgui;
#ifdef FEATURE_DNS_NS
class ResendDNSRequest : public virtual ActionInterface class ResendDNSRequest : public virtual ActionInterface
{ {
public: public:
void triggered() override { dns_lastIpAddress_v4 = "---"; dns_lastIpAddress_v6 = "---"; dns_lastIpAddress_v6_global = "---"; } void triggered() override { dns_lastIpAddress_v4 = "---"; dns_lastIpAddress_v6 = "---"; dns_lastIpAddress_v6_global = "---"; }
}; };
#endif
WifiSettingsMenu::WifiSettingsMenu() WifiSettingsMenu::WifiSettingsMenu()
{ {
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GENERICWIFISETTINGS>, SwitchScreenAction<GenericWifiSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GENERICWIFISETTINGS>, SwitchScreenAction<GenericWifiSettingsMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATIONWIFISETTINGS>, SwitchScreenAction<StationWifiSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATIONWIFISETTINGS>, SwitchScreenAction<StationWifiSettingsMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ACCESSPOINTWIFISETTINGS>, SwitchScreenAction<AccessPointWifiSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ACCESSPOINTWIFISETTINGS>, SwitchScreenAction<AccessPointWifiSettingsMenu>>>();
#ifdef FEATURE_DNS_NS
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESEND_DNS>, ResendDNSRequest>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESEND_DNS>, ResendDNSRequest>>();
#endif
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
} }

4
main/stringsettings.h
View File

@ -43,6 +43,8 @@ struct StringSettings
std::array<ConfiguredOtaServer, 5> otaServers; std::array<ConfiguredOtaServer, 5> otaServers;
std::string otaServerUrl; std::string otaServerUrl;
#endif
#ifdef FEATURE_DNS_NS
std::string dns_key; std::string dns_key;
#endif #endif
}; };
@ -109,7 +111,9 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
callable("otaserver", otaServerUrl); callable("otaserver", otaServerUrl);
#endif #endif
#ifdef FEATURE_DNS_NS
callable("dnskey", dns_key); callable("dnskey", dns_key);
#endif
} }
template<typename T> template<typename T>