merged with master

src/gps/GPS.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include "Observer.h"
+#include "GPSStatus.h"
+#include "../concurrency/PeriodicTask.h"
 #include "sys/time.h"
 
 /// If we haven't yet set our RTC this boot, set it from a GPS derived time
@@ -34,11 +36,15 @@ class GPS : public Observable<void *>
     int32_t latitude = 0, longitude = 0; // as an int mult by 1e-7 to get value as double
     int32_t altitude = 0;
     uint32_t dop = 0; // Diminution of position; PDOP where possible (UBlox), HDOP otherwise (TinyGPS) in 10^2 units (needs scaling before use)
+    uint32_t heading = 0; // Heading of motion, in degrees * 10^-5
+    uint32_t numSatellites = 0;
 
     bool isConnected = false; // Do we have a GPS we are talking to
 
     virtual ~GPS() {}
 
+    Observable<const meshtastic::GPSStatus *> newStatus;
+
     /**
      * Returns true if we succeeded
      */