Stop using SiRF state info.

[fw/altos] / ao-tools / ao-postflight / ao-postflight.c

diff --git a/ao-tools/ao-postflight/ao-postflight.c b/ao-tools/ao-postflight/ao-postflight.c
index 60d8c0362052ec63e80b33a8a8043931a10a85a9..c12939aaedb72b966116eb5d1d228df67d27ad93 100644 (file)
--- a/ao-tools/ao-postflight/ao-postflight.c
+++ b/ao-tools/ao-postflight/ao-postflight.c
@@ -204,8 +204,10 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
        struct cc_flightcooked *cooked;
        double  apogee;
 
-       fprintf(summary_file, "Flight:  %9d\nSerial:  %9d\n",
-               f->flight, f->serial);
+       fprintf(summary_file,
+               "Serial:  %9d\n"
+               "Flight:  %9d\n",
+               f->serial, f->flight);
        boost_start = f->accel.data[0].time;
        boost_stop = f->accel.data[f->accel.num-1].time;
        for (i = 0; i < f->state.num; i++) {
@@ -358,7 +360,7 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
                        nsat = 0;
                        for (k = 0; k < f->gps.sats[j].nsat; k++) {
                                fprintf (gps_file, " %12.7f", (double) f->gps.sats[j].sat[k].c_n);
-                               if (f->gps.sats[j].sat[k].state == 0xbf)
+                               if (f->gps.sats[j].sat[k].svid != 0)
                                        nsat++;
                        }
                        fprintf(gps_file, " %d\n", nsat);
@@ -379,7 +381,7 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
                        }
                        nsat = 0;
                        for (k = 0; k < f->gps.sats[j].nsat; k++)
-                               if (f->gps.sats[j].sat[k].state == 0xbf)
+                               if (f->gps.sats[j].sat[k].svid != 0)
                                        nsat++;
 
                        fprintf(kml_file, "%12.7f, %12.7f, %12.7f <!-- time %12.7f sats %d -->",