From 5eac6fd67179f304f13b9522917f640e5bd43847 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Wed, 25 May 2022 03:10:56 +0200
Subject: [PATCH] Added hidden ssid parameter

---
 main/accessors/wifiapconfigaccessors.h     | 1 +
 main/displays/menus/wifiapsettingsmenu.cpp | 2 ++
 main/newsettings.h                         | 2 ++
 main/wifi_bobbycar.cpp                     | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/accessors/wifiapconfigaccessors.h b/main/accessors/wifiapconfigaccessors.h
index c7d8b2c..6a5e0d2 100644
--- a/main/accessors/wifiapconfigaccessors.h
+++ b/main/accessors/wifiapconfigaccessors.h
@@ -12,3 +12,4 @@ struct WifiApIpAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> {
 struct WifiApMaskAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> { ConfigWrapper<wifi_stack::ip_address_t> &getConfig() const override { return configs.wifiApMask; } };
 struct WifiApChannelAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.wifiApChannel; } };
 struct WifiApAuthmodeAccessor : public NewSettingsAccessor<wifi_auth_mode_t> { ConfigWrapper<wifi_auth_mode_t> &getConfig() const override { return configs.wifiApAuthmode; } };
+struct WiFiApHiddenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiApHidden; } };
diff --git a/main/displays/menus/wifiapsettingsmenu.cpp b/main/displays/menus/wifiapsettingsmenu.cpp
index 8dd8928..28ac7bd 100644
--- a/main/displays/menus/wifiapsettingsmenu.cpp
+++ b/main/displays/menus/wifiapsettingsmenu.cpp
@@ -46,6 +46,7 @@ constexpr char TEXT_CHANNEL[] = "AP Channel";
 constexpr char TEXT_CHANNEL_FORMATTED[] = "&sChannel: &f";
 constexpr char TEXT_AUTHMODE[] = "AP Authmode";
 constexpr char TEXT_AUTHMODE_FORMATTED[] = "&sAuthmode: ";
+constexpr char TEXT_HIDDEN[] = "AP Hidden";
 
 class WifiApClientsAction : public virtual ActionInterface
 {
@@ -106,6 +107,7 @@ WifiApSettingsMenu::WifiApSettingsMenu()
 {
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLED>,            BobbyCheckbox, WifiApEnabledAccessor>>();
   //constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DISABLEWHENONLINE>,  BobbyCheckbox, WifiApDisableWhenOnlineAccessor>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_HIDDEN>,             BobbyCheckbox, WiFiApHiddenAccessor>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SSID_FORMATTED, WifiApSsidAccessor>,         PushScreenAction<ApSsidChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_KEY_FORMATTED, WifiApKeyAccessor>,           PushScreenAction<ApKeyChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, WifiApMacText,                       DummyAction>>();
diff --git a/main/newsettings.h b/main/newsettings.h
index bda9bb3..f2ccdf9 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -247,6 +247,7 @@ public:
     ConfigWrapperLegacy<wifi_stack::ip_address_t> wifiApMask{wifi_stack::ip_address_t{255, 255, 255, 0},DoReset, {},                      "wifiApMask"          };
     ConfigWrapperLegacy<uint8_t>     wifiApChannel      {1,                                      DoReset,   MinMaxValue<uint8_t, 1, 14>,  "wifiApChannel"       };
     ConfigWrapperLegacy<wifi_auth_mode_t> wifiApAuthmode{WIFI_AUTH_WPA2_PSK,                     DoReset,   {},                           "wifiApAuthmode"      };
+    ConfigWrapperLegacy<bool>        wifiApHidden       {false,                                  DoReset,   {},                           "wifiApHidden"        };
 
     ConfigWrapperLegacy<bool>     timeServerEnabled     {true,                                   DoReset,   {},                           "timeServerEnabl"     };
     ConfigWrapperLegacy<std::string>   timeServer       {"europe.pool.ntp.org",                  DoReset,   StringMaxSize<64>,            "timeServer"          };
@@ -586,6 +587,7 @@ public:
     x(wifiApMask) \
     x(wifiApChannel) \
     x(wifiApAuthmode) \
+    x(wifiApHidden) \
     \
     x(timeServerEnabled) \
     x(timeServer) \
diff --git a/main/wifi_bobbycar.cpp b/main/wifi_bobbycar.cpp
index 91d3563..f0080dd 100644
--- a/main/wifi_bobbycar.cpp
+++ b/main/wifi_bobbycar.cpp
@@ -137,7 +137,7 @@ std::optional<wifi_stack::ap_config> createApConfig()
         },
         .channel = configs.wifiApChannel.value(),
         .authmode = configs.wifiApAuthmode.value(),
-        .ssid_hidden = false,
+        .ssid_hidden = configs.wifiApHidden.value(),
         .max_connection = 4,
         .beacon_interval = 100,
         .long_range = false