X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-logfile.c;h=c193b1c7f5ec4f3a3120dfa392898b1d42d90b21;hp=2136eec4d428cde3d077cb9a0c407259111af63d;hb=6f729ff46b2f4531db68f0af85e7e9fe0f6d1969;hpb=7ea371a09385e2a93199f78685e8cb86793ed104

diff --git a/ao-tools/lib/cc-logfile.c b/ao-tools/lib/cc-logfile.c
index 2136eec4..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
@@ -101,11 +102,12 @@ gpssat_add(struct cc_gpsdata *data, struct cc_gpssat *sat)
 			if (data->sizesats == 0)
 				newsats = malloc((newsizesats = 256) * sizeof (struct cc_gpssats));
 			else
-				newsats = realloc (data->data, (newsizesats = data->sizesats * 2)
+				newsats = realloc (data->sats, (newsizesats = data->sizesats * 2)
 						   * sizeof (struct cc_gpssats));
 			if (!newsats)
 				return 0;
 			data->sats = newsats;
+			data->sizesats = newsizesats;
 		}
 		i = data->numsats++;
 		data->sats[i].nsat = 0;
@@ -135,6 +137,7 @@ gpsdata_free(struct cc_gpsdata *data)
 #define AO_LOG_GPS_LON		'W'
 #define AO_LOG_GPS_ALT		'H'
 #define AO_LOG_GPS_SAT		'V'
+#define AO_LOG_GPS_DATE		'Y'
 
 #define AO_LOG_POS_NONE		(~0UL)
 
@@ -194,6 +197,10 @@ read_eeprom(const char *line, struct cc_flightraw *f, double *ground_pres, int *
 		 * any stale data before adding this record
 		 */
 		gps.time = tick;
+		gps.hour = (a & 0xff);
+		gps.minute = (a >> 8) & 0xff;
+		gps.second = (b & 0xff);
+		gps.flags = (b >> 8) & 0xff;
 		gps_valid = GPS_TIME;
 		break;
 	case AO_LOG_GPS_LAT:
@@ -211,10 +218,14 @@ read_eeprom(const char *line, struct cc_flightraw *f, double *ground_pres, int *
 	case AO_LOG_GPS_SAT:
 		sat.time = tick;
 		sat.svid = a;
-		sat.state = (b & 0xff);
 		sat.c_n = (b >> 8) & 0xff;
 		gpssat_add(&f->gps, &sat);
 		break;
+	case AO_LOG_GPS_DATE:
+		f->year = 2000 + (a & 0xff);
+		f->month = (a >> 8) & 0xff;
+		f->day = (b & 0xff);
+		break;
 	default:
 		return 0;
 	}
@@ -253,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;
@@ -266,12 +280,24 @@ read_telem(const char *line, struct cc_flightraw *f)
 	timedata_add(&f->main, telem.tick, telem.main);
 	timedata_add(&f->state, telem.tick, state_name_to_state(telem.state));
 	if (telem.gps.gps_locked) {
+		f->year = telem.gps.gps_time.year;
+		f->month = telem.gps.gps_time.month;
+		f->day = telem.gps.gps_time.day;
 		gps.time = telem.tick;
 		gps.lat = telem.gps.lat;
 		gps.lon = telem.gps.lon;
 		gps.alt = telem.gps.alt;
+		gps.hour = telem.gps.gps_time.hour;
+		gps.minute = telem.gps.gps_time.minute;
+		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;
 }
 
@@ -280,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)