git.droids-corp.org
/
protos
/
xbee-avr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add emergency "pop"
[protos/xbee-avr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
5f7a638
..
b9fa0a8
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-57,6
+57,7
@@
#include "cmdline.h"
#include "callout.h"
#include "rc_proto.h"
#include "cmdline.h"
#include "callout.h"
#include "rc_proto.h"
+#include "spi_servo.h"
#include "main.h"
struct xbeeboard xbeeboard;
#include "main.h"
struct xbeeboard xbeeboard;
@@
-618,12
+619,14
@@
int main(void)
int8_t err;
struct xbee_dev dev;
int8_t err;
struct xbee_dev dev;
+ spi_servo_init();
#ifdef USE_USB
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
#else
uart_init();
#ifdef USE_USB
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
#else
uart_init();
+ uart_register_rx_event(CMDLINE_UART, emergency);
#endif
fdevopen(cmdline_dev_send, cmdline_dev_recv);
#endif
fdevopen(cmdline_dev_send, cmdline_dev_recv);