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

Remove general menu

Browse Source
This commit is contained in:
Just Call Me Koko
2023-08-31 18:39:07 -04:00
parent ce8c70daf7
commit 56133db97a
5 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
esp32_marauder/Display.cpp
View File

@@ -441,13 +441,13 @@ void Display::drawJpeg(const char *filename, int xpos, int ypos) {
//}
}
void Display::setupDraw() {
/*void Display::setupDraw() {
this->tft.drawLine(0, 0, 10, 0, TFT_MAGENTA);
this->tft.drawLine(0, 0, 0, 10, TFT_GREEN);
this->tft.drawLine(0, 0, 0, 0, TFT_CYAN);
}
}*/
uint16_t xlast;
/*uint16_t xlast;
uint16_t ylast;
uint32_t AH;
void Display::drawStylus()
@@ -513,7 +513,7 @@ void Display::drawStylus()
xlast = 0;
ylast = 0;
}
}
}*/
//====================================================================================
// Decode and render the Jpeg image onto the TFT screen

4
esp32_marauder/Display.h
View File

@@ -143,8 +143,8 @@ class Display
void clearScreen();
void displayBuffer(bool do_clear = false);
void drawJpeg(const char *filename, int xpos, int ypos);
void setupDraw();
void drawStylus();
//void setupDraw();
//void drawStylus();
void getTouchWhileFunction(bool pressed);
void initScrollValues(bool tte = false);
void jpegInfo();

12
esp32_marauder/MenuFunctions.cpp
View File

@@ -1514,7 +1514,7 @@ void MenuFunctions::RunSetup()
// Main menu stuff
wifiMenu.list = new LinkedList<MenuNode>(); // Get list in second menu ready
bluetoothMenu.list = new LinkedList<MenuNode>(); // Get list in third menu ready
generalMenu.list = new LinkedList<MenuNode>();
//generalMenu.list = new LinkedList<MenuNode>();
deviceMenu.list = new LinkedList<MenuNode>();
#ifdef HAS_GPS
if (gps_obj.getGpsModuleStatus()) {
@@ -1554,7 +1554,7 @@ void MenuFunctions::RunSetup()
mainMenu.name = text_table1[6];
wifiMenu.name = text_table1[7];
deviceMenu.name = text_table1[9];
generalMenu.name = text_table1[10];
//generalMenu.name = text_table1[10];
failedUpdateMenu.name = text_table1[11];
whichUpdateMenu.name = text_table1[12];
confirmMenu.name = text_table1[13];
@@ -1597,9 +1597,9 @@ void MenuFunctions::RunSetup()
//if (a32u4_obj.supported) addNodes(&mainMenu, text_table1[8], TFT_RED, NULL, BAD_USB_ICO, [this]() {
// changeMenu(&badusbMenu);
//});
addNodes(&mainMenu, text_table1[10], TFT_MAGENTA, NULL, GENERAL_APPS, [this]() {
/*addNodes(&mainMenu, text_table1[10], TFT_MAGENTA, NULL, GENERAL_APPS, [this]() {
changeMenu(&generalMenu);
});
});*/
addNodes(&mainMenu, text_table1[9], TFT_BLUE, NULL, DEVICE, [this]() {
changeMenu(&deviceMenu);
});
@@ -1951,7 +1951,7 @@ void MenuFunctions::RunSetup()
//#endif
// General apps menu
generalMenu.parentMenu = &mainMenu;
/*generalMenu.parentMenu = &mainMenu;
addNodes(&generalMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
display_obj.draw_tft = false;
changeMenu(generalMenu.parentMenu);
@@ -1960,7 +1960,7 @@ void MenuFunctions::RunSetup()
display_obj.clearScreen();
display_obj.setupDraw();
display_obj.draw_tft = true;
});
});*/
// Device menu
deviceMenu.parentMenu = &mainMenu;

2
esp32_marauder/MenuFunctions.h
View File

@@ -147,7 +147,7 @@ class MenuFunctions
Menu wifiMenu;
Menu bluetoothMenu;
Menu badusbMenu;
Menu generalMenu;
//Menu generalMenu;
Menu deviceMenu;
// Device menu stuff

109
esp32_marauder/esp32_marauder.ino
View File

@@ -383,69 +383,62 @@ void loop()
#endif
// Update all of our objects
#ifdef HAS_SCREEN
/*#ifdef HAS_SCREEN
bool do_draw = display_obj.draw_tft;
#else
bool do_draw = false;
#endif*/
//if ((!do_draw) && (wifi_scan_obj.currentScanMode != ESP_UPDATE))
//{
cli_obj.main(currentTime);
#ifdef HAS_SCREEN
display_obj.main(wifi_scan_obj.currentScanMode);
#endif
wifi_scan_obj.main(currentTime);
//evil_portal_obj.main(wifi_scan_obj.currentScanMode);
#ifdef HAS_GPS
gps_obj.main();
#endif
if ((!do_draw) && (wifi_scan_obj.currentScanMode != ESP_UPDATE))
{
cli_obj.main(currentTime);
#ifdef HAS_SCREEN
display_obj.main(wifi_scan_obj.currentScanMode);
#endif
wifi_scan_obj.main(currentTime);
//evil_portal_obj.main(wifi_scan_obj.currentScanMode);
#ifdef HAS_GPS
gps_obj.main();
#endif
#ifdef WRITE_PACKETS_SERIAL
buffer_obj.forceSaveSerial();
#elif defined(HAS_SD)
sd_obj.main();
#else
return;
#endif
#ifdef HAS_BATTERY
battery_obj.main(currentTime);
//temp_obj.main(currentTime);
#endif
settings_obj.main(currentTime);
if (((wifi_scan_obj.currentScanMode != WIFI_PACKET_MONITOR) && (wifi_scan_obj.currentScanMode != WIFI_SCAN_EAPOL)) ||
(mini)) {
#ifdef HAS_SCREEN
menu_function_obj.main(currentTime);
#endif
//cli_obj.main(currentTime);
}
#ifdef MARAUDER_FLIPPER
flipper_led.main();
#elif defined(XIAO_ESP32_S3)
xiao_led.main();
#else
led_obj.main(currentTime);
#endif
//if (wifi_scan_obj.currentScanMode == OTA_UPDATE)
// web_obj.main();
#ifdef HAS_SCREEN
delay(1);
#else
delay(50);
#endif
}
#ifdef HAS_SCREEN
else if ((display_obj.draw_tft) &&
(wifi_scan_obj.currentScanMode != OTA_UPDATE))
{
display_obj.drawStylus();
}
#ifdef WRITE_PACKETS_SERIAL
buffer_obj.forceSaveSerial();
#elif defined(HAS_SD)
sd_obj.main();
#else
return;
#endif
else if (wifi_scan_obj.currentScanMode == ESP_UPDATE) {
#ifdef HAS_BATTERY
battery_obj.main(currentTime);
//temp_obj.main(currentTime);
#endif
settings_obj.main(currentTime);
if (((wifi_scan_obj.currentScanMode != WIFI_PACKET_MONITOR) && (wifi_scan_obj.currentScanMode != WIFI_SCAN_EAPOL)) ||
(mini)) {
#ifdef HAS_SCREEN
menu_function_obj.main(currentTime);
#endif
//cli_obj.main(currentTime);
}
#ifdef MARAUDER_FLIPPER
flipper_led.main();
#elif defined(XIAO_ESP32_S3)
xiao_led.main();
#else
led_obj.main(currentTime);
#endif
//if (wifi_scan_obj.currentScanMode == OTA_UPDATE)
// web_obj.main();
#ifdef HAS_SCREEN
delay(1);
#else
delay(50);
#endif
//}
/*else if (wifi_scan_obj.currentScanMode == ESP_UPDATE) {
#ifdef HAS_SCREEN
display_obj.main(wifi_scan_obj.currentScanMode);
menu_function_obj.main(currentTime);
@@ -461,5 +454,5 @@ void loop()
//cli_obj.main(currentTime);
delay(1);
}
}*/
}