X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc.h;h=ede46aa0edd6b76a1948b1fcb8770fe3291cd635;hp=fd461e5c6239e8ee05415cb6b6ecf837302c89ba;hb=9856b7c4397afcecc8f541af9a83824e817b3612;hpb=4cffc9c4b079e39c8196ddbaf91129cda6df7f8b

diff --git a/ao-tools/lib/cc.h b/ao-tools/lib/cc.h
index fd461e5c..ede46aa0 100644
--- a/ao-tools/lib/cc.h
+++ b/ao-tools/lib/cc.h
@@ -61,7 +61,7 @@ char *
 cc_get_log_dir(void);
 
 char *
-cc_make_filename(int serial, char *ext);
+cc_make_filename(int serial, int flight, char *ext);
 
 /*
  * For sequential data which are not evenly spaced
@@ -86,6 +86,10 @@ struct cc_timedata {
 
 struct cc_gpselt {
 	double		time;
+	int		hour;
+	int		minute;
+	int		second;
+	int		flags;
 	double		lat;
 	double		lon;
 	double		alt;
@@ -103,7 +107,6 @@ struct cc_gpselt {
 struct cc_gpssat {
 	double		time;
 	uint16_t	svid;
-	uint8_t		state;
 	uint8_t		c_n;
 };
 
@@ -150,6 +153,7 @@ struct cc_flightraw {
 	int			serial;
 	double			ground_accel;
 	double			ground_pres;
+	int			year, month, day;
 	struct cc_timedata	accel;
 	struct cc_timedata	pres;
 	struct cc_timedata	temp;
@@ -192,6 +196,9 @@ struct cc_flightcooked {
 
 
 struct cc_gps_time {
+	int year;
+	int month;
+	int day;
 	int hour;
 	int minute;
 	int second;
@@ -226,7 +233,6 @@ struct cc_gps {
 
 struct cc_gps_sat {
 	int	svid;
-	int	state;
 	int	c_n0;
 };
 
@@ -238,6 +244,7 @@ struct cc_gps_tracking {
 struct cc_telem {
 	char	callsign[16];
 	int	serial;
+	int	flight;
 	int	rssi;
 	char	state[16];
 	int	tick;