Port to lora_isp4520 board

src/gps/GPS.cpp

@@ -300,3 +300,49 @@ int GPS::prepareDeepSleep(void *unused)
 
     return 0;
 }
+
+#ifdef GPS_TX_PIN
+#include "UBloxGPS.h"
+#endif
+
+#ifdef HAS_AIR530_GPS
+#include "Air530GPS.h"
+#elif !defined(NO_GPS)
+#include "NMEAGPS.h"
+#endif
+
+
+GPS* createGps() {
+
+#ifdef NO_GPS
+    return nullptr;
+#else
+// If we don't have bidirectional comms, we can't even try talking to UBLOX
+#ifdef GPS_TX_PIN
+    // Init GPS - first try ublox
+    UBloxGPS *ublox = new UBloxGPS();
+    
+    if (!ublox->setup()) {
+        DEBUG_MSG("ERROR: No UBLOX GPS found\n");
+        delete ublox;
+        ublox = NULL;
+    } else {
+        return ublox;
+    }
+#endif
+
+    if (GPS::_serial_gps) {
+        // Some boards might have only the TX line from the GPS connected, in that case, we can't configure it at all.  Just
+        // assume NMEA at 9600 baud.
+        DEBUG_MSG("Hoping that NMEA might work\n");
+#ifdef HAS_AIR530_GPS
+        GPS* new_gps = new Air530GPS();
+#else
+        GPS* new_gps = new NMEAGPS();
+#endif
+        new_gps->setup();
+        return new_gps;
+    }
+    return nullptr;
+#endif
+}

src/gps/GPS.h

@@ -71,6 +71,9 @@ class GPS : private concurrency::OSThread
      * */
     void forceWake(bool on);
 
+    // Some GPS modules (ublock) require factory reset
+    virtual bool factoryReset() { return true; }
+
   protected:
     /// Do gps chipset specific init, return true for success
     virtual bool setupGPS();
@@ -145,4 +148,8 @@ class GPS : private concurrency::OSThread
     virtual int32_t runOnce();
 };
 
+// Creates an instance of the GPS class. 
+// Returns the new instance or null if the GPS is not present.
+GPS* createGps();
+
 extern GPS *gps;

src/gps/RTC.cpp

@@ -39,22 +39,23 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
         currentQuality = q;
         shouldSet = true;
         DEBUG_MSG("Upgrading time to RTC %ld secs (quality %d)\n", tv->tv_sec, q);
-    } else if(q == RTCQualityGPS && (now - lastSetMsec) > (12 * 60 * 60 * 1000L)) {
-        // Every 12 hrs we will slam in a new GPS time, to correct for local RTC clock drift
+    } else if(q > RTCQualityNone && q == currentQuality && (now - lastSetMsec) > (12 * 60 * 60 * 1000L)) {
+        // Every 12 hrs we will slam in a new time, to correct for local RTC clock drift
         shouldSet = true;
-        DEBUG_MSG("Reapplying GPS time to correct clock drift %ld secs\n", tv->tv_sec);
+        DEBUG_MSG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
     }
     else
         shouldSet = false;
 
     if (shouldSet) {
-        lastSetMsec = now;
+        lastSetMsec = now;       
 #ifndef NO_ESP32
         settimeofday(tv, NULL);
-#else
-        DEBUG_MSG("ERROR TIME SETTING NOT IMPLEMENTED!\n");
-#endif
         readFromRTC();
+#else 
+        timeStartMsec = now;
+        zeroOffsetSecs = tv->tv_sec;
+#endif
         return true;
     } else {
         return false;