projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: clarify how EasyMotor gets put into idle mode
[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 1f0edb0596a089490929ef494af6dde59b33880f..a1daf06a70f9da1514565e329cec8daa538aaaec 100644
(file)
--- a/
src/product/ao_flash_task.c
+++ b/
src/product/ao_flash_task.c
@@
-26,19
+26,29
@@
void
ao_panic(uint8_t reason)
{
(void) reason;
ao_panic(uint8_t reason)
{
(void) reason;
+ for (;;);
}
}
-void
-ao_put_string
(__code 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)
{
@@
-48,7
+58,7
@@
ao_application(void)
static uint32_t
ao_get_hex32(void)
{
static uint32_t
ao_get_hex32(void)
{
- int
8_t
n;
+ int
n;
uint32_t v = 0;
for (;;) {
uint32_t v = 0;
for (;;) {
@@
-65,7
+75,7
@@
ao_get_hex32(void)
n = n - ('A' - 10);
else
break;
n = n - ('A' - 10);
else
break;
- v = (v << 4) | n;
+ v = (v << 4) |
(uint8_t)
n;
n = ao_usb_getchar();
}
return v;
n = ao_usb_getchar();
}
return v;
@@
-148,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");
}