X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-dump-up%2Fao-dump-up.c;h=df05088cadaf2e4cb33d0b61482eac66f5210a5e;hb=ee79a205e118ea8730a02cc327d8fb79cc5f74ff;hp=6268dc8b75b9540bc69af66059ebbc2d76b3bfcb;hpb=548cf57d5a5ea323bbfc3605b44c23fc48dec96b;p=fw%2Faltos

diff --git a/ao-tools/ao-dump-up/ao-dump-up.c b/ao-tools/ao-dump-up/ao-dump-up.c
index 6268dc8b..df05088c 100644
--- a/ao-tools/ao-dump-up/ao-dump-up.c
+++ b/ao-tools/ao-dump-up/ao-dump-up.c
@@ -29,12 +29,13 @@
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
 	{ .name = "device", .has_arg = 1, .val = 'D' },
+	{ .name = "wait", .has_arg = 0, .val = 'w' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>]\n", program);
+	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [--wait]\n", program);
 	exit(1);
 }
 
@@ -134,25 +135,11 @@ static int swap16(int i)
 static int find_header(struct cc_usb *cc)
 {
 	for (;;) {
-		if (get_nonwhite(cc, 0) == 'M' && get_nonwhite(cc, 1000) == 'P')
+		if (get_nonwhite(cc, -1) == 'M' && get_nonwhite(cc, 1000) == 'P')
 			return 1;
 	}
 }
 
-static const char *state_names[] = {
-	"startup",
-	"idle",
-	"pad",
-	"boost",
-	"fast",
-	"coast",
-	"drogue",
-	"main",
-	"landed",
-	"invalid"
-};
-
-
 int
 main (int argc, char **argv)
 {
@@ -165,9 +152,13 @@ main (int argc, char **argv)
 	int		i;
 	int		crc;
 	int		current_crc;
+	int		wait = 0;
 
-	while ((c = getopt_long(argc, argv, "T:D:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "wT:D:", options, NULL)) != -1) {
 		switch (c) {
+		case 'w':
+			wait = 1;
+			break;
 		case 'T':
 			tty = optarg;
 			break;
@@ -179,8 +170,21 @@ main (int argc, char **argv)
 			break;
 		}
 	}
-	if (!tty)
-		tty = cc_usbdevs_find_by_arg(device, "FT230X Basic UART");
+	if (!tty) {
+		for (;;) {
+			tty = cc_usbdevs_find_by_arg(device, "FT230X Basic UART");
+			if (tty) {
+				if (wait) {
+					printf("tty is %s\n", tty);
+					sleep(1);
+				}
+				break;
+			}
+			if (!wait)
+				break;
+			sleep(1);
+		}
+	}
 	if (!tty)
 		tty = getenv("ALTOS_TTY");
 	if (!tty)