X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-postflight%2Fao-postflight.c;h=cbf9c047aafa6411279420248973e691e2d2f193;hp=a19b7ebbde750a383a3ddc053f6b0836650a12af;hb=f8967607b3dda0c0ce7afe8bb077da2da5ed3dcd;hpb=8065b8146a31438e66f83c13b99281ec47439a73

diff --git a/ao-tools/ao-postflight/ao-postflight.c b/ao-tools/ao-postflight/ao-postflight.c
index a19b7ebb..cbf9c047 100644
--- a/ao-tools/ao-postflight/ao-postflight.c
+++ b/ao-tools/ao-postflight/ao-postflight.c
@@ -185,6 +185,75 @@ static const char kml_footer[] =
 	"</Placemark>\n"
 	"</kml>\n";
 
+static unsigned
+gps_daytime(struct cc_gpselt *gps)
+{
+	return ((gps->hour * 60 +
+		 gps->minute) * 60 +
+		gps->second) * 1000;
+}
+
+int
+daytime_hour(unsigned daytime)
+{
+	return daytime / 1000 / 60 / 60;
+}
+
+int
+daytime_minute(unsigned daytime)
+{
+	return (daytime / 1000 / 60) % 60;
+}
+
+int
+daytime_second(unsigned daytime)
+{
+	return (daytime / 1000) % 60;
+}
+
+int
+daytime_millisecond(unsigned daytime)
+{
+	return daytime % 1000;
+}
+
+static unsigned
+compute_daytime_ms(double time, struct cc_gpsdata *gps)
+{
+	int	i;
+	unsigned	gps_start_daytime, gps_stop_daytime;
+
+	if (time <= gps->data[0].time) {
+		gps_stop_daytime = gps_daytime(&gps->data[0]);
+		return gps_stop_daytime - (gps->data[0].time - time) * 10;
+	}
+	for (i = 0; i < gps->num - 1; i++)
+		if (time > gps->data[i].time)
+			break;
+	gps_start_daytime = gps_daytime(&gps->data[i]);
+	if (i == gps->num - 1) {
+		return gps_start_daytime + (time - gps->data[i].time) * 10;
+	} else {
+		unsigned	gps_period_daytime;
+		double		gps_period_time;
+		double		time_since_start;
+
+		gps_stop_daytime = gps_daytime(&gps->data[i + 1]);
+
+		/* range of gps daytime values */
+		gps_period_daytime = gps_stop_daytime - gps_start_daytime;
+
+		/* range of gps time values */
+		gps_period_time = gps->data[i+1].time - gps->data[i].time;
+
+		/* sample time after first gps time */
+		time_since_start = time - gps->data[i].time;
+
+		return gps_start_daytime +
+			gps_period_daytime * time_since_start / gps_period_time;
+	}
+}
+
 static void
 analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
 	       FILE *raw_file, char *plot_name, FILE *gps_file, FILE *kml_file)
@@ -325,36 +394,67 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
 		int	i;
 		double	*times;
 
