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

Send PCAP buffer on main UART console

Browse Source
This commit is contained in:
Willy-JL
2023-12-31 18:52:30 +01:00
parent e560a888c3
commit bddc7e1d9d
9 changed files with 114 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
esp32_marauder/MenuFunctions.cpp
View File

@@ -991,14 +991,10 @@ void MenuFunctions::updateStatusBar()
// Draw SD info
#ifndef WRITE_PACKETS_SERIAL
if (sd_obj.supported)
the_color = TFT_GREEN;
else
the_color = TFT_RED;
#else
if (sd_obj.supported)
the_color = TFT_GREEN;
else
the_color = TFT_RED;
#endif
#ifdef HAS_ILI9341
display_obj.tft.drawXBitmap(170,
@@ -1080,14 +1076,10 @@ void MenuFunctions::drawStatusBar()
MenuFunctions::battery2(true);
// Draw SD info
#ifndef WRITE_PACKETS_SERIAL
if (sd_obj.supported)
the_color = TFT_GREEN;
else
the_color = TFT_RED;
#else
if (sd_obj.supported)
the_color = TFT_GREEN;
else
the_color = TFT_RED;
#endif
#ifdef HAS_ILI9341
display_obj.tft.drawXBitmap(170,
@@ -1721,12 +1713,10 @@ void MenuFunctions::RunSetup()
wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
this->changeMenu(whichUpdateMenu.parentMenu);
});
#ifndef WRITE_PACKETS_SERIAL
if (sd_obj.supported) addNodes(&whichUpdateMenu, text_table1[40], TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
wifi_scan_obj.currentScanMode = OTA_UPDATE;
this->changeMenu(&confirmMenu);
});
#endif
if (sd_obj.supported) addNodes(&whichUpdateMenu, text_table1[40], TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
wifi_scan_obj.currentScanMode = OTA_UPDATE;
this->changeMenu(&confirmMenu);
});
// Confirm SD update menu
confirmMenu.parentMenu = &whichUpdateMenu;