gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2026-04-28 12:03:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1214 from infra-blue/develop

Browse Source 
fix: GPS objects not correctly handled by HAS_GPS define
This commit is contained in:
Just Call Me Koko
2026-04-23 09:41:09 -04:00
committed by GitHub
parent 07ce5cb2ce fbcda91f56
commit ad79969873
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esp32_marauder/MenuFunctions.cpp
View File

@@ -247,9 +247,11 @@ void MenuFunctions::main(uint32_t currentTime)
// Brief green flash // Brief green flash
display_obj.tft.fillRect(0, 270, 240, 50, TFT_GREEN); display_obj.tft.fillRect(0, 270, 240, 50, TFT_GREEN);
display_obj.tft.setTextSize(2); display_obj.tft.setTextSize(2);
#ifdef HAS_GPS
if (gps_obj.getFixStatus()) if (gps_obj.getFixStatus())
display_obj.tft.setTextColor(TFT_BLACK, TFT_GREEN); display_obj.tft.setTextColor(TFT_BLACK, TFT_GREEN);
else else
#endif
display_obj.tft.setTextColor(TFT_BLACK, TFT_RED); display_obj.tft.setTextColor(TFT_BLACK, TFT_RED);
String poiFlash = "POI (" + String(wifi_scan_obj.poiCount) + ")"; String poiFlash = "POI (" + String(wifi_scan_obj.poiCount) + ")";
int16_t flashWidth = poiFlash.length() * 12; int16_t flashWidth = poiFlash.length() * 12;
@@ -1533,7 +1535,9 @@ void MenuFunctions::RunSetup()
evilPortalMenu.list = new LinkedList<MenuNode>(); evilPortalMenu.list = new LinkedList<MenuNode>();
ssidsMenu.list = new LinkedList<MenuNode>(); ssidsMenu.list = new LinkedList<MenuNode>();
gpsPOIMenu.list = new LinkedList<MenuNode>(); #ifdef HAS_GPS
gpsPOIMenu.list = new LinkedList<MenuNode>();
#endif
// Work menu names // Work menu names
mainMenu.name = text_table1[6]; mainMenu.name = text_table1[6];
@@ -1575,14 +1579,18 @@ void MenuFunctions::RunSetup()
#endif #endif
htmlMenu.name = "EP HTML List"; htmlMenu.name = "EP HTML List";
miniKbMenu.name = "Mini Keyboard"; miniKbMenu.name = "Mini Keyboard";
#ifdef HAS_SD #ifdef HAS_SD
sdDeleteMenu.name = "Delete SD Files"; sdDeleteMenu.name = "Delete SD Files";
#endif #endif
selectProbeSSIDsMenu.name = "Probe Requests"; selectProbeSSIDsMenu.name = "Probe Requests";
evilPortalMenu.name = "Evil Portal"; evilPortalMenu.name = "Evil Portal";
ssidsMenu.name = "SSIDs"; ssidsMenu.name = "SSIDs";
gpsPOIMenu.name = "GPS POI"; #ifdef HAS_GPS
gpsPOIMenu.name = "GPS POI";
#endif
// Build Main Menu // Build Main Menu
mainMenu.parentMenu = NULL; mainMenu.parentMenu = NULL;