Do radio settings solely by frequency

[fw/altos] / src / core / ao_cmd.c

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 9e14c221441096f77b2bcf943ed8c1fda5ee0c14..cde68b3991ca062cc4117c1e6a2e96e1f01de035 100644 (file)
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -121,10 +121,16 @@ ao_cmd_put8(uint8_t v)
        putnibble(v & 0xf);
 }
 
+uint8_t
+ao_cmd_is_white(void)
+{
+       return ao_cmd_lex_c == ' ' || ao_cmd_lex_c == '\t';
+}
+
 void
 ao_cmd_white(void)
 {
-       while (ao_cmd_lex_c == ' ' || ao_cmd_lex_c == '\t')
+       while (ao_cmd_is_white())
                ao_cmd_lex();
 }
 
@@ -227,6 +233,12 @@ ao_reboot(void)
        ao_cmd_white();
        if (!ao_match_word("eboot"))
                return;
+       /* Delay waiting for the packet master to be turned off
+        * so that we don't end up back in idle mode because we
+        * received a packet after boot.
+        */
+       flush();
+       ao_delay(AO_SEC_TO_TICKS(1));
        ao_arch_reboot();
        ao_panic(AO_PANIC_REBOOT);
 }
@@ -237,7 +249,7 @@ version(void)
        printf("manufacturer     %s\n", ao_manufacturer);
        printf("product          %s\n", ao_product);
        printf("serial-number    %u\n", ao_serial_number);
-#if HAS_EEPROM
+#if HAS_LOG
        printf("log-format       %u\n", ao_log_format);
 #endif
        printf("software-version %s\n", ao_version);
@@ -251,16 +263,16 @@ static __pdata uint8_t            ao_ncmds;
 static void
 help(void)
 {
-       register uint8_t cmds;
-       register uint8_t cmd;
-       register __code struct ao_cmds * cs;
+       __pdata uint8_t cmds;
+       __pdata uint8_t cmd;
+       __code struct ao_cmds * __pdata cs;
 
        for (cmds = 0; cmds < ao_ncmds; cmds++) {
                cs = ao_cmds[cmds];
                for (cmd = 0; cs[cmd].func; cmd++)
                        printf("%-45s %s\n",
-                               cs[cmd].help,
-                               cs[cmd].help+1+strlen(cs[cmd].help));
+                              cs[cmd].help,
+                              cs[cmd].help+1+strlen(cs[cmd].help));
        }
 }