From b0c8dd5cb481c356430d6554caf52302aae692fe Mon Sep 17 00:00:00 2001 From: H4W9 Date: Fri, 24 Oct 2025 11:24:08 -0500 Subject: [PATCH 1/3] Update configs.h --- esp32_marauder/configs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 648f8fb..9adceb5 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -1010,7 +1010,9 @@ #endif #ifndef MARAUDER_CYD_MICRO - #define TFT_DIY + #define TFT_DIY + #else + #define TFT_SHIELD #endif #define GRAPH_VERT_LIM TFT_HEIGHT/2 From 630687359d5506906b563ace6fa1b38386845e74 Mon Sep 17 00:00:00 2001 From: H4W9 Date: Sun, 26 Oct 2025 11:51:06 -0500 Subject: [PATCH 2/3] Update MenuFunctions.cpp Fix GPS option showing up on Main Menu when GPS Chip is not available. --- esp32_marauder/MenuFunctions.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index a2710de..498d947 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -2094,9 +2094,11 @@ void MenuFunctions::RunSetup() this->changeMenu(&bluetoothMenu, true); }); #ifdef HAS_GPS - this->addNodes(&mainMenu, text1_66, TFTRED, NULL, GPS_MENU, [this]() { - this->changeMenu(&gpsMenu, true); - }); + if (gps_obj.getGpsModuleStatus()) { + this->addNodes(&mainMenu, text1_66, TFTRED, NULL, GPS_MENU, [this]() { + this->changeMenu(&gpsMenu, true); + }); + } #endif this->addNodes(&mainMenu, text_table1[9], TFTBLUE, NULL, DEVICE, [this]() { this->changeMenu(&deviceMenu, true); @@ -4358,3 +4360,4 @@ void MenuFunctions::displayCurrentMenu(int start_index) } #endif + From 0e8e698254767b5b4dc7f578eb2098c6542f0425 Mon Sep 17 00:00:00 2001 From: H4W9 Date: Sun, 26 Oct 2025 12:18:24 -0500 Subject: [PATCH 3/3] Update configs.h (RevertDumbCommit) Revert my dumb commit --- esp32_marauder/configs.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 9adceb5..dfbc854 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -1011,8 +1011,6 @@ #ifndef MARAUDER_CYD_MICRO #define TFT_DIY - #else - #define TFT_SHIELD #endif #define GRAPH_VERT_LIM TFT_HEIGHT/2