projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use ao_data_pres macro in ao_log_tiny
[fw/altos]
/
src
/
core
/
ao_cmd.c
diff --git
a/src/core/ao_cmd.c
b/src/core/ao_cmd.c
index 40bb476c3d10fb69279b53d1b378ae4232def4ae..5113548bad81c70d7c41e382afd64838e04caca1 100644
(file)
--- a/
src/core/ao_cmd.c
+++ b/
src/core/ao_cmd.c
@@
-16,6
+16,7
@@
*/
#include "ao.h"
*/
#include "ao.h"
+#include "ao_task.h"
__pdata uint16_t ao_cmd_lex_i;
__pdata uint32_t ao_cmd_lex_u32;
__pdata uint16_t ao_cmd_lex_i;
__pdata uint32_t ao_cmd_lex_u32;
@@
-28,20
+29,26
@@
static __xdata char cmd_line[CMD_LEN];
static __pdata uint8_t cmd_len;
static __pdata uint8_t cmd_i;
static __pdata uint8_t cmd_len;
static __pdata uint8_t cmd_i;
-
static
void
-put_string(__code char *s)
+void
+
ao_
put_string(__code char *s)
{
char c;
while ((c = *s++))
putchar(c);
}
{
char c;
while ((c = *s++))
putchar(c);
}
+static void
+backspace(void)
+{
+ ao_put_string ("\010 \010");
+}
+
static void
readline(void)
{
static void
readline(void)
{
-
__pdata
char c;
+ char c;
if (ao_echo())
if (ao_echo())
- put_string("> ");
+
ao_
put_string("> ");
cmd_len = 0;
for (;;) {
flush();
cmd_len = 0;
for (;;) {
flush();
@@
-50,7
+57,7
@@
readline(void)
if (c == '\010' || c == '\177') {
if (cmd_len != 0) {
if (ao_echo())
if (c == '\010' || c == '\177') {
if (cmd_len != 0) {
if (ao_echo())
-
put_string("\010 \010"
);
+
backspace(
);
--cmd_len;
}
continue;
--cmd_len;
}
continue;
@@
-60,7
+67,7
@@
readline(void)
if (c == '\025') {
while (cmd_len != 0) {
if (ao_echo())
if (c == '\025') {
while (cmd_len != 0) {
if (ao_echo())
-
put_string("\010 \010"
);
+
backspace(
);
--cmd_len;
}
continue;
--cmd_len;
}
continue;
@@
-76,11
+83,8
@@
readline(void)
break;
}
break;
}
- if (cmd_len >= CMD_LEN - 2) {
- if (ao_echo())
- putchar('\007');
+ if (cmd_len >= CMD_LEN - 2)
continue;
continue;
- }
cmd_line[cmd_len++] = c;
if (ao_echo())
putchar(c);
cmd_line[cmd_len++] = c;
if (ao_echo())
putchar(c);
@@
-107,6
+111,22
@@
putnibble(uint8_t v)
putchar(v + ('a' - 10));
}
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)
{
void
ao_cmd_put16(uint16_t v)
{
@@
-243,22
+263,40
@@
ao_reboot(void)
ao_panic(AO_PANIC_REBOOT);
}
ao_panic(AO_PANIC_REBOOT);
}
+#ifndef HAS_VERSION
+#define HAS_VERSION 1
+#endif
+
+#if HAS_VERSION
static void
version(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
#if HAS_LOG
- printf("log-format %u\n", ao_log_format);
+ "log-format %u\n"
#endif
#endif
-#if HAS_MS5607
- ao_ms5607_info();
+ , ao_manufacturer
+ , ao_product
+ , ao_serial_number
+#if HAS_FLIGHT
+ , ao_flight_number
#endif
#endif
+#if HAS_LOG
+ , ao_log_format
+#endif
+ );
printf("software-version %s\n", ao_version);
}
printf("software-version %s\n", ao_version);
}
+#endif
+#ifndef NUM_CMDS
#define NUM_CMDS 11
#define NUM_CMDS 11
+#endif
static __code struct ao_cmds *__xdata (ao_cmds[NUM_CMDS]);
static __pdata uint8_t ao_ncmds;
static __code struct ao_cmds *__xdata (ao_cmds[NUM_CMDS]);
static __pdata uint8_t ao_ncmds;
@@
-269,13
+307,22
@@
help(void)
__pdata uint8_t cmds;
__pdata uint8_t cmd;
__code struct ao_cmds * __pdata cs;
__pdata uint8_t cmds;
__pdata uint8_t cmd;
__code struct ao_cmds * __pdata cs;
+ __code const char *h;
+ uint8_t e;
for (cmds = 0; cmds < ao_ncmds; cmds++) {
cs = ao_cmds[cmds];
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;
+ ao_put_string(h);
+ e = strlen(h);
+ h += e + 1;
+ e = 45 - e;
+ while (e--)
+ putchar(' ');
+ ao_put_string(h);
+ putchar('\n');
+ }
}
}
}
}
@@
-335,14
+382,33
@@
ao_cmd(void)
}
}
}
}
+#if HAS_BOOT_LOADER
+
+#include <ao_boot.h>
+
+static void
+ao_loader(void)
+{
+ flush();
+ ao_boot_loader();
+}
+#endif
+
__xdata struct ao_task ao_cmd_task;
__code struct ao_cmds ao_base_cmds[] = {
{ help, "?\0Help" },
__xdata struct ao_task ao_cmd_task;
__code struct ao_cmds ao_base_cmds[] = {
{ help, "?\0Help" },
+#if HAS_TASK_INFO
{ ao_task_info, "T\0Tasks" },
{ ao_task_info, "T\0Tasks" },
+#endif
{ echo, "E <0 off, 1 on>\0Echo" },
{ ao_reboot, "r eboot\0Reboot" },
{ echo, "E <0 off, 1 on>\0Echo" },
{ ao_reboot, "r eboot\0Reboot" },
+#if HAS_VERSION
{ version, "v\0Version" },
{ version, "v\0Version" },
+#endif
+#if HAS_BOOT_LOADER
+ { ao_loader, "X\0Switch to boot loader" },
+#endif
{ 0, NULL },
};
{ 0, NULL },
};