diff options
| author | Bdale Garbee <bdale@gag.com> | 2009-10-10 15:05:50 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2009-10-10 15:05:50 -0600 |
| commit | 541da6f3bbf81be93dfe3c01f7c8cfd757b28a2b (patch) | |
| tree | bd784c8aca6edc22db2cd89a38afc88182cd2256 /ao-tools/ao-postflight/ao-postflight.c | |
| parent | dfc73cba1bee8b121e00e8cba45e7dfaaf79e9d8 (diff) | |
| parent | 5f26ad663b3f60dddc9d967206e365f45dc4acd1 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'ao-tools/ao-postflight/ao-postflight.c')
| -rw-r--r-- | ao-tools/ao-postflight/ao-postflight.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ao-tools/ao-postflight/ao-postflight.c b/ao-tools/ao-postflight/ao-postflight.c index 6418521e..cc9f64b4 100644 --- a/ao-tools/ao-postflight/ao-postflight.c +++ b/ao-tools/ao-postflight/ao-postflight.c @@ -313,14 +313,30 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file, FI } } if (gps_file) { + int j = 0; fprintf(gps_file, "%9s %12s %12s %12s\n", "time", "lat", "lon", "alt"); for (i = 0; i < f->gps.num; i++) { - fprintf(gps_file, "%12.7f %12.7f %12.7f %12.7f\n", + int nsat = 0; + int k; + while (j < f->gps.numsats - 1) { + if (f->gps.sats[j].sat[0].time <= f->gps.data[i].time && + f->gps.data[i].time < f->gps.sats[j+1].sat[0].time) + break; + j++; + } + fprintf(gps_file, "%12.7f %12.7f %12.7f %12.7f", (f->gps.data[i].time - boost_start) / 100.0, f->gps.data[i].lat, f->gps.data[i].lon, f->gps.data[i].alt); + 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) + nsat++; + } + fprintf(gps_file, " %d\n", nsat); } } if (cooked && plot_name) { |