From 363817c11349e306d5581e9edccc7d695301e589 Mon Sep 17 00:00:00 2001
From: Just Call Me Koko <at.the.red.team@gmail.com>
Date: Thu, 31 Aug 2023 19:41:36 -0400
Subject: [PATCH] Trim more fat

---
 esp32_marauder/Display.h         |  6 +++---
 esp32_marauder/MenuFunctions.cpp | 16 ++++++++--------
 esp32_marauder/MenuFunctions.h   | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h
index 7a90809..31e1f71 100644
--- a/esp32_marauder/Display.h
+++ b/esp32_marauder/Display.h
@@ -95,9 +95,9 @@ class Display
     bool draw_tft = false;
     bool exit_draw = false;
 
-    int TOP_FIXED_AREA_2 = 48;
-    int print_delay_1, print_delay_2 = 10;
-    int current_banner_pos = SCREEN_WIDTH;
+    uint8_t TOP_FIXED_AREA_2 = 48;
+    uint8_t print_delay_1, print_delay_2 = 10;
+    uint8_t current_banner_pos = SCREEN_WIDTH;
 
     //Menu* current_menu;
     
diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index 15c1819..77d8c20 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -1541,11 +1541,11 @@ void MenuFunctions::RunSetup()
 
   // Bluetooth menu stuff
   bluetoothSnifferMenu.list = new LinkedList<MenuNode>();
-  bluetoothGeneralMenu.list = new LinkedList<MenuNode>();
+  //bluetoothGeneralMenu.list = new LinkedList<MenuNode>();
 
   // Settings stuff
-  shutdownWiFiMenu.list = new LinkedList<MenuNode>();
-  shutdownBLEMenu.list = new LinkedList<MenuNode>();
+  //shutdownWiFiMenu.list = new LinkedList<MenuNode>();
+  //shutdownBLEMenu.list = new LinkedList<MenuNode>();
   generateSSIDsMenu.list = new LinkedList<MenuNode>();
   clearSSIDsMenu.list = new LinkedList<MenuNode>();
   clearAPsMenu.list = new LinkedList<MenuNode>();
@@ -1567,9 +1567,9 @@ void MenuFunctions::RunSetup()
   wifiAttackMenu.name = text_table1[21];
   wifiGeneralMenu.name = text_table1[22];
   bluetoothSnifferMenu.name = text_table1[23];
-  bluetoothGeneralMenu.name = text_table1[24];
-  shutdownWiFiMenu.name = text_table1[25];
-  shutdownBLEMenu.name = text_table1[26];
+  //bluetoothGeneralMenu.name = text_table1[24];
+  //shutdownWiFiMenu.name = text_table1[25];
+  //shutdownBLEMenu.name = text_table1[26];
   generateSSIDsMenu.name = text_table1[27];
   clearSSIDsMenu.name = text_table1[28];
   clearAPsMenu.name = text_table1[29];
@@ -1858,10 +1858,10 @@ void MenuFunctions::RunSetup()
   #endif
 
   // Build shutdown wifi menu
-  shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
+  /*shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
   addNodes(&shutdownWiFiMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
     changeMenu(shutdownWiFiMenu.parentMenu);
-  });
+  });*/
 
   // Build generate ssids menu
   generateSSIDsMenu.parentMenu = &wifiGeneralMenu;
diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h
index 4f1e22d..08d79e8 100644
--- a/esp32_marauder/MenuFunctions.h
+++ b/esp32_marauder/MenuFunctions.h
@@ -116,7 +116,7 @@ struct MenuNode {
   String name;
   String command;
   uint16_t color;
-  int icon;
+  uint8_t icon;
   TFT_eSPI_Button* button;
   bool selected;
   std::function<void()> callable;
@@ -154,7 +154,7 @@ class MenuFunctions
     Menu whichUpdateMenu;
     Menu failedUpdateMenu;
     Menu confirmMenu;
-    Menu espUpdateMenu;
+    //Menu espUpdateMenu;
     Menu updateMenu;
     Menu settingsMenu;
     Menu specSettingMenu;
@@ -169,11 +169,11 @@ class MenuFunctions
 
     // Bluetooth menu stuff
     Menu bluetoothSnifferMenu;
-    Menu bluetoothGeneralMenu;
+    //Menu bluetoothGeneralMenu;
 
     // Settings things menus
-    Menu shutdownWiFiMenu;
-    Menu shutdownBLEMenu;
+    //Menu shutdownWiFiMenu;
+    //Menu shutdownBLEMenu;
     Menu generateSSIDsMenu;
 
     #ifdef HAS_GPS