summaryrefslogtreecommitdiff
path: root/src/cc1111
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-22 13:03:06 -0700
committerKeith Packard <keithp@keithp.com>2013-08-25 22:24:00 -0700
commitd0b4e926ecececa7499a301b6135189be119512e (patch)
treea2c8a67bf1528745a25acfc202d238e7b3242e49 /src/cc1111
parent3ded57394f6dfd7beb9526c031a5c6c6c9926917 (diff)
Initial TeleMini bits
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/cc1111')
-rw-r--r--src/cc1111/ao_adc.c5
-rw-r--r--src/cc1111/ao_usb.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 4a58023d..6cc08399 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -162,6 +162,11 @@ ao_adc_isr(void) __interrupt 1
#define GOT_ADC
#endif
+#ifdef FETCH_ADC
+ FETCH_ADC()
+#define GOT_ADC
+#endif
+
#ifndef GOT_ADC
#error No known ADC configuration set
#endif
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index a655d1be..b0ab409d 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -201,6 +201,11 @@ ao_usb_ep0_setup(void)
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: