altosuilib: Remove some debug printfs

[fw/altos] / ao-tools / ao-dump-up / ao-dump-up.c

diff --git a/ao-tools/ao-dump-up/ao-dump-up.c b/ao-tools/ao-dump-up/ao-dump-up.c
index 6268dc8b75b9540bc69af66059ebbc2d76b3bfcb..31bae4719127332713d5ab3dd932bd6278507d7d 100644 (file)
--- a/ao-tools/ao-dump-up/ao-dump-up.c
+++ b/ao-tools/ao-dump-up/ao-dump-up.c
@@ -21,6 +21,8 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <string.h>
+#include <stdbool.h>
+#include <ctype.h>
 #include "cc-usb.h"
 #include "cc.h"
 
@@ -29,26 +31,16 @@
 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);
 }
 
-static uint8_t
-log_checksum(int d[8])
-{
-       uint8_t sum = 0x5a;
-       int     i;
-
-       for (i = 0; i < 8; i++)
-               sum += (uint8_t) d[i];
-       return -sum;
-}
-
 static int get_nonwhite(struct cc_usb *cc, int timeout)
 {
        int     c;
@@ -61,6 +53,29 @@ static int get_nonwhite(struct cc_usb *cc, int timeout)
        }
 }
 
+static const uint8_t test_data[] = {
+       0xfc, 0xfd, 0xfe, 0xff, 0xf8, 0xf9, 0xfa, 0xfb, 0x40, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+       0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+       0x17, 0x08,
+};
+
+static bool test_failed;
+static int test_pos;
+
+static void
+check_test(uint8_t b)
+{
+       if (test_pos >= sizeof (test_data) || test_data[test_pos++] != b)
+               test_failed = true;
+}
+
 static uint8_t
 get_hexc(struct cc_usb *cc)
 {
@@ -103,6 +118,7 @@ get_hex(struct cc_usb *cc)
        int     h = (a << 4) + b;
 
        file_crc = log_crc(file_crc, h);
+       check_test(h);
        return h;
 }
 
@@ -134,25 +150,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)
 {
@@ -160,14 +162,17 @@ main (int argc, char **argv)
        char            *tty = NULL;
        char            *device = NULL;
        int             c;
-       char            line[8192];
        int             nsamples;
        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 +184,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)
@@ -198,8 +216,12 @@ main (int argc, char **argv)
        current_crc = swap16(~file_crc & 0xffff);
        crc = get_16(cc);       /* crc */
        putchar ('\n');
-       if (crc == current_crc)
-               printf("CRC valid\n");
+       if (crc == current_crc) {
+               if (!test_failed)
+                       printf("\033[32mValid MicroTest Data\033[39m\n");
+               else
+                       printf("CRC valid\n");
+       }
        else
                printf("CRC invalid\n");
        cc_usb_close(cc);