Add general menu items back

esp32_marauder/MenuFunctions.cpp

@@ -617,7 +617,7 @@ void MenuFunctions::RunSetup()
   wifiSnifferMenu.list = new LinkedList<MenuNode>();
   wifiScannerMenu.list = new LinkedList<MenuNode>();
   wifiAttackMenu.list = new LinkedList<MenuNode>();
-  //wifiGeneralMenu.list = new LinkedList<MenuNode>();
+  wifiGeneralMenu.list = new LinkedList<MenuNode>();
 
   // Bluetooth menu stuff
   bluetoothSnifferMenu.list = new LinkedList<MenuNode>();
@@ -637,7 +637,7 @@ void MenuFunctions::RunSetup()
   wifiSnifferMenu.name = " WiFi Sniffers ";
   wifiScannerMenu.name = " WiFi Scanners";
   wifiAttackMenu.name = " WiFi Attacks ";
-  //wifiGeneralMenu.name = " WiFi General ";
+  wifiGeneralMenu.name = " WiFi General ";
   bluetoothSnifferMenu.name = " Bluetooth Sniffers ";
   bluetoothScannerMenu.name = " Bluetooth Scanners ";
 
@@ -673,9 +673,9 @@ void MenuFunctions::RunSetup()
   addNodes(&wifiMenu, "Attacks", TFT_RED, NULL, ATTACKS, [this]() {
     changeMenu(&wifiAttackMenu);
   });
-  //addNodes(&wifiMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
-  //  changeMenu(&wifiGeneralMenu);
-  //});
+  addNodes(&wifiMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
+    changeMenu(&wifiGeneralMenu);
+  });
 
   // Build WiFi sniffer Menu
   wifiSnifferMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
@@ -737,16 +737,16 @@ void MenuFunctions::RunSetup()
   });
 
   // Build WiFi General menu
-  //wifiGeneralMenu.parentMenu = &wifiMenu;
-  //addNodes(&wifiGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-  //  changeMenu(wifiGeneralMenu.parentMenu);
-  //});
-  //addNodes(&wifiGeneralMenu, "Join WiFi", TFT_DARKCYAN, NULL, SNIFFERS, [this](){
-  //  display_obj.clearScreen(); 
-  //  wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; 
-  //  wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
-  //  joinWiFiGFX();
-  //});
+  wifiGeneralMenu.parentMenu = &wifiMenu;
+  addNodes(&wifiGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(wifiGeneralMenu.parentMenu);
+  });
+  addNodes(&wifiGeneralMenu, "Join WiFi", TFT_DARKCYAN, NULL, SNIFFERS, [this](){
+    display_obj.clearScreen(); 
+    wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; 
+    wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
+    joinWiFiGFX();
+  });
 
 
   // Build Bluetooth Menu

esp32_marauder/MenuFunctions.h

@@ -127,7 +127,7 @@ class MenuFunctions
     Menu wifiSnifferMenu;
     Menu wifiScannerMenu;
     Menu wifiAttackMenu;
-    //Menu wifiGeneralMenu;
+    Menu wifiGeneralMenu;
 
     // Bluetooth menu stuff
     Menu bluetoothSnifferMenu;