projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make panic beeps use fixed frequencies
[fw/altos]
/
src
/
kernel
/
ao_cmd.c
diff --git
a/src/kernel/ao_cmd.c
b/src/kernel/ao_cmd.c
index 077d7de137f2e397560d415e4d0b6ef270ae3d7c..7bb4654e775e472d486fbf4985989b2c8d05614d 100644
(file)
--- a/
src/kernel/ao_cmd.c
+++ b/
src/kernel/ao_cmd.c
@@
-304,13
+304,13
@@
version(void)
, ao_flight_number
#endif
#if HAS_LOG
, ao_flight_number
#endif
#if HAS_LOG
- ,
ao_log_format
+ ,
AO_LOG_FORMAT
#if !DISABLE_LOG_SPACE
, (unsigned long) ao_storage_log_max
#endif
#endif
#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
#if !DISABLE_LOG_SPACE
, (unsigned long) ao_storage_log_max
#endif
#endif
#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
- , (u
int32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE
+ , (u
nsigned) ((uint32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE)
#endif
);
printf("software-version %s\n", ao_version);
#endif
);
printf("software-version %s\n", ao_version);
@@
-355,7
+355,7
@@
report(void)
switch(ao_cmd_status) {
case ao_cmd_lex_error:
case ao_cmd_syntax_error:
switch(ao_cmd_status) {
case ao_cmd_lex_error:
case ao_cmd_syntax_error:
-
puts("Syntax error
");
+
ao_put_string("Syntax error\n
");
ao_cmd_status = 0;
default:
break;
ao_cmd_status = 0;
default:
break;
@@
-423,11
+423,13
@@
ao_loader(void)
}
#endif
}
#endif
+#if HAS_TASK
__xdata struct ao_task ao_cmd_task;
__xdata struct ao_task ao_cmd_task;
+#endif
__code struct ao_cmds ao_base_cmds[] = {
{ help, "?\0Help" },
__code struct ao_cmds ao_base_cmds[] = {
{ help, "?\0Help" },
-#if HAS_TASK_INFO
+#if HAS_TASK_INFO
&& HAS_TASK
{ ao_task_info, "T\0Tasks" },
#endif
{ echo, "E <0 off, 1 on>\0Echo" },
{ ao_task_info, "T\0Tasks" },
#endif
{ echo, "E <0 off, 1 on>\0Echo" },
@@
-445,5
+447,7
@@
void
ao_cmd_init(void)
{
ao_cmd_register(&ao_base_cmds[0]);
ao_cmd_init(void)
{
ao_cmd_register(&ao_base_cmds[0]);
+#if HAS_TASK
ao_add_task(&ao_cmd_task, ao_cmd, "cmd");
ao_add_task(&ao_cmd_task, ao_cmd, "cmd");
+#endif
}
}