|
@@ -627,6 +627,8 @@ void MenuFunctions::RunSetup()
|
|
|
// Settings stuff
|
|
// Settings stuff
|
|
|
shutdownWiFiMenu.list = new LinkedList<MenuNode>();
|
|
shutdownWiFiMenu.list = new LinkedList<MenuNode>();
|
|
|
shutdownBLEMenu.list = new LinkedList<MenuNode>();
|
|
shutdownBLEMenu.list = new LinkedList<MenuNode>();
|
|
|
|
|
+ generateSSIDsMenu.list = new LinkedList<MenuNode>();
|
|
|
|
|
+ clearSSIDsMenu.list = new LinkedList<MenuNode>();
|
|
|
|
|
|
|
|
// Work menu names
|
|
// Work menu names
|
|
|
mainMenu.name = " ESP32 Marauder ";
|
|
mainMenu.name = " ESP32 Marauder ";
|
|
@@ -648,6 +650,9 @@ void MenuFunctions::RunSetup()
|
|
|
bluetoothGeneralMenu.name = " Bluetooth General ";
|
|
bluetoothGeneralMenu.name = " Bluetooth General ";
|
|
|
shutdownWiFiMenu.name = " Shutdown WiFi ";
|
|
shutdownWiFiMenu.name = " Shutdown WiFi ";
|
|
|
shutdownBLEMenu.name = " Shutdown BLE ";
|
|
shutdownBLEMenu.name = " Shutdown BLE ";
|
|
|
|
|
+ generateSSIDsMenu.name = " Generate SSIDs ";
|
|
|
|
|
+ clearSSIDsMenu.name = " Clear SSIDs ";
|
|
|
|
|
+
|
|
|
|
|
|
|
|
// Build Main Menu
|
|
// Build Main Menu
|
|
|
mainMenu.parentMenu = NULL;
|
|
mainMenu.parentMenu = NULL;
|
|
@@ -755,10 +760,18 @@ void MenuFunctions::RunSetup()
|
|
|
wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW);
|
|
wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW);
|
|
|
joinWiFiGFX();
|
|
joinWiFiGFX();
|
|
|
});
|
|
});
|
|
|
- addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_ORANGE, NULL, SHUTDOWN, [this]() {
|
|
|
|
|
|
|
+ addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_CYAN, NULL, SHUTDOWN, [this]() {
|
|
|
changeMenu(&shutdownWiFiMenu);
|
|
changeMenu(&shutdownWiFiMenu);
|
|
|
wifi_scan_obj.RunShutdownWiFi();
|
|
wifi_scan_obj.RunShutdownWiFi();
|
|
|
});
|
|
});
|
|
|
|
|
+ addNodes(&wifiGeneralMenu, "Generate SSIDs", TFT_SKYBLUE, NULL, GENERAL_APPS, [this]() {
|
|
|
|
|
+ changeMenu(&generateSSIDsMenu);
|
|
|
|
|
+ wifi_scan_obj.RunGenerateSSIDs();
|
|
|
|
|
+ });
|
|
|
|
|
+ addNodes(&wifiGeneralMenu, "Clear SSIDs", TFT_SILVER, NULL, GENERAL_APPS, [this]() {
|
|
|
|
|
+ changeMenu(&clearSSIDsMenu);
|
|
|
|
|
+ wifi_scan_obj.RunClearSSIDs();
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
// Build shutdown wifi menu
|
|
// Build shutdown wifi menu
|
|
|
shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
|
|
shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
|
|
@@ -766,6 +779,18 @@ void MenuFunctions::RunSetup()
|
|
|
changeMenu(shutdownWiFiMenu.parentMenu);
|
|
changeMenu(shutdownWiFiMenu.parentMenu);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ // Build generate ssids menu
|
|
|
|
|
+ generateSSIDsMenu.parentMenu = &wifiGeneralMenu;
|
|
|
|
|
+ addNodes(&generateSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
|
|
|
|
|
+ changeMenu(generateSSIDsMenu.parentMenu);
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ // Build clear ssids menu
|
|
|
|
|
+ clearSSIDsMenu.parentMenu = &wifiGeneralMenu;
|
|
|
|
|
+ addNodes(&clearSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
|
|
|
|
|
+ changeMenu(clearSSIDsMenu.parentMenu);
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
|
|
|
// Build Bluetooth Menu
|
|
// Build Bluetooth Menu
|
|
|
bluetoothMenu.parentMenu = &mainMenu; // Second Menu is third menu parent
|
|
bluetoothMenu.parentMenu = &mainMenu; // Second Menu is third menu parent
|