X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=14cb7569b5df9b0e9840afc8d494cccd5f1386ba;hb=2ba946fea29ff134ffaeaea9d7932f4bd4e953aa;hp=9e14c221441096f77b2bcf943ed8c1fda5ee0c14;hpb=4299b5a36a2f6f9f7bbbc3a1b935dd2357c1fb0f;p=fw%2Faltos

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 9e14c221..14cb7569 100644
--- 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);
@@ -259,8 +271,8 @@ help(void)
 		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));
 	}
 }