X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-dumplog%2Fao-dumplog.c;h=41d0ac102d27d86cb24e433bdde9b9441bb6f740;hp=b3a0a25ad9b8729f6d314f1ca9f2506e545335ea;hb=f14c799ae7ff3be56c28f5694f04c03daff7708e;hpb=5a79a04ddb0b3ee64de34e366f71a0f6db509c01

diff --git a/ao-tools/ao-dumplog/ao-dumplog.c b/ao-tools/ao-dumplog/ao-dumplog.c
index b3a0a25a..41d0ac10 100644
--- a/ao-tools/ao-dumplog/ao-dumplog.c
+++ b/ao-tools/ao-dumplog/ao-dumplog.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <string.h>
 #include "cc-usb.h"
 #include "cc.h"
 
@@ -28,13 +29,14 @@
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
 	{ .name = "device", .has_arg = 1, .val = 'D' },
-	{ .name = "remote", .has_arg = 1, .val = 'R' },
+	{ .name = "remote", .has_arg = 0, .val = 'R' },
+	{ .name = "channel", .has_arg = 1, .val = 'C' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [-R]\n", program);
+	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [--remote] [--channel <radio-channel>]\n", program);
 	exit(1);
 }
 
@@ -62,6 +64,7 @@ static const char *state_names[] = {
 	"invalid"
 };
 
+
 int
 main (int argc, char **argv)
 {
@@ -72,7 +75,9 @@ main (int argc, char **argv)
 	char		line[8192];
 	FILE		*out;
 	char		*filename;
-	int		serial_number;
+	int		serial_number = 0;
+	int		channel = 0;
+	int		flight = 0;
 	char		cmd;
 	int		tick, a, b;
 	int		block;
@@ -84,8 +89,11 @@ main (int argc, char **argv)
 	int		remote = 0;
 	int		any_valid;
 	int		invalid;
+	char		serial_line[8192];
+	unsigned	storage_size;
+	int		blocks;
 
-	while ((c = getopt_long(argc, argv, "T:D:R", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "T:D:C:R", options, NULL)) != -1) {
 		switch (c) {
 		case 'T':
 			tty = optarg;
@@ -96,6 +104,9 @@ main (int argc, char **argv)
 		case 'R':
 			remote = 1;
 			break;
+		case 'C':
+			channel = atoi(optarg);
+			break;
 		default:
 			usage(argv[0]);
 			break;
@@ -115,33 +126,37 @@ main (int argc, char **argv)
 	if (!cc)
 		exit(1);
 	if (remote)
-		cc_usb_open_remote(cc);
+		cc_usb_open_remote(cc, channel);
 	/* send a 'version' command followed by a 'log' command */
 	cc_usb_printf(cc, "v\n");
 	out = NULL;
 	for (;;) {
 		cc_usb_getline(cc, line, sizeof (line));
-		if (sscanf(line, "serial-number %u", &serial_number) == 1) {
-			filename = cc_make_filename(serial_number, "eeprom");
-			out = fopen (filename, "w");
-			if (!out) {
-				perror(filename);
-			}
-			fprintf (out, "%s\n", line);
-		}
+		if (sscanf(line, "serial-number %u", &serial_number) == 1)
+			strcpy(serial_line, line);
 		if (!strncmp(line, "software-version", 16))
 			break;
 	}
-	if (!out) {
+	if (!serial_number) {
 		fprintf(stderr, "no serial number found\n");
 		cc_usb_close(cc);
 		exit(1);
 	}
-	printf ("Serial number: %d\n", serial_number);
-	printf ("File name:     %s\n", filename);
+	cc_usb_printf(cc, "f\n");
+	storage_size = 0;
+	for (;;) {
+		cc_usb_getline(cc, line, sizeof(line));
+		if (sscanf(line, "Storage size: %u", &storage_size) == 1)
+			break;
+	}
+	printf ("Serial number: %d Storage size: %u\n", serial_number, storage_size);
+	if (storage_size)
+		blocks = storage_size / 256;
+	else
+		blocks = 511;
 	done = 0;
 	column = 0;
-	for (block = 0; !done && block < 511; block++) {
+	for (block = 0; !done && block < blocks; block++) {
 		cc_usb_printf(cc, "e %x\n", block);
 		if (column == 64) {
 			putchar('\n');
@@ -170,6 +185,19 @@ main (int argc, char **argv)
 				tick = data[2] + (data[3] << 8);
 				a = data[4] + (data[5] << 8);
 				b = data[6] + (data[7] << 8);
+				if (cmd == 'F') {
+					flight = b;
+					filename = cc_make_filename(serial_number, flight, "eeprom");
+					printf ("Flight:       %d\n", flight);
+					printf ("File name:     %s\n", filename);
+					out = fopen (filename, "w");
+					if (!out) {
+						perror(filename);
+						exit(1);
+					}
+					fprintf(out, "%s\n", serial_line);
+				}
+
 				if (cmd == 'S' && a <= 8) {
 					if (column) putchar('\n');
 					printf("%s\n", state_names[a]);