Add general menu items back

This commit is contained in:
Just Call Me Koko
2020-08-28 15:43:33 -04:00
parent 018198d51b
commit a327c75727
2 changed files with 16 additions and 16 deletions

View File

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

View File

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