projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Report battery voltage instead of S at startup
[fw/altos]
/
src
/
cc1111
/
ao_usb.c
diff --git
a/src/cc1111/ao_usb.c
b/src/cc1111/ao_usb.c
index a655d1be903589374bae5c5d1af63244ac873697..2141eda8dd9bba1b52412fe27cd3d4ffbf1bc7f1 100644
(file)
--- a/
src/cc1111/ao_usb.c
+++ b/
src/cc1111/ao_usb.c
@@
-24,7
+24,7
@@
static __xdata uint16_t ao_usb_in_bytes;
static __pdata uint16_t ao_usb_in_bytes_last;
static __xdata uint16_t ao_usb_out_bytes;
static __pdata uint8_t ao_usb_iif;
static __pdata uint16_t ao_usb_in_bytes_last;
static __xdata uint16_t ao_usb_out_bytes;
static __pdata uint8_t ao_usb_iif;
-
static __pdata uint8_t
ao_usb_running;
+
__pdata uint8_t
ao_usb_running;
static void
ao_usb_set_interrupts(void)
static void
ao_usb_set_interrupts(void)
@@
-201,6
+201,11
@@
ao_usb_ep0_setup(void)
ao_usb_ep0_queue_byte(0);
break;
case AO_USB_REQ_SET_ADDRESS:
ao_usb_ep0_queue_byte(0);
break;
case AO_USB_REQ_SET_ADDRESS:
+#if USB_FORCE_FLIGHT_IDLE
+ /* Go to idle mode if USB is connected
+ */
+ ao_flight_force_idle = 1;
+#endif
ao_usb_set_address(ao_usb_setup.value);
break;
case AO_USB_REQ_GET_DESCRIPTOR:
ao_usb_set_address(ao_usb_setup.value);
break;
case AO_USB_REQ_GET_DESCRIPTOR: