projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Simplify BT communications
[fw/altos]
/
src
/
ao_btm.c
diff --git
a/src/ao_btm.c
b/src/ao_btm.c
index 784a566f81b14fce9e8cdd42713fe1ab56b253f6..6ba5eb1abeb32ffb8cbfb1b85647018dc7e38816 100644
(file)
--- a/
src/ao_btm.c
+++ b/
src/ao_btm.c
@@
-143,29
+143,16
@@
ao_cmd_filter(void)
}
/*
}
/*
- * A wrapper for ao_serial_pollchar that
- * doesn't return any characters while we're
- * initializing the bluetooth device
+ * Delay between command charaters; the BT module
+ * can't keep up with 57600 baud
*/
*/
-char
-ao_btm_pollchar(void)
-{
- char c;
- if (!ao_btm_running)
- return AO_READ_AGAIN;
- c = ao_serial_pollchar();
- if (c != AO_READ_AGAIN)
- ao_btm_log_in_char(c);
- return c;
-}
void
ao_btm_putchar(char c)
{
ao_btm_log_out_char(c);
ao_serial_putchar(c);
void
ao_btm_putchar(char c)
{
ao_btm_log_out_char(c);
ao_serial_putchar(c);
- if (!ao_btm_running)
- ao_delay(1);
+ ao_delay(1);
}
/*
}
/*
@@
-270,8
+257,8
@@
ao_btm(void)
/* Turn off status reporting */
ao_btm_cmd("ATQ1\r");
/* Turn off status reporting */
ao_btm_cmd("ATQ1\r");
- ao_btm_stdio = ao_add_stdio(ao_
btm
_pollchar,
- ao_
btm
_putchar,
+ ao_btm_stdio = ao_add_stdio(ao_
serial
_pollchar,
+ ao_
serial
_putchar,
NULL);
ao_btm_echo(0);
NULL);
ao_btm_echo(0);