X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=a33309745430d51d8dd3137df057ec1e7752cf1b;hb=81648829defbaf49fc98c4520540f7a20c50c417;hp=2b64b8ca210efe871b6eaadd4f14b37d6f281707;hpb=128bbfa150f88c09f7adde2434b7bf0b5a9ed556;p=fw%2Faltos

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 2b64b8ca..a3330974 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -36,10 +36,16 @@ put_string(__code char *s)
 		putchar(c);
 }
 
+static void
+backspace(void)
+{
+	put_string ("\010 \010");
+}
+
 static void
 readline(void)
 {
-	__pdata char c;
+	char c;
 	if (ao_echo())
 		put_string("> ");
 	cmd_len = 0;
@@ -50,7 +56,7 @@ readline(void)
 		if (c == '\010' || c == '\177') {
 			if (cmd_len != 0) {
 				if (ao_echo())
-					put_string("\010 \010");
+					backspace();
 				--cmd_len;
 			}
 			continue;
@@ -60,7 +66,7 @@ readline(void)
 		if (c == '\025') {
 			while (cmd_len != 0) {
 				if (ao_echo())
-					put_string("\010 \010");
+					backspace();
 				--cmd_len;
 			}
 			continue;
@@ -76,11 +82,8 @@ readline(void)
 			break;
 		}
 
-		if (cmd_len >= CMD_LEN - 2) {
-			if (ao_echo())
-				putchar('\007');
+		if (cmd_len >= CMD_LEN - 2)
 			continue;
-		}
 		cmd_line[cmd_len++] = c;
 		if (ao_echo())
 			putchar(c);
@@ -107,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)
 {
@@ -121,10 +140,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();
 }
 
@@ -245,11 +270,16 @@ version(void)
 	printf("serial-number    %u\n", ao_serial_number);
 #if HAS_LOG
 	printf("log-format       %u\n", ao_log_format);
+#endif
+#if HAS_MS5607
+	ao_ms5607_info();
 #endif
 	printf("software-version %s\n", ao_version);
 }
 
+#ifndef NUM_CMDS
 #define NUM_CMDS	11
+#endif
 
 static __code struct ao_cmds	*__xdata (ao_cmds[NUM_CMDS]);
 static __pdata uint8_t		ao_ncmds;
@@ -257,16 +287,17 @@ 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;
+	const char *h;
 
 	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));
+		for (cmd = 0; cs[cmd].func; cmd++) {
+			h = cs[cmd].help;
+			printf("%-45s %s\n", h, h + 1 + strlen(h));
+		}
 	}
 }
 
@@ -294,7 +325,7 @@ ao_cmd_register(__code struct ao_cmds *cmds)
 void
 ao_cmd(void)
 {
-	char	c;
+	__pdata char	c;
 	uint8_t cmd, cmds;
 	__code struct ao_cmds * __xdata cs;
 	void (*__xdata func)(void);
@@ -330,8 +361,8 @@ __xdata struct ao_task ao_cmd_task;
 
 __code struct ao_cmds	ao_base_cmds[] = {
 	{ help,		"?\0Help" },
-	{ ao_task_info,	"T\0Show tasks" },
-	{ echo,		"E <0 off, 1 on>\0Set echo mode" },
+	{ ao_task_info,	"T\0Tasks" },
+	{ echo,		"E <0 off, 1 on>\0Echo" },
 	{ ao_reboot,	"r eboot\0Reboot" },
 	{ version,	"v\0Version" },
 	{ 0,	NULL },