gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-12 15:50:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

Trim more fat

Browse Source
This commit is contained in:
Just Call Me Koko
2023-08-31 19:41:36 -04:00
parent 4cf96a8f0c
commit 363817c113
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esp32_marauder/Display.h
View File

@@ -95,9 +95,9 @@ class Display
bool draw_tft = false; bool draw_tft = false;
bool exit_draw = false; bool exit_draw = false;
int TOP_FIXED_AREA_2 = 48; uint8_t TOP_FIXED_AREA_2 = 48;
int print_delay_1, print_delay_2 = 10; uint8_t print_delay_1, print_delay_2 = 10;
int current_banner_pos = SCREEN_WIDTH; uint8_t current_banner_pos = SCREEN_WIDTH;
//Menu* current_menu; //Menu* current_menu;

16
esp32_marauder/MenuFunctions.cpp
View File

@@ -1541,11 +1541,11 @@ void MenuFunctions::RunSetup()
// Bluetooth menu stuff // Bluetooth menu stuff
bluetoothSnifferMenu.list = new LinkedList<MenuNode>(); bluetoothSnifferMenu.list = new LinkedList<MenuNode>();
bluetoothGeneralMenu.list = new LinkedList<MenuNode>(); //bluetoothGeneralMenu.list = new LinkedList<MenuNode>();
// 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>(); generateSSIDsMenu.list = new LinkedList<MenuNode>();
clearSSIDsMenu.list = new LinkedList<MenuNode>(); clearSSIDsMenu.list = new LinkedList<MenuNode>();
clearAPsMenu.list = new LinkedList<MenuNode>(); clearAPsMenu.list = new LinkedList<MenuNode>();
@@ -1567,9 +1567,9 @@ void MenuFunctions::RunSetup()
wifiAttackMenu.name = text_table1[21]; wifiAttackMenu.name = text_table1[21];
wifiGeneralMenu.name = text_table1[22]; wifiGeneralMenu.name = text_table1[22];
bluetoothSnifferMenu.name = text_table1[23]; bluetoothSnifferMenu.name = text_table1[23];
bluetoothGeneralMenu.name = text_table1[24]; //bluetoothGeneralMenu.name = text_table1[24];
shutdownWiFiMenu.name = text_table1[25]; //shutdownWiFiMenu.name = text_table1[25];
shutdownBLEMenu.name = text_table1[26]; //shutdownBLEMenu.name = text_table1[26];
generateSSIDsMenu.name = text_table1[27]; generateSSIDsMenu.name = text_table1[27];
clearSSIDsMenu.name = text_table1[28]; clearSSIDsMenu.name = text_table1[28];
clearAPsMenu.name = text_table1[29]; clearAPsMenu.name = text_table1[29];
@@ -1858,10 +1858,10 @@ void MenuFunctions::RunSetup()
#endif #endif
// Build shutdown wifi menu // Build shutdown wifi menu
shutdownWiFiMenu.parentMenu = &wifiGeneralMenu; /*shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
addNodes(&shutdownWiFiMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { addNodes(&shutdownWiFiMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
changeMenu(shutdownWiFiMenu.parentMenu); changeMenu(shutdownWiFiMenu.parentMenu);
}); });*/
// Build generate ssids menu // Build generate ssids menu
generateSSIDsMenu.parentMenu = &wifiGeneralMenu; generateSSIDsMenu.parentMenu = &wifiGeneralMenu;

10
esp32_marauder/MenuFunctions.h
View File

@@ -116,7 +116,7 @@ struct MenuNode {
String name; String name;
String command; String command;
uint16_t color; uint16_t color;
int icon; uint8_t icon;
TFT_eSPI_Button* button; TFT_eSPI_Button* button;
bool selected; bool selected;
std::function<void()> callable; std::function<void()> callable;
@@ -154,7 +154,7 @@ class MenuFunctions
Menu whichUpdateMenu; Menu whichUpdateMenu;
Menu failedUpdateMenu; Menu failedUpdateMenu;
Menu confirmMenu; Menu confirmMenu;
Menu espUpdateMenu; //Menu espUpdateMenu;
Menu updateMenu; Menu updateMenu;
Menu settingsMenu; Menu settingsMenu;
Menu specSettingMenu; Menu specSettingMenu;
@@ -169,11 +169,11 @@ class MenuFunctions
// Bluetooth menu stuff // Bluetooth menu stuff
Menu bluetoothSnifferMenu; Menu bluetoothSnifferMenu;
Menu bluetoothGeneralMenu; //Menu bluetoothGeneralMenu;
// Settings things menus // Settings things menus
Menu shutdownWiFiMenu; //Menu shutdownWiFiMenu;
Menu shutdownBLEMenu; //Menu shutdownBLEMenu;
Menu generateSSIDsMenu; Menu generateSSIDsMenu;
#ifdef HAS_GPS #ifdef HAS_GPS