feat: Add GPS support (v1.6.00) and new menu system

adammelancon · adammelancon · commit 3cbed7735ba9 · 2025-11-30T14:20:22.000-06:00
diff --git a/platformio.ini b/platformio.ini
@@ -25,3 +25,4 @@ lib_deps =
     greiman/SdFat @ ^2.2.3
     https://github.com/sparkfun/SparkFun_SGP4_Arduino_Library.git
     adafruit/Adafruit NeoPixel @ ^1.12.0
+    mikalhart/TinyGPSPlus @ ^1.0.3
diff --git a/src/config.h b/src/config.h
@@ -4,7 +4,7 @@
 #include <M5GFX.h>
 
 // App Version
-#define APP_VERSION "v1.5.00"
+#define APP_VERSION "v1.6.00"
 
 // ---------- Colors ----------
 #define COL_BG        0x0000  // Black
@@ -14,6 +14,14 @@
 #define COL_SAT_PATH  0x07E0  // Green for radar path
 #define COL_SAT_NOW   0xF800  // Red for current pos
 
+// ---------- GPS Module (CAP LoRa868) ----------
+#define GPS_RX_PIN      15  // ESP32 RX (Receives from GPS TX)
+#define GPS_TX_PIN      13  // ESP32 TX (Sends to GPS RX)
+#define GPS_BAUD        115200
+
+// Shared Globals
+extern bool useGpsModule; // New config flag
+
 // ---------- Geometry ----------
 #define FRAME_MARGIN  5
 #define TEXT_LEFT     22
@@ -29,7 +37,7 @@
 // ----------LEDs------------
 #define LED_PIN         21  // M5StampS3 RGB LED
 #define LED_COUNT       1
-#define LED_BRIGHTNESS  20  // Keep it low (0-255) to save power/eyes
+#define LED_BRIGHTNESS  200  // Keep it low (0-255) to save power/eyes
 
 // ---------- Settings ----------
 #define ISS_TLE_PATH "/apps/iss_tracker/iss.tle"
diff --git a/src/main.cpp b/src/main.cpp
@@ -5,13 +5,15 @@
 #include <Preferences.h>
 #include <time.h>
 #include <Adafruit_NeoPixel.h>
+#include <TinyGPS++.h>
 
 #include "config.h"
 #include "orbit.h"
 #include "ui.h"
 #include "credentials.h"
 #include "iss_icon.h" 
 
+
 // --- GLOBALS ---
 M5Canvas canvas(&M5Cardputer.Display);
 Preferences prefs;
@@ -27,6 +29,10 @@ int tzOffsetHours = -6;
 String satName = "";
 bool tleParsedOK = false;
 
+TinyGPSPlus gps;
+HardwareSerial gpsSerial(1); // Use UART 1
+bool useGpsModule = false;
+
 // --- LED State Variables ---
 bool wasVisible = false;       // Tracks state from previous loop
 bool losTimerActive = false;   // Are we currently showing the Red LOS light?
@@ -47,6 +53,7 @@ enum Screen {
     SCREEN_MENU_WIFI,
     SCREEN_MENU_SAT,
     SCREEN_MENU_LOC,
+    SCREEN_GPS_INFO,
     
     SCREEN_COUNT // Keep this for the G0 cycling logic
 };