-		fprintf(detail_file, "%9s %9s %9s %9s\n",
-		       "time", "height", "speed", "accel");
+		fprintf(detail_file, "%9s %9s %9s %9s %9s\n",
+			"time", "height", "speed", "accel", "daytime");
 		for (i = 0; i < cooked->pres_pos.num; i++) {
-			double	time = (cooked->accel_accel.start + i * cooked->accel_accel.step - boost_start) / 100.0;
+			double	clock_time = cooked->accel_accel.start + i * cooked->accel_accel.step;
+			double	time = (clock_time - boost_start) / 100.0;
 			double	accel = cooked->accel_accel.data[i];
 			double	pos = cooked->pres_pos.data[i];
 			double	speed;
+			unsigned	daytime;
 			if (cooked->pres_pos.start + cooked->pres_pos.step * i < apogee)
 				speed = cooked->accel_speed.data[i];
 			else
 				speed = cooked->pres_speed.data[i];
-			fprintf(detail_file, "%9.2f %9.2f %9.2f %9.2f\n",
-			       time, pos, speed, accel);
+			if (f->gps.num)
+				daytime = compute_daytime_ms(clock_time, &f->gps);
+			else
+				daytime = 0;
+			fprintf(detail_file, "%9.2f %9.2f %9.2f %9.2f %02d:%02d:%02d.%03d\n",
+				time, pos, speed, accel,
+				daytime_hour(daytime),
+				daytime_minute(daytime),
+				daytime_second(daytime),
+				daytime_millisecond(daytime));
 		}
 	}
 	if (raw_file) {
-		fprintf(raw_file, "%9s %9s %9s\n",
-		       "time", "height", "accel");
+		fprintf(raw_file, "%9s %9s %9s %9s\n",
+			"time", "height", "accel", "daytime");
 		for (i = 0; i < cooked->pres.num; i++) {
 			double time = cooked->pres.data[i].time;
 			double pres = cooked->pres.data[i].value;
 			double accel = cooked->accel.data[i].value;
-			fprintf(raw_file, "%9.2f %9.2f %9.2f %9.2f\n",
-				time, pres, accel);
+			unsigned	daytime;
+			if (f->gps.num)
+				daytime = compute_daytime_ms(time, &f->gps);
+			else
+				daytime = 0;
+			fprintf(raw_file, "%9.2f %9.2f %9.2f %9.2f %02d:%02d:%02d.%03d\n",
+				time, pres, accel,
+				daytime_hour(daytime),
+				daytime_minute(daytime),
+				daytime_second(daytime),
+				daytime_millisecond(daytime));
 		}
 	}
