mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2026-08-02 00:47:56 -07:00
Add GPS POI Marker
This commit is contained in:
@@ -772,6 +772,7 @@ void MenuFunctions::main(uint32_t currentTime)
|
||||
(wifi_scan_obj.currentScanMode == ESP_UPDATE) ||
|
||||
(wifi_scan_obj.currentScanMode == SHOW_INFO) ||
|
||||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_GPS_DATA) ||
|
||||
(wifi_scan_obj.currentScanMode == GPS_POI) ||
|
||||
(wifi_scan_obj.currentScanMode == GPS_TRACKER) ||
|
||||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_GPS_NMEA)) {
|
||||
if (wifi_scan_obj.orient_display) {
|
||||
@@ -839,6 +840,7 @@ void MenuFunctions::main(uint32_t currentTime)
|
||||
(wifi_scan_obj.currentScanMode != ESP_UPDATE) &&
|
||||
(wifi_scan_obj.currentScanMode != SHOW_INFO) &&
|
||||
(wifi_scan_obj.currentScanMode != WIFI_SCAN_GPS_DATA) &&
|
||||
(wifi_scan_obj.currentScanMode != GPS_POI) &&
|
||||
(wifi_scan_obj.currentScanMode != GPS_TRACKER) &&
|
||||
(wifi_scan_obj.currentScanMode != WIFI_SCAN_GPS_NMEA))
|
||||
{
|
||||
@@ -922,6 +924,7 @@ void MenuFunctions::main(uint32_t currentTime)
|
||||
(wifi_scan_obj.currentScanMode != ESP_UPDATE) &&
|
||||
(wifi_scan_obj.currentScanMode != SHOW_INFO) &&
|
||||
(wifi_scan_obj.currentScanMode != WIFI_SCAN_GPS_DATA) &&
|
||||
(wifi_scan_obj.currentScanMode != GPS_POI) &&
|
||||
(wifi_scan_obj.currentScanMode != GPS_TRACKER) &&
|
||||
(wifi_scan_obj.currentScanMode != WIFI_SCAN_GPS_NMEA))
|
||||
{
|
||||
@@ -1960,6 +1963,8 @@ void MenuFunctions::RunSetup()
|
||||
evilPortalMenu.list = new LinkedList<MenuNode>();
|
||||
ssidsMenu.list = new LinkedList<MenuNode>();
|
||||
|
||||
gpsPOIMenu.list = new LinkedList<MenuNode>();
|
||||
|
||||
// Work menu names
|
||||
mainMenu.name = text_table1[6];
|
||||
wifiMenu.name = text_table1[7];
|
||||
@@ -2017,6 +2022,8 @@ void MenuFunctions::RunSetup()
|
||||
evilPortalMenu.name = "Evil Portal";
|
||||
ssidsMenu.name = "SSIDs";
|
||||
|
||||
gpsPOIMenu.name = "GPS POI";
|
||||
|
||||
// Build Main Menu
|
||||
mainMenu.parentMenu = NULL;
|
||||
this->addNodes(&mainMenu, text_table1[7], TFTGREEN, NULL, WIFI, [this]() {
|
||||
@@ -3294,6 +3301,37 @@ void MenuFunctions::RunSetup()
|
||||
wifi_scan_obj.StartScan(GPS_TRACKER, TFT_CYAN);
|
||||
});
|
||||
|
||||
this->addNodes(&deviceMenu, "GPS POI", TFTCYAN, NULL, GPS_MENU, [this]() {
|
||||
wifi_scan_obj.StartScan(GPS_POI, TFT_CYAN);
|
||||
wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
|
||||
this->changeMenu(&gpsPOIMenu);
|
||||
});
|
||||
|
||||
// GPS POI Menu
|
||||
gpsPOIMenu.parentMenu = &deviceMenu;
|
||||
this->addNodes(&gpsPOIMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
|
||||
wifi_scan_obj.currentScanMode = GPS_POI;
|
||||
wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
|
||||
this->changeMenu(gpsPOIMenu.parentMenu);
|
||||
});
|
||||
this->addNodes(&gpsPOIMenu, "Mark POI", TFTCYAN, NULL, GPS_MENU, [this]() {
|
||||
/*if (wifi_scan_obj.currentScanMode != GPS_POI) {
|
||||
wifi_scan_obj.currentScanMode = GPS_POI;
|
||||
wifi_scan_obj.StartScan(GPS_POI, TFT_CYAN);
|
||||
}*/
|
||||
wifi_scan_obj.currentScanMode = GPS_POI;
|
||||
display_obj.tft.setCursor(0, TFT_HEIGHT / 2);
|
||||
display_obj.clearScreen();
|
||||
if (wifi_scan_obj.RunGPSInfo(true, false))
|
||||
display_obj.showCenterText("POI Logged", TFT_HEIGHT / 2);
|
||||
else
|
||||
display_obj.showCenterText("POI Log Failed", TFT_HEIGHT / 2);
|
||||
wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
|
||||
delay(2000);
|
||||
//wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
|
||||
this->changeMenu(&gpsPOIMenu);
|
||||
});
|
||||
|
||||
// GPS Info Menu
|
||||
gpsInfoMenu.parentMenu = &deviceMenu;
|
||||
this->addNodes(&gpsInfoMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
|
||||
|
||||
Reference in New Issue
Block a user