Stop using SiRF state info.

[fw/altos] / ao-tools / lib / cc.h

diff --git a/ao-tools/lib/cc.h b/ao-tools/lib/cc.h
index 0122695889b022d05ed63617318ea41bff8a6427..0e8ced8a63c6c93d3897d23647fa8cde17064b41 100644 (file)
--- a/ao-tools/lib/cc.h
+++ b/ao-tools/lib/cc.h
@@ -19,6 +19,7 @@
 #define _CC_H_
 
 #include <stdio.h>
+#include <stdint.h>
 
 char *
 cc_fullname (char *dir, char *file);
@@ -90,11 +91,34 @@ struct cc_gpselt {
        double          alt;
 };
 
+#define SIRF_SAT_STATE_ACQUIRED                        (1 << 0)
+#define SIRF_SAT_STATE_CARRIER_PHASE_VALID     (1 << 1)
+#define SIRF_SAT_BIT_SYNC_COMPLETE             (1 << 2)
+#define SIRF_SAT_SUBFRAME_SYNC_COMPLETE                (1 << 3)
+#define SIRF_SAT_CARRIER_PULLIN_COMPLETE       (1 << 4)
+#define SIRF_SAT_CODE_LOCKED                   (1 << 5)
+#define SIRF_SAT_ACQUISITION_FAILED            (1 << 6)
+#define SIRF_SAT_EPHEMERIS_AVAILABLE           (1 << 7)
+
+struct cc_gpssat {
+       double          time;
+       uint16_t        svid;
+       uint8_t         c_n;
+};
+
+struct cc_gpssats {
+       int                     nsat;
+       struct cc_gpssat        sat[12];
+};
+
 struct cc_gpsdata {
        int                     num;
        int                     size;
        struct cc_gpselt        *data;
        double                  time_offset;
+       int                     numsats;
+       int                     sizesats;
+       struct cc_gpssats       *sats;
 };
 
 /*
@@ -167,6 +191,9 @@ struct cc_flightcooked {
 
 
 struct cc_gps_time {
+       int year;
+       int month;
+       int day;
        int hour;
        int minute;
        int second;
@@ -213,6 +240,7 @@ struct cc_gps_tracking {
 struct cc_telem {
        char    callsign[16];
        int     serial;
+       int     flight;
        int     rssi;
        char    state[16];
        int     tick;
@@ -227,6 +255,8 @@ struct cc_telem {
        int     flight_vel;
        int     flight_pres;
        int     ground_pres;
+       int     accel_plus_g;
+       int     accel_minus_g;
        struct cc_gps   gps;
        struct cc_gps_tracking  gps_tracking;
 };