projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add velocity check for boost detect via accelerometer
[fw/altos]
/
ao_serial.c
diff --git
a/ao_serial.c
b/ao_serial.c
index a2292980c21b66cf1489cbcdc45ae9ac0c5138e5..20bb4f9683a5c4ed3003a4147e5df9906e3b86a8 100644
(file)
--- a/
ao_serial.c
+++ b/
ao_serial.c
@@
-22,7
+22,7
@@
struct ao_fifo {
uint8_t insert;
uint8_t remove;
struct ao_fifo {
uint8_t insert;
uint8_t remove;
-
uint8_t
fifo[SERIAL_FIFO];
+
char
fifo[SERIAL_FIFO];
};
volatile __xdata struct ao_fifo ao_usart1_rx_fifo;
};
volatile __xdata struct ao_fifo ao_usart1_rx_fifo;
@@
-71,10
+71,10
@@
ao_serial_tx1_isr(void) interrupt 14
ao_wakeup(&ao_usart1_tx_fifo);
}
ao_wakeup(&ao_usart1_tx_fifo);
}
-uint8_t
+char
ao_serial_getchar(void) __critical
{
ao_serial_getchar(void) __critical
{
-
uint8_t
c;
+
char
c;
while (ao_fifo_empty(ao_usart1_rx_fifo))
ao_sleep(&ao_usart1_rx_fifo);
ao_fifo_remove(ao_usart1_rx_fifo, c);
while (ao_fifo_empty(ao_usart1_rx_fifo))
ao_sleep(&ao_usart1_rx_fifo);
ao_fifo_remove(ao_usart1_rx_fifo, c);
@@
-82,7
+82,7
@@
ao_serial_getchar(void) __critical
}
void
}
void
-ao_serial_putchar(
uint8_t
c) __critical
+ao_serial_putchar(
char
c) __critical
{
while (ao_fifo_full(ao_usart1_tx_fifo))
ao_sleep(&ao_usart1_tx_fifo);
{
while (ao_fifo_full(ao_usart1_tx_fifo))
ao_sleep(&ao_usart1_tx_fifo);
@@
-101,7
+101,7
@@
send_serial(void)
}
__code struct ao_cmds ao_serial_cmds[] = {
}
__code struct ao_cmds ao_serial_cmds[] = {
- { 'S', send_serial, "S
<data> Send data to serial line\n
" },
+ { 'S', send_serial, "S
<data> Send data to serial line
" },
{ 0, send_serial, NULL },
};
{ 0, send_serial, NULL },
};