Merge branch 'dev'

src/gps/NMEAGPS.cpp

@@ -1,6 +1,5 @@
 #include "NMEAGPS.h"
 #include "configuration.h"
-#include "timing.h"
 
 static int32_t toDegInt(RawDegrees d)
 {
@@ -19,7 +18,7 @@ void NMEAGPS::loop()
         reader.encode(c);
     }
 
-    uint32_t now = timing::millis();
+    uint32_t now = millis();
     if ((now - lastUpdateMsec) > 20 * 1000) { // Ugly hack for now - limit update checks to once every 20 secs (but still consume
                                               // serial chars at whatever rate)
         lastUpdateMsec = now;