Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / lib / cc-logfile.c

diff --git a/ao-tools/lib/cc-logfile.c b/ao-tools/lib/cc-logfile.c
index b0fff9f8c0ea7f01d0be54449b1ff77cbead2c70..88ddda58822ee487da4a7b07a6620bc3b914bb9c 100644 (file)
--- a/ao-tools/lib/cc-logfile.c
+++ b/ao-tools/lib/cc-logfile.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -263,6 +264,9 @@ read_telem(const char *line, struct cc_flightraw *f)
 {
        struct cc_telem         telem;
        struct cc_gpselt        gps;
+       struct cc_gpssat        sat;
+       int                     s;
+
        if (!cc_telem_parse(line, &telem))
                return 0;
        f->ground_accel = telem.ground_accel;
@@ -288,6 +292,12 @@ read_telem(const char *line, struct cc_flightraw *f)
                gps.second = telem.gps.gps_time.second;
                gpsdata_add(&f->gps, &gps);
        }
+       for (s = 0; s < telem.gps_tracking.channels; s++) {
+               sat.time = telem.tick;
+               sat.svid = telem.gps_tracking.sats[s].svid;
+               sat.c_n = telem.gps_tracking.sats[s].c_n0;
+               gpssat_add(&f->gps, &sat);
+       }
        return 1;
 }