X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=3d086a57e106d8f0110e0da6ad8a309fe985552d;hp=05dbfb51f04a57d6281de37ee92d19c8928d1d4e;hb=688a9458bb03a81e71554c14295d1baacbbbd530;hpb=aafa8859ecb27383f697b98f6991643b44f4721a

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 05dbfb51..3d086a57 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -110,6 +110,22 @@ putnibble(uint8_t v)
 		putchar(v + ('a' - 10));
 }
 
+uint8_t
+ao_getnibble(void)
+{
+	char	c;
+
+	c = getchar();
+	if ('0' <= c && c <= '9')
+		return c - '0';
+	if ('a' <= c && c <= 'f')
+		return c - ('a' - 10);
+	if ('A' <= c && c <= 'F')
+		return c - ('A' - 10);
+	ao_cmd_status = ao_cmd_lex_error;
+	return 0;
+}
+
 void
 ao_cmd_put16(uint16_t v)
 {
@@ -249,12 +265,25 @@ ao_reboot(void)
 static void
 version(void)
 {
-	printf("manufacturer     %s\n", ao_manufacturer);
-	printf("product          %s\n", ao_product);
-	printf("serial-number    %u\n", ao_serial_number);
+	printf("manufacturer     %s\n"
+	       "product          %s\n"
+	       "serial-number    %u\n"
+#if HAS_FLIGHT
+	       "current-flight   %u\n"
+#endif
 #if HAS_LOG
-	printf("log-format       %u\n", ao_log_format);
+	       "log-format       %u\n"
+#endif
+	       , ao_manufacturer
+	       , ao_product
+	       , ao_serial_number
+#if HAS_FLIGHT
+	       , ao_flight_number
 #endif
+#if HAS_LOG
+	       , ao_log_format
+#endif
+		);
 #if HAS_MS5607
 	ao_ms5607_info();
 #endif
@@ -278,8 +307,10 @@ help(void)
 
 	for (cmds = 0; cmds < ao_ncmds; cmds++) {
 		cs = ao_cmds[cmds];
-		for (cmd = 0; (h = cs[cmd].help); cmd++)
+		for (cmd = 0; cs[cmd].func; cmd++) {
+			h = cs[cmd].help;
 			printf("%-45s %s\n", h, h + 1 + strlen(h));
+		}
 	}
 }