projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Check for negative tick wrap when importing flight records
[fw/altos]
/
src
/
product
/
ao_flash_task.c
diff --git
a/src/product/ao_flash_task.c
b/src/product/ao_flash_task.c
index 8ae9b2e5d3fe4b26a4680ee519cbee4911ec02d4..a1daf06a70f9da1514565e329cec8daa538aaaec 100644
(file)
--- a/
src/product/ao_flash_task.c
+++ b/
src/product/ao_flash_task.c
@@
-29,17
+29,26
@@
ao_panic(uint8_t reason)
for (;;);
}
for (;;);
}
-void
-ao_put_string
(const char *s
)
+
static
void
+ao_put_string
n(const char *s, int max
)
{
char c;
{
char c;
- while ((c = *s++)) {
+ while (max--) {
+ c = *s++;
+ if (!c)
+ break;
if (c == '\n')
ao_usb_putchar('\r');
ao_usb_putchar(c);
}
}
if (c == '\n')
ao_usb_putchar('\r');
ao_usb_putchar(c);
}
}
+void
+ao_put_string(const char *s)
+{
+ ao_put_stringn(s, 65535);
+}
+
static void
ao_application(void)
{
static void
ao_application(void)
{
@@
-149,7
+158,7
@@
ao_show_version(void)
ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BASE);
ao_usb_putchar(' ');
ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BOUND);
ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BASE);
ao_usb_putchar(' ');
ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BOUND);
- ao_put_string("\nsoftware-version "); ao_put_string
(ao_version
);
+ ao_put_string("\nsoftware-version "); ao_put_string
n(ao_version, AO_MAX_VERSION
);
ao_put_string("\n");
}
ao_put_string("\n");
}