wifi_common optimization

src/core/menu_items/WifiMenu.cpp

@@ -18,13 +18,13 @@
 void WifiMenu::optionsMenu() {
     if(!wifiConnected) {
         options = {
-        {"Connect Wifi", [=]()  { wifiConnectMenu(); }},    //wifi_common.h
-        {"WiFi AP",      [=]()  { wifiConnectMenu(true); displayInfo("pwd: " + bruceConfig.wifiAp.pwd, true); }},//wifi_common.h
+            {"Connect Wifi", [=]()  { wifiConnectMenu(WIFI_STA); }},  
+            {"WiFi AP",      [=]()  { wifiConnectMenu(WIFI_AP); displayInfo("pwd: " + bruceConfig.wifiAp.pwd, true); }},
         };
     } else {
         options = {
-        {"Disconnect",   [=]()  { wifiDisconnect(); }},    //wifi_common.h
-        {"AP info",   [=]()  { displayAPInfo(); }},
+            {"Disconnect",   [=]()  { wifiDisconnect(); }},
+            {"AP info",   [=]()  { displayAPInfo(); }},
         };
     }
     options.push_back({"Wifi Atks", [=]()     { wifi_atk_menu(); }});

src/core/serialcmds.cpp

@@ -618,7 +618,7 @@ bool processSerialCommand(String cmd_str) {
     // start the webui
     if(!wifiConnected) {
       Serial.println("wifiConnect");
-      wifiApConnect();  // TODO: read mode from config file
+      wifiConnectMenu(WIFI_AP);  // TODO: read mode from config file
     }
     Serial.println("startWebUi");
     startWebUi(true);  // MEMO: will quit when checkEscPress

src/core/utils.cpp

@@ -0,0 +1,17 @@
+#include "utils.h"
+#include "globals.h"
+
+void updateClockTimezone(){
+    timeClient.begin();
+    timeClient.update();
+
+    timeClient.setTimeOffset(bruceConfig.tmz * 3600);
+
+    localTime = myTZ.toLocal(timeClient.getEpochTime());
+
+#if !defined(HAS_RTC)
+    rtc.setTime(timeClient.getEpochTime());
+    updateTimeStr(rtc.getTimeStruct());
+    clock_set = true;
+#endif
+}

src/core/utils.h

@@ -0,0 +1 @@
+void updateClockTimezone();

src/core/wifi_common.cpp

@@ -3,17 +3,11 @@
 #include "mykeyboard.h" // usinf keyboard when calling rename
 #include "display.h"    // using displayRedStripe  and loop options
 #include "settings.h"
-#include "eeprom.h"
 #include "powerSave.h"
+#include "utils.h"
 
-/***************************************************************************************
-** Function name: wifiConnect
-** Description:   Connects to wifiNetwork
-***************************************************************************************/
-bool wifiConnect(String ssid, int encryption, bool isAP)
+bool _wifiConnect(const String& ssid, int encryption)
 {
-  if (isAP) return wifiApConnect();
-
   String password = bruceConfig.getWifiPassword(ssid);
   if (password == "" && encryption > 0) {
     password = keyboard(password, 63, "Network Password:");
@@ -44,14 +38,14 @@ bool wifiConnect(String ssid, int encryption, bool isAP)
     wifiConnected = true;
     wifiIP = WiFi.localIP().toString();
     bruceConfig.addWifiCredential(ssid, password);
-    _updateClockTimezone();
+    updateClockTimezone();
   }
 
   delay(200);
   return connected;
 }
 
-bool _connectToWifiNetwork(String ssid, String pwd) {
+bool _connectToWifiNetwork(const String& ssid, const String& pwd) {
   drawMainBorderWithTitle("WiFi Connect");
   padprintln("");
   padprint("Connecting to: " + ssid + ".");
@@ -79,29 +73,9 @@ bool _connectToWifiNetwork(String ssid, String pwd) {
   return WiFi.status() == WL_CONNECTED;
 }
 
-void _updateClockTimezone() {
-  timeClient.begin();
-  timeClient.update();
-
-  timeClient.setTimeOffset(bruceConfig.tmz * 3600);
-
-  localTime = myTZ.toLocal(timeClient.getEpochTime());
-
-#if !defined(HAS_RTC)
-  rtc.setTime(timeClient.getEpochTime());
-  updateTimeStr(rtc.getTimeStruct());
-  clock_set = true;
-#endif
-}
-
-/***************************************************************************************
-** Function name: wifiApConnect
-** Description:   Create wifi Access Point
-***************************************************************************************/
-bool wifiApConnect()
+bool _setupAP()
 {
   IPAddress AP_GATEWAY(172, 0, 0, 1);
-  WiFi.mode(WIFI_AP);
   WiFi.softAPConfig(AP_GATEWAY, AP_GATEWAY, IPAddress(255, 255, 255, 0));
   WiFi.softAP(bruceConfig.wifiAp.ssid, bruceConfig.wifiAp.pwd, 6, 0, 4, false);
   wifiIP = WiFi.softAPIP().toString(); // update global var
@@ -110,10 +84,6 @@ bool wifiApConnect()
   return true;
 }
 
-/***************************************************************************************
-** Function name: wifiDisconnect
-** Description:   disconnects and turn off the WIFI module
-***************************************************************************************/
 void wifiDisconnect()
 {
   WiFi.softAPdisconnect(true); // turn off AP mode
@@ -123,30 +93,41 @@ void wifiDisconnect()
   returnToMenu = true;
 }
 
-/***************************************************************************************
-** Function name: wifiConnectMenu
-** Description:   Opens a menu to connect to a wifi
-***************************************************************************************/
-bool wifiConnectMenu(bool isAP)
+bool wifiConnectMenu(wifi_mode_t mode)
 {
-  if (isAP) return wifiApConnect();
+  if( WiFi.isConnected() ) return false; // safeguard
 
-  if (WiFi.status() != WL_CONNECTED) {
+  switch (mode)
+  {
+  case WIFI_AP: // access point
+    WiFi.mode(WIFI_AP);
+    return _setupAP();
+  break;
+
+  case WIFI_STA: // station mode
     int nets;
     WiFi.mode(WIFI_MODE_STA);
     displayRedStripe("Scanning..", TFT_WHITE, bruceConfig.priColor);
     nets = WiFi.scanNetworks();
     options = {};
     for (int i = 0; i < nets; i++) {
-      options.push_back(
-        {WiFi.SSID(i).c_str(), [=]() { wifiConnect(WiFi.SSID(i).c_str(), int(WiFi.encryptionType(i))); }}
+      options.emplace_back(
+        WiFi.SSID(i).c_str(), [=]() { _wifiConnect(WiFi.SSID(i), int(WiFi.encryptionType(i))); }
       );
     }
-    options.push_back({"Main Menu", [=]()
-                       { backToMenu(); }});
+    options.emplace_back( "Main Menu", [=](){ backToMenu(); });
     delay(200);
     loopOptions(options);
     delay(200);
+  break;
+
+  case WIFI_AP_STA: // repeater mode
+    // _setupRepeater();
+  break;
+
+  default: // error handling
+    Serial.println("Unknown wifi mode: " + String(mode));
+  break;
   }
 
   if (returnToMenu)
@@ -173,7 +154,7 @@ void wifiConnectTask(int maxSearch)
       if (WiFi.status() == WL_CONNECTED) {
         wifiConnected = true;
         wifiIP = WiFi.localIP().toString();
-        _updateClockTimezone();
+        updateClockTimezone();
         return;
       }
       delay(300);

src/core/wifi_common.h

@@ -3,16 +3,45 @@
 #include <NTPClient.h>
 #include <Timezone.h>
 
-bool wifiConnect(String ssid, int encryption, bool isAP = false);
-bool wifiApConnect();
-
-bool _connectToWifiNetwork(String ssid, String pwd);
-void _updateClockTimezone();
+// TODO wrap in a class
 
+// public 
+/**
+ * @brief disconnects and turns off wifi module
+ */
 void wifiDisconnect();
 
-bool wifiConnectMenu( bool isAP = false);
+/**
+ * @brief Opens a menu to connect to a wifi
+ * @param mode connection mode(AP, STA, AP_STA)
+ * @note This is the primary entry point for establishing connections
+ * @note returns false if wifi is already connected
+ */
+bool wifiConnectMenu(wifi_mode_t = WIFI_MODE_STA);
+
 
+/**
+ * @brief displays MAC adress
+ */
 void checkMAC();
 
+/**
+ * @brief tries to connect to min(found_networks, maxSearch) networks
+ * using stored passwords
+ * @TODO fix: rn it skips open networks due to password == "" check
+ */
 void wifiConnectTask(int maxSearch = 5);
+
+
+// private
+/**
+ * @brief Connects to wifiNetwork
+ */
+bool _wifiConnect(const String& ssid, int encryption);
+bool _connectToWifiNetwork(const String& ssid, const String& pwd);
+
+/**
+ * @brief sets up wifi in AP mode
+ * @note wifi.mode should be set before calling the method
+ */
+bool _setupAP();

src/modules/others/webInterface.cpp

@@ -493,8 +493,10 @@ void startWebUi(bool mode_ap) {
   setupSdCard();
 
   if (WiFi.status() != WL_CONNECTED) {
-    // Choose wifi access mode
-    wifiConnectMenu(mode_ap);
+    if( mode_ap )
+      wifiConnectMenu(WIFI_AP);
+    else
+      wifiConnectMenu(WIFI_STA);
   }
 
   // configure web server

src/modules/wifi/clients.cpp

@@ -55,7 +55,7 @@ char* stringTochar(String s)
 bool filterAnsiSequences = true;  // Set to false to disable ANSI sequence filtering
 
 void ssh_setup(String host) {
-    if(!wifiConnected) wifiConnectMenu(false);
+    if(!wifiConnected) wifiConnectMenu();
 
     tft.fillScreen(bruceConfig.bgColor);
     tft.setCursor(0, 0);
@@ -392,7 +392,7 @@ void telnet_loop() {
 }
 
 void telnet_setup() {
-    if(!wifiConnected) wifiConnectMenu(false);
+    if(!wifiConnected) wifiConnectMenu();
 
     tft.fillScreen(bruceConfig.bgColor);
     tft.setCursor(0, 0);

src/modules/wifi/scan_hosts.cpp

@@ -27,7 +27,7 @@ void readArpTable(netif * iface) {
 
 void local_scan_setup() {
     bool doScan = true;
-    if(!wifiConnected) doScan=wifiConnectMenu(false);
+    if(!wifiConnected) doScan=wifiConnectMenu();
 
     if (doScan) {
         hostslist.clear();

src/modules/wifi/wigle.cpp

@@ -28,7 +28,7 @@ bool Wigle::_check_token() {
 
     auth_header = "Basic " + bruceConfig.wigleBasicToken;
 
-    if(!wifiConnected) wifiConnectMenu(false);
+    if(!wifiConnected) wifiConnectMenu();
 
     return true;
 }