update changelogs for Debian build

[fw/altos] / src / ao_gps_report.c

diff --git a/src/ao_gps_report.c b/src/ao_gps_report.c
index 1b5402a8f883e06ff180d097e38da06f5184dc12..acf8bb4022552c8d43bd938fe256da22be177aa8 100644 (file)
--- a/src/ao_gps_report.c
+++ b/src/ao_gps_report.c
@@ -40,14 +40,10 @@ ao_gps_report(void)
                gps_log.u.gps_time.flags = gps_data.flags;
                ao_log_data(&gps_log);
                gps_log.type = AO_LOG_GPS_LAT;
-               gps_log.u.gps_latitude.degrees = gps_data.latitude.degrees;
-               gps_log.u.gps_latitude.minutes = gps_data.latitude.minutes;
-               gps_log.u.gps_latitude.minutes_fraction = gps_data.latitude.minutes_fraction;
+               gps_log.u.gps_latitude = gps_data.latitude;
                ao_log_data(&gps_log);
                gps_log.type = AO_LOG_GPS_LON;
-               gps_log.u.gps_longitude.degrees = gps_data.longitude.degrees;
-               gps_log.u.gps_longitude.minutes = gps_data.longitude.minutes;
-               gps_log.u.gps_longitude.minutes_fraction = gps_data.longitude.minutes_fraction;
+               gps_log.u.gps_longitude = gps_data.longitude;
                ao_log_data(&gps_log);
                gps_log.type = AO_LOG_GPS_ALT;
                gps_log.u.gps_altitude.altitude = gps_data.altitude;
@@ -56,10 +52,41 @@ ao_gps_report(void)
        }
 }
 
+void
+ao_gps_tracking_report(void)
+{
+       static __xdata struct ao_log_record     gps_log;
+       static __xdata struct ao_gps_tracking_data      gps_tracking_data;
+       uint8_t c, n;
+
+       for (;;) {
+               ao_sleep(&ao_gps_tracking_data);
+               ao_mutex_get(&ao_gps_mutex);
+               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))
+                       {
+                               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);
+                       }
+       }
+}
+
 __xdata struct ao_task ao_gps_report_task;
+__xdata struct ao_task ao_gps_tracking_report_task;
 
 void
 ao_gps_report_init(void)
 {
        ao_add_task(&ao_gps_report_task, ao_gps_report, "gps_report");
+       ao_add_task(&ao_gps_tracking_report_task, ao_gps_tracking_report, "gps_tracking_report");
 }