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

Add action to delete wifi config

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 02:36:14 +01:00
parent 3f6eeca8d6
commit 6ce5ca3927
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/displays/menus/wifiapclientsmenu.cpp
View File

@ -23,7 +23,7 @@ using namespace std::string_literals;
using namespace espgui;
namespace {
constexpr const char * const TAG = "GOE";
constexpr const char * const TAG = "BOBBY";
constexpr char TEXT_BACK[] = "Back";

2
main/displays/menus/wifiapsettingsmenu.cpp
View File

@ -22,7 +22,7 @@
using namespace espgui;
namespace {
constexpr const char * const TAG = "GOE";
constexpr const char * const TAG = "BOBBY";
constexpr char TEXT_ENABLED[] = "Enabled";
constexpr char TEXT_DISABLEWHENONLINE[] = "Disable when online";

31
main/displays/menus/wifistaconfigentrymenu.cpp
View File

@ -13,13 +13,26 @@
#include "texthelpers/wifistaconfigtexthelpers.h"
#include "accessors/wifistaconfigaccessors.h"
#include "wifistaconfigsmenu.h"
#include "newsettings.h"
using namespace espgui;
namespace {
constexpr char TEXT_USESTATICIP[] = "Use Static Ip";
constexpr char TEXT_USESTATICDNS[] = "Use Static Dns";
constexpr char TEXT_DELETECONFIG[] = "Delete config";
constexpr char TEXT_BACK[] = "Back";
class ClearConfigAction : public virtual espgui::ActionInterface
{
public:
explicit ClearConfigAction(int index) : m_index{index} {}
void triggered() override;
private:
const int m_index;
};
} // namespace
WifiStaConfigEntryMenu::WifiStaConfigEntryMenu(int index) :
@ -35,6 +48,7 @@ WifiStaConfigEntryMenu::WifiStaConfigEntryMenu(int index) :
constructMenuItem<makeComponentArgs<MenuItem, WifiStaConfigStaticDns0Text, DummyAction>>(index);
constructMenuItem<makeComponentArgs<MenuItem, WifiStaConfigStaticDns1Text, DummyAction>>(index);
constructMenuItem<makeComponentArgs<MenuItem, WifiStaConfigStaticDns2Text, DummyAction>>(index);
constructMenuItem<makeComponentArgs<MenuItem, ClearConfigAction, StaticText<TEXT_DELETECONFIG>>>(index);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<WifiStaConfigsMenu>, StaticMenuItemIcon<&icons::back>>>();
}
@ -47,3 +61,20 @@ void WifiStaConfigEntryMenu::back()
{
switchScreen<WifiStaConfigsMenu>();
}
namespace {
void ClearConfigAction::triggered()
{
auto &config = configs.wifi_configs[m_index];
configs.reset_config(config.ssid);
configs.reset_config(config.key);
configs.reset_config(config.useStaticIp);
configs.reset_config(config.staticIp);
configs.reset_config(config.staticSubnet);
configs.reset_config(config.staticGateway);
configs.reset_config(config.useStaticDns);
configs.reset_config(config.staticDns0);
configs.reset_config(config.staticDns1);
configs.reset_config(config.staticDns2);
}
} // namespace