Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-packa...

[fw/altos] / src / ao_gps_report.c

diff --git a/src/ao_gps_report.c b/src/ao_gps_report.c
index acf8bb4022552c8d43bd938fe256da22be177aa8..7abc93f5d8e868cda3c5542a75b06a9e73846f4e 100644 (file)
--- a/src/ao_gps_report.c
+++ b/src/ao_gps_report.c
@@ -22,6 +22,7 @@ ao_gps_report(void)
 {
        static __xdata struct ao_log_record     gps_log;
        static __xdata struct ao_gps_data       gps_data;
+       uint8_t date_reported = 0;
 
        for (;;) {
                ao_sleep(&ao_gps_data);
@@ -32,7 +33,7 @@ ao_gps_report(void)
                if (!(gps_data.flags & AO_GPS_VALID))
                        continue;
 
-               gps_log.tick = ao_time();
+               gps_log.tick = ao_gps_tick;
                gps_log.type = AO_LOG_GPS_TIME;
                gps_log.u.gps_time.hour = gps_data.hour;
                gps_log.u.gps_time.minute = gps_data.minute;
@@ -49,6 +50,14 @@ ao_gps_report(void)
                gps_log.u.gps_altitude.altitude = gps_data.altitude;
                gps_log.u.gps_altitude.unused = 0xffff;
                ao_log_data(&gps_log);
+               if (!date_reported && (gps_data.flags & AO_GPS_DATE_VALID)) {
+                       gps_log.type = AO_LOG_GPS_DATE;
+                       gps_log.u.gps_date.year = gps_data.year;
+                       gps_log.u.gps_date.month = gps_data.month;
+                       gps_log.u.gps_date.day = gps_data.day;
+                       gps_log.u.gps_date.extra = 0;
+                       date_reported = ao_log_data(&gps_log);
+               }
        }
 }
 
@@ -62,20 +71,18 @@ ao_gps_tracking_report(void)
        for (;;) {
                ao_sleep(&ao_gps_tracking_data);
                ao_mutex_get(&ao_gps_mutex);
+               gps_log.tick = ao_gps_tick;
                memcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (struct ao_gps_tracking_data));
                ao_mutex_put(&ao_gps_mutex);
 
                if (!(n = gps_tracking_data.channels))
                        continue;
 
-               gps_log.tick = ao_time();
                gps_log.type = AO_LOG_GPS_SAT;
                for (c = 0; c < n; c++)
-                       if ((gps_log.u.gps_sat.svid = gps_tracking_data.sats[c].svid) &&
-                           (gps_log.u.gps_sat.state = gps_tracking_data.sats[c].state))
+                       if ((gps_log.u.gps_sat.svid = gps_tracking_data.sats[c].svid))
                        {
                                gps_log.u.gps_sat.c_n = gps_tracking_data.sats[c].c_n_1;
-                               gps_log.u.gps_sat.unused = 0;
                                ao_log_data(&gps_log);
                        }
        }