X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=1814cecf5021848e4fe88b8fc3841dd10e6a491f;hb=31f5a02654cbf172beed25f4c518dfb7be8c714e;hp=cde68b3991ca062cc4117c1e6a2e96e1f01de035;hpb=c1d12a117b36de7fe8dd992959b890bfd1163e81;p=fw%2Faltos

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index cde68b39..1814cecf 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);
@@ -251,11 +254,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;
@@ -266,13 +274,14 @@ help(void)
 	__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));
+		}
 	}
 }
 
@@ -300,7 +309,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);
@@ -336,8 +345,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 },