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

diff --git a/ao-tools/ao-dumplog/ao-dumplog.c b/ao-tools/ao-dumplog/ao-dumplog.c
index 440a02b5..41d0ac10 100644
--- a/ao-tools/ao-dumplog/ao-dumplog.c
+++ b/ao-tools/ao-dumplog/ao-dumplog.c
@@ -29,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);
 }
 
@@ -75,6 +76,7 @@ main (int argc, char **argv)
 	FILE		*out;
 	char		*filename;
 	int		serial_number = 0;
+	int		channel = 0;
 	int		flight = 0;
 	char		cmd;
 	int		tick, a, b;
@@ -88,8 +90,10 @@ main (int argc, char **argv)
 	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;
@@ -100,6 +104,9 @@ main (int argc, char **argv)
 		case 'R':
 			remote = 1;
 			break;
+		case 'C':
+			channel = atoi(optarg);
+			break;
 		default:
 			usage(argv[0]);
 			break;
@@ -119,7 +126,7 @@ 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;
@@ -135,10 +142,21 @@ main (int argc, char **argv)
 		cc_usb_close(cc);
 		exit(1);
 	}
-	printf ("Serial number: %d\n", serial_number);
+	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');