X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-logfile.c;h=c193b1c7f5ec4f3a3120dfa392898b1d42d90b21;hb=72bcff4c1af10571314e5cbbe29f073de818088e;hp=b0fff9f8c0ea7f01d0be54449b1ff77cbead2c70;hpb=8065b8146a31438e66f83c13b99281ec47439a73;p=fw%2Faltos

diff --git a/ao-tools/lib/cc-logfile.c b/ao-tools/lib/cc-logfile.c
index b0fff9f8..c193b1c7 100644
--- 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;
 }
 
@@ -296,8 +306,8 @@ cc_log_read(FILE *file)
 {
 	struct cc_flightraw	*f;
 	char			line[8192];
-	double			ground_pres;
-	int			ground_pres_count;
+	double			ground_pres = 0.0;
+	int			ground_pres_count = 0;
 
 	f = calloc(1, sizeof (struct cc_flightraw));
 	if (!f)