-	if (gps_file) {
-		int	j = 0;
-		fprintf(gps_file, "%9s %12s %12s %12s\n",
-			"time", "lat", "lon", "alt");
+	if (gps_file || kml_file) {
+		int	j = 0, baro_pos;
+		double	baro_offset;
+		double	baro = 0.0;
+
+		if (gps_file)
+			fprintf(gps_file, "%2s %2s %2s %9s %12s %12s %9s %8s %5s\n",
+				"hr", "mn", "sc",
+				"time", "lat", "lon", "alt", "baro", "nsat");
+		if (kml_file)
+			fprintf(kml_file, "%s", kml_header);
+		if (f->gps.num)
+			baro_offset = f->gps.data[0].alt;
+		else
+			baro_offset = 0;
+		baro_pos = 0;
 		for (i = 0; i < f->gps.num; i++) {
 			int	nsat = 0;
 			int	k;
@@ -364,50 +464,61 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
 					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].svid != 0)
-					nsat++;
+			if (cooked) {
+				while (baro_pos < cooked->pres_pos.num) {
+					double  baro_time = cooked->accel_accel.start + baro_pos * cooked->accel_accel.step;
+					if (baro_time >= f->gps.data[i].time)
+						break;
+					baro_pos++;
+				}
+				if (baro_pos < cooked->pres_pos.num)
+					baro = cooked->pres_pos.data[baro_pos];
 			}
-			fprintf(gps_file, " %d\n", nsat);
-		}
-	}
-	if (kml_file) {
-		int	j = 0;
-
-		fprintf(kml_file, "%s", kml_header);
-		for (i = 0; i < f->gps.num; i++) {
-			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++;
+			if (gps_file)
+				fprintf(gps_file, "%2d %2d %2d %12.7f %12.7f %12.7f %7.1f %7.1f",
+					f->gps.data[i].hour,
+					f->gps.data[i].minute,
+					f->gps.data[i].second,
+					(f->gps.data[i].time - boost_start) / 100.0,
+					f->gps.data[i].lat,
+					f->gps.data[i].lon,
+					f->gps.data[i].alt,
+					baro + baro_offset);
+			if (kml_file) {
+				fprintf(kml_file, "%12.7f, %12.7f, %12.7f <!-- alt %12.7f time %12.7f sats %d -->",
+					f->gps.data[i].lon,
+					f->gps.data[i].lat,
+					baro + baro_offset,
+					f->gps.data[i].alt,
+					(f->gps.data[i].time - boost_start) / 100.0,
+					nsat);
+				if (i < f->gps.num - 1)
+					fprintf(kml_file, ",\n");
+				else
+					fprintf(kml_file, "\n");
 			}
+
 			nsat = 0;
-			for (k = 0; k < f->gps.sats[j].nsat; k++)
-				if (f->gps.sats[j].sat[k].svid != 0)
-					nsat++;
-
-			fprintf(kml_file, "%12.7f, %12.7f, %12.7f <!-- time %12.7f sats %d -->",
-				f->gps.data[i].lon,
-				f->gps.data[i].lat,
-				f->gps.data[i].alt,
-				(f->gps.data[i].time - boost_start) / 100.0,
-				nsat);
-			if (i < f->gps.num - 1)
-				fprintf(kml_file, ",\n");
-			else
-				fprintf(kml_file, "\n");
+			if (f->gps.sats) {
+				for (k = 0; k < f->gps.sats[j].nsat; k++) {
+					if (f->gps.sats[j].sat[k].svid != 0)
+						nsat++;
+				}
+				if (gps_file) {
+					fprintf(gps_file, " %4d", nsat);
+					for (k = 0; k < f->gps.sats[j].nsat; k++) {
+						if (f->gps.sats[j].sat[k].svid != 0) {
+							fprintf (gps_file, " %3d(%4.1f)",
+								 f->gps.sats[j].sat[k].svid,
+								 (double) f->gps.sats[j].sat[k].c_n);
+						}
+					}
+					fprintf(gps_file, "\n");
+				}
+			}
 		}
-		fprintf(kml_file, "%s", kml_footer);
+		if (kml_file)
+			fprintf(kml_file, "%s", kml_footer);
 	}
 	if (cooked && plot_name) {
 		struct cc_perioddata	*speed;
@@ -443,18 +554,20 @@ analyse_flight(struct cc_flightraw *f, FILE *summary_file, FILE *detail_file,
 }
 
 static const struct option options[] = {
-	{ .name = "summary", .has_arg = 1, .val = 's' },
-	{ .name = "detail", .has_arg = 1, .val = 'd' },
-	{ .name = "plot", .has_arg = 1, .val = 'p' },
-	{ .name = "raw", .has_arg = 1, .val = 'r' },
-	{ .name = "gps", .has_arg = 1, .val = 'g' },
-	{ .name = "kml", .has_arg = 1, .val = 'k' },
+	{ .name = "summary", .has_arg = 2, .val = 's' },
+	{ .name = "detail", .has_arg = 2, .val = 'd' },
+	{ .name = "plot", .has_arg = 2, .val = 'p' },
+	{ .name = "raw", .has_arg = 2, .val = 'r' },
+	{ .name = "gps", .has_arg = 2, .val = 'g' },
+	{ .name = "kml", .has_arg = 2, .val = 'k' },
+	{ .name = "all", .has_arg = 0, .val = 'a' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
 	fprintf(stderr, "usage: %s\n"
+		"\t[--all] [-a]\n"
 		"\t[--summary=<summary-file>] [-s <summary-file>]\n"
 		"\t[--detail=<detail-file] [-d <detail-file>]\n"
 		"\t[--raw=<raw-file> -r <raw-file]\n"
@@ -465,6 +578,46 @@ static void usage(char *program)
 	exit(1);
 }
 
+char *
+replace_extension(char *file, char *extension)
+{
+	char	*slash;
+	char	*dot;
+	char	*new;
+	int	newlen;
+
+	slash = strrchr(file, '/');
+	dot = strrchr(file, '.');
+	if (!dot || (slash && dot < slash))
+		dot = file + strlen(file);
+	newlen = (dot - file) + strlen (extension) + 1;
+	new = malloc (newlen);
+	strncpy (new, file, dot - file);
+	new[dot-file] = '\0';
+	strcat (new, extension);
+	return new;
+}
+
+FILE *
+open_output(char *outname, char *inname, char *extension)
+{
+	char	*o;
+	FILE	*out;
+
+	if (outname)
+		o = outname;
+	else
+		o = replace_extension(inname, extension);
+	out = fopen(o, "w");
+	if (!out) {
+		perror (o);
+		exit(1);
+	}
+	if (o != outname)
+		free(o);
+	return out;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -486,72 +639,50 @@ main (int argc, char **argv)
 	char			*plot_name = NULL;
 	char			*gps_name = NULL;
 	char			*kml_name = NULL;
+	int			has_summary = 0;
+	int			has_detail = 0;
+	int			has_plot = 0;
+	int			has_raw = 0;
+	int			has_gps = 0;
+	int			has_kml = 0;
+	char			*this_plot_name = NULL;;
 
-	while ((c = getopt_long(argc, argv, "s:d:p:r:g:k:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "s:d:p:r:g:k:a", options, NULL)) != -1) {
 		switch (c) {
 		case 's':
 			summary_name = optarg;
+			has_summary = 1;
 			break;
 		case 'd':
 			detail_name = optarg;
+			has_detail = 1;
 			break;
 		case 'p':
 			plot_name = optarg;
+			has_plot = 1;
 			break;
 		case 'r':
 			raw_name = optarg;
+			has_raw = 1;
 			break;
 		case 'g':
 			gps_name = optarg;
+			has_gps = 1;
 			break;
 		case 'k':
 			kml_name = optarg;
+			has_kml = 1;
+			break;
+		case 'a':
+			has_summary = has_detail = has_plot = has_raw = has_gps = has_kml = 1;
 			break;
 		default:
 			usage(argv[0]);
 			break;
 		}
 	}
-	summary_file = stdout;
-	if (summary_name) {
-		summary_file = fopen(summary_name, "w");
-		if (!summary_file) {
-			perror (summary_name);
-			exit(1);
-		}
-	}
-	if (detail_name) {
-		if (summary_name && !strcmp (summary_name, detail_name))
-			detail_file = summary_file;
-		else {
-			detail_file = fopen(detail_name, "w");
-			if (!detail_file) {
-				perror(detail_name);
-				exit(1);
-			}
-		}
-	}
-	if (raw_name) {
-		raw_file = fopen (raw_name, "w");
-		if (!raw_file) {
-			perror(raw_name);
-			exit(1);
-		}
-	}
-	if (gps_name) {
-		gps_file = fopen(gps_name, "w");
-		if (!gps_file) {
-			perror(gps_name);
-			exit(1);
-		}
-	}
-	if (kml_name) {
-		kml_file = fopen(kml_name, "w");
-		if (!kml_file) {
-			perror(kml_name);
-			exit(1);
-		}
-	}
+	if (!has_summary)
+		summary_file = stdout;
 	for (i = optind; i < argc; i++) {
 		file = fopen(argv[i], "r");
 		if (!file) {
@@ -559,6 +690,22 @@ main (int argc, char **argv)
 			ret++;
 			continue;
 		}
+		if (has_summary && !summary_file)
+			summary_file = open_output(summary_name, argv[i], ".summary");
+		if (has_detail && !detail_file)
+			detail_file = open_output(detail_name, argv[i], ".detail");
+		if (has_plot) {
+			if (plot_name)
+				this_plot_name = plot_name;
+			else
+				this_plot_name = replace_extension(argv[i], ".plot");
+		}
+		if (has_raw && !raw_file)
+			raw_file = open_output(raw_name, argv[i], ".raw");
+		if (has_gps && !gps_file)
+			gps_file = open_output(gps_name, argv[i], ".gps");
+		if (has_kml && !kml_file)
+			kml_file = open_output(gps_name, argv[i], ".kml");
 		s = strstr(argv[i], "-serial-");
 		if (s)
 			serial = atoi(s + 8);
@@ -572,8 +719,26 @@ main (int argc, char **argv)
 		}
 		if (!raw->serial)
 			raw->serial = serial;
-		analyse_flight(raw, summary_file, detail_file, raw_file, plot_name, gps_file, kml_file);
+		analyse_flight(raw, summary_file, detail_file, raw_file, this_plot_name, gps_file, kml_file);
 		cc_flightraw_free(raw);
+		if (has_summary && !summary_name) {
+			fclose(summary_file); summary_file = NULL;
+		}
+		if (has_detail && !detail_name) {
+			fclose(detail_file); detail_file = NULL;
+		}
+		if (this_plot_name && this_plot_name != plot_name) {
+			free (this_plot_name); this_plot_name = NULL;
+		}
+		if (has_raw && !raw_name) {
+			fclose(raw_file); raw_file = NULL;
+		}
+		if (has_gps && !gps_name) {
+			fclose(gps_file); gps_file = NULL;
+		}
+		if (has_kml && !kml_name) {
+			fclose(kml_file); kml_file = NULL;
+		}
 	}
 	return ret;
 }