@@ -162,10 +169,16 @@ void setup() {
     obsLonDeg = prefs.getDouble("lon", obsLonDeg);
     minElevation = prefs.getInt("minEl", DEFAULT_MIN_EL);
     tzOffsetHours = prefs.getInt("tzOffset", -6); 
+    useGpsModule = prefs.getBool("useGps", false); // Load preference
     prefs.end();
 
     configTime(tzOffsetHours * 3600, 0, "pool.ntp.org");
 
+    // Init GPS Serial if enabled
+    if (useGpsModule) {
+        gpsSerial.begin(GPS_BAUD, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
+    }
+
     // Load TLE
     String localTle = readFileFromSD(ISS_TLE_PATH);
     if (localTle != "ERROR") {
@@ -204,6 +217,23 @@ void setup() {
 void loop() {
     M5Cardputer.update();
 
+    // --- GPS PARSING ---
+    if (useGpsModule) {
+        while (gpsSerial.available() > 0) {
+            gps.encode(gpsSerial.read());
+        }
+        if (gps.location.isUpdated()) {
+            obsLatDeg = gps.location.lat();
+            obsLonDeg = gps.location.lng();
+            setupOrbitLocation(obsLatDeg, obsLonDeg); // Update SGP4 instantly
+            
+            // Optional: Sync system time from GPS if valid
+            if (gps.time.isValid() && gps.date.isValid() && gps.time.age() < 1000) {
+                 // You could implement setTime() here if WiFi NTP fails!
+            }
+        }
+    }
+
     // --- 1. KEYBOARD INPUT HANDLING ---
     if (M5Cardputer.Keyboard.isChange() && M5Cardputer.Keyboard.isPressed()) {
         Keyboard_Class::KeysState k = M5Cardputer.Keyboard.keysState();
@@ -220,6 +250,9 @@ void loop() {
                 currentScreen == SCREEN_MENU_LOC) {
                 currentScreen = SCREEN_MENU_MAIN; // Submenu -> Main Menu
             } 
+            else if (currentScreen == SCREEN_GPS_INFO) { // <--- Add this
+                currentScreen = SCREEN_MENU_LOC;         // Back to Loc Menu
+            }
             else if (currentScreen == SCREEN_MENU_MAIN) {
                 currentScreen = SCREEN_HOME;      // Main Menu -> Home
             }
@@ -291,26 +324,58 @@ void loop() {
                 }
             }
             // LOCATION MENU
-            else if (currentScreen == SCREEN_MENU_LOC) {
+else if (currentScreen == SCREEN_MENU_LOC) {
                  for (auto c : k.word) {
+                    // TOGGLE GPS MODE
                     if (c == '1') { 
-                        String l = textInput(String(obsLatDeg), "Lat:");
-                        obsLatDeg = l.toFloat();
+                        useGpsModule = !useGpsModule;
+                        
+                        // Save Preference
                         prefs.begin("iss_cfg", false);
-                        prefs.putDouble("lat", obsLatDeg);
+                        prefs.putBool("useGps", useGpsModule);
                         prefs.end();
-                        setupOrbitLocation(obsLatDeg, obsLonDeg);
+                        
+                        // Start/Stop Serial
+                        if (useGpsModule) {
+                            gpsSerial.begin(GPS_BAUD, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
+                        } else {
+                            // Keeping serial open is fine, or you can gpsSerial.end();
+                        }
                         needsRedraw = true;
                     }
-                    if (c == '2') {
-                        String lo = textInput(String(obsLonDeg), "Lon:");
-                        obsLonDeg = lo.toFloat();
-                        prefs.begin("iss_cfg", false);
-                        prefs.putDouble("lon", obsLonDeg);
-                        prefs.end();
-                        setupOrbitLocation(obsLatDeg, obsLonDeg);
+                    
+                    // EDIT LAT (Only if Manual)
+                    if (c == '2') { 
+                        if (!useGpsModule) {
+                            String l = textInput(String(obsLatDeg), "Lat:");
+                            obsLatDeg = l.toFloat();
+                            prefs.begin("iss_cfg", false);
+                            prefs.putDouble("lat", obsLatDeg);
+                            prefs.end();
+                            setupOrbitLocation(obsLatDeg, obsLonDeg);
+                        }
+                        needsRedraw = true;
+                    }
+                    
+                    // EDIT LON (Only if Manual)
+                    if (c == '3') {
+                        if (!useGpsModule) {
+                            String lo = textInput(String(obsLonDeg), "Lon:");
+                            obsLonDeg = lo.toFloat();
+                            prefs.begin("iss_cfg", false);
+                            prefs.putDouble("lon", obsLonDeg);
+                            prefs.end();
+                            setupOrbitLocation(obsLatDeg, obsLonDeg);
+                        }
                         needsRedraw = true;
                     }
+
+                    if (c == '4') {
+                        if (useGpsModule) {
+                            currentScreen = SCREEN_GPS_INFO;
+                            needsRedraw = true;
+                        }
+            }
                 }
             }
         }
@@ -370,14 +435,18 @@ void loop() {
             case SCREEN_HOME:   drawHomeScreen(canvas); break;
             case SCREEN_LIVE:   drawLiveScreen(canvas, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min); break;
             case SCREEN_RADAR:  drawRadarScreen(canvas, unixtime); break;
-            case SCREEN_PASS:   drawPassScreen(canvas, unixtime, minElevation); break; 
-            
+            case SCREEN_PASS:   
+                drawPassScreen(canvas, unixtime, minElevation, obsLatDeg, obsLonDeg); 
+                break;            
             case SCREEN_MENU_MAIN: drawMainMenu(canvas); break;
             case SCREEN_MENU_WIFI: drawWifiMenu(canvas, wifiSsid); break;
             case SCREEN_MENU_SAT:  drawSatMenu(canvas, minElevation); break;
-            case SCREEN_MENU_LOC:  drawLocationMenu(canvas, obsLatDeg, obsLonDeg); break;
-            
+            case SCREEN_MENU_LOC:  
+                drawLocationMenu(canvas, obsLatDeg, obsLonDeg, useGpsModule, gps.location.isValid(), gps.satellites.value()); 
+                break;         
+            case SCREEN_GPS_INFO:  drawGpsInfoScreen(canvas, gps); break;
             default: break;
+            
         }
         canvas.pushSprite(0,0);
         needsRedraw = false;
diff --git a/src/ui.cpp b/src/ui.cpp
@@ -142,7 +142,7 @@ void drawRadarScreen(M5Canvas &d, unsigned long currentUnix) {
     }
 }
 
-void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl) {
+void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl, double lat, double lon) {
     drawFrame(d, "Pass Prediction");
     int y = TEXT_TOP + 25;
 
@@ -153,15 +153,27 @@ void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl) {
     static PassDetails nextPass;
     static unsigned long lastCalc = 0;
     static int lastMinEl = -1;
+    // ADD CACHING VARIABLES FOR LOCATION
+    static double lastLat = -999;
+    static double lastLon = -999;
 
-    if (currentUnix - lastCalc > 10000 || nextPass.aosUnix < currentUnix || lastMinEl != minEl) {
+    // UPDATE THE CHECK CONDITION:
+    // We now recalc if: Time expired OR Pass passed OR MinEl changed OR Location changed
+    if (currentUnix - lastCalc > 10000 || 
+        nextPass.aosUnix < currentUnix || 
+        lastMinEl != minEl || 
+        lastLat != lat || 
+        lastLon != lon) {
+            
         d.setCursor(TEXT_LEFT, y);
         d.println("Calculating...");
         d.pushSprite(0,0);
         
         if (predictNextPass(currentUnix, nextPass, minEl)) {
             lastCalc = currentUnix;
             lastMinEl = minEl;
+            lastLat = lat; // Update Cache
+            lastLon = lon; // Update Cache
             drawFrame(d, "Pass Prediction");
         } else {
             drawFrame(d, "Pass Prediction");
@@ -174,6 +186,7 @@ void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl) {
         }
     }
 
+    // ... (The rest of the drawing code remains exactly the same) ...
     time_t rawAos = nextPass.aosUnix;
     struct tm * taos = localtime(&rawAos);
     
@@ -267,14 +280,80 @@ void drawSatMenu(M5Canvas &d, int minEl) {
     d.printf("Inc: %.3f  Ecc: %.4f", tleIncDeg, tleEcc);
 }
 
-void drawLocationMenu(M5Canvas &d, double lat, double lon) {
+void drawLocationMenu(M5Canvas &d, double lat, double lon, bool useGps, bool gpsFix, int sats) {
     drawFrame(d, "Location Setup");
     int y = TEXT_TOP + 20;
+
+    // Item 1: Source
+    d.setCursor(TEXT_LEFT, y);
+    d.setTextColor(useGps ? COL_SAT_PATH : COL_TEXT);
+    d.printf("1) Source: [%s]\n", useGps ? "GPS Module" : "MANUAL");
+    d.setTextColor(COL_TEXT);
+    y += LINE_SPACING;
+
+    // Item 2 & 3: Lat/Lon
+    d.setCursor(TEXT_LEFT, y);
+    if (useGps) d.setTextColor(COL_ACCENT); // Dim if GPS active
+    d.printf("2) Set Lat: %.4f\n", lat);
+    y += LINE_SPACING;
     
     d.setCursor(TEXT_LEFT, y);
-    d.printf("1) Set Latitude\n   (Cur: %.4f)\n", lat);
-    y += LINE_SPACING * 2; // Extra space
+    d.printf("3) Set Lon: %.4f\n", lon);
+    d.setTextColor(COL_TEXT);
+    y += LINE_SPACING;
+
+    // Item 4: Details Link
+    d.setCursor(TEXT_LEFT, y);
+    if (!useGps) d.setTextColor(COL_ACCENT);
+    d.println("4) GPS Status Info >");
+    d.setTextColor(COL_TEXT);
+
+    // Footer Status
+    d.setCursor(TEXT_LEFT, d.height() - 25);
+    if (useGps) {
+        if (gpsFix) {
+            d.setTextColor(COL_SAT_PATH); // Green
+            d.printf("GPS Acquired (%d Sats)", sats);
+        } else {
+            d.setTextColor(COL_SAT_NOW); // Red/Orange
+            d.print("GPS: Searching...");
+        }
+    } else {
+        d.setTextColor(COL_ACCENT);
+        d.print("Mode: Fixed Location");
+    }
+}
+
+void drawGpsInfoScreen(M5Canvas &d, TinyGPSPlus &gps) {
+    drawFrame(d, "GPS Details");
+    int y = TEXT_TOP + 20;
+    
+    d.setCursor(TEXT_LEFT, y);
+    d.printf("Sats: %d  HDOP: %.1f\n", gps.satellites.value(), gps.hdop.hdop());
+    y += LINE_SPACING;
+
+    d.setCursor(TEXT_LEFT, y);
+    d.printf("Lat: %.5f\n", gps.location.lat());
+    y += LINE_SPACING;
+
+    d.setCursor(TEXT_LEFT, y);
+    d.printf("Lon: %.5f\n", gps.location.lng());
+    y += LINE_SPACING;
+
+    d.setCursor(TEXT_LEFT, y);
+    d.printf("Alt: %.1f m\n", gps.altitude.meters());
+    y += LINE_SPACING;
+
+    d.setCursor(TEXT_LEFT, y);
+    d.printf("Time: %02d:%02d:%02d UTC\n", gps.time.hour(), gps.time.minute(), gps.time.second());
     
+    y += LINE_SPACING;
     d.setCursor(TEXT_LEFT, y);
-    d.printf("2) Set Longitude\n   (Cur: %.4f)\n", lon);
+    if (gps.location.isValid()) {
+        d.setTextColor(COL_SAT_PATH);
+        d.print("STATUS: 3D FIX");
+    } else {
+        d.setTextColor(COL_SAT_NOW);
+        d.print("STATUS: NO FIX");
+    }
 }
diff --git a/src/ui.h b/src/ui.h
@@ -1,13 +1,15 @@
 #pragma once
 #include <M5GFX.h>
 #include <WiFi.h>
+#include <TinyGPS++.h>
 
 void drawHomeScreen(M5Canvas &d);
 void drawLiveScreen(M5Canvas &d, int year, int mon, int day, int hr, int min);
 void drawRadarScreen(M5Canvas &d, unsigned long currentUnix);
-void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl);
+void drawPassScreen(M5Canvas &d, unsigned long currentUnix, int minEl, double lat, double lon);
 
 void drawMainMenu(M5Canvas &d);
 void drawWifiMenu(M5Canvas &d, String storedSsid);
 void drawSatMenu(M5Canvas &d, int minEl);
-void drawLocationMenu(M5Canvas &d, double lat, double lon);
+void drawLocationMenu(M5Canvas &d, double lat, double lon, bool useGps, bool gpsFix, int sats);
+void drawGpsInfoScreen(M5Canvas &d, TinyGPSPlus &gps);
