altos: Complete new telemetry switchover

[fw/altos] / src / ao_gps_test_skytraq.c

diff --git a/src/ao_gps_test_skytraq.c b/src/ao_gps_test_skytraq.c
index 510bc41916532aa3b53f4ec2037226af62c20f39..a78fae0fefcda4f49ecf6a3b04107976fc57baf0 100644 (file)
--- a/src/ao_gps_test_skytraq.c
+++ b/src/ao_gps_test_skytraq.c
@@ -27,8 +27,13 @@
 
 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
+#define AO_GPS_DATE_VALID      (1 << 6)
+#define AO_GPS_COURSE_VALID    (1 << 7)
 
-struct ao_gps_data {
+struct ao_gps_orig {
+       uint8_t                 year;
+       uint8_t                 month;
+       uint8_t                 day;
        uint8_t                 hour;
        uint8_t                 minute;
        uint8_t                 second;
@@ -53,17 +58,22 @@ struct ao_gps_data {
 #define SIRF_SAT_ACQUISITION_FAILED            (1 << 6)
 #define SIRF_SAT_EPHEMERIS_AVAILABLE           (1 << 7)
 
-struct ao_gps_sat_data {
+struct ao_gps_sat_orig {
        uint8_t         svid;
-       uint8_t         state;
        uint8_t         c_n_1;
 };
 
-struct ao_gps_tracking_data {
+#define AO_MAX_GPS_TRACKING    12
+
+struct ao_gps_tracking_orig {
        uint8_t                 channels;
-       struct ao_gps_sat_data  sats[12];
+       struct ao_gps_sat_orig  sats[AO_MAX_GPS_TRACKING];
 };
 
+#define ao_telemetry_location ao_gps_orig
+#define ao_telemetry_satellite ao_gps_tracking_orig
+#define ao_telemetry_satellite_info ao_gps_sat_orig
+
 void
 ao_mutex_get(uint8_t *mutex)
 {
@@ -404,6 +414,8 @@ ao_serial_set_speed(uint8_t speed)
        tcflush(fd, TCIFLUSH);
 }
 
+#define ao_time() 0
+
 #include "ao_gps_print.c"
 #include "ao_gps_skytraq.c"