summaryrefslogtreecommitdiff
path: root/ao_timer.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-04-20 23:33:41 -0700
committerKeith Packard <keithp@keithp.com>2009-04-20 23:33:41 -0700
commit43c8f7012102cdb591ace899420c10e4a78385ad (patch)
tree6ce45d0a58b1133961acd3cda3f3be21fef085b4 /ao_timer.c
parent5be13b76a2e29b84cd6d1eec065e3354b0dafce5 (diff)
Add radio support. Build separate executables for TeleMetrum and the TI dongle
Ok, way too big a patch, but things were in rough shape. This patch adds support for the radio, both transmit and receive. Then, because I could no longer run the TeleMetrum code on the TI dongle, I ended up building a separate image for the TI board, which involved creating a mechanism for having multiple command sets and splitting code for different functions into different files.
Diffstat (limited to 'ao_timer.c')
-rw-r--r--ao_timer.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/ao_timer.c b/ao_timer.c
index 8b485cc2..716befe6 100644
--- a/ao_timer.c
+++ b/ao_timer.c
@@ -40,8 +40,8 @@ ao_delay(uint16_t ticks)
#define T1_CLOCK_DIVISOR 8 /* 24e6/8 = 3e6 */
#define T1_SAMPLE_TIME 30000 /* 3e6/30000 = 100 */
-__data uint8_t ao_adc_interval = 1;
-__data uint8_t ao_adc_count;
+volatile __data uint8_t ao_adc_interval = 1;
+volatile __data uint8_t ao_adc_count;
void ao_timer_isr(void) interrupt 9
{
@@ -54,6 +54,12 @@ void ao_timer_isr(void) interrupt 9
}
void
+ao_timer_set_adc_interval(uint8_t interval) __critical
+{
+ ao_adc_interval = interval;
+}
+
+void
ao_timer_init(void)
{
/* NOTE: This uses a timer only present on cc1111 architecture. */
@@ -63,7 +69,7 @@ ao_timer_init(void)
/* set the sample rate */
T1CC0H = T1_SAMPLE_TIME >> 8;
- T1CC0L = T1_SAMPLE_TIME;
+ T1CC0L = (uint8_t) T1_SAMPLE_TIME;
T1CCTL0 = T1CCTL_MODE_COMPARE;
T1CCTL1 = 0;