projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add radio support. Build separate executables for TeleMetrum and the TI dongle
[fw/altos]
/
ao_timer.c
diff --git
a/ao_timer.c
b/ao_timer.c
index 8b485cc26f5568efdb97647c8445adbb947f0399..716befe658f567acd06f14dfd4f1b0503c007bef 100644
(file)
--- 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 */
#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
{
void ao_timer_isr(void) interrupt 9
{
@@
-53,6
+53,12
@@
void ao_timer_isr(void) interrupt 9
ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
}
ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
}
+void
+ao_timer_set_adc_interval(uint8_t interval) __critical
+{
+ ao_adc_interval = interval;
+}
+
void
ao_timer_init(void)
{
void
ao_timer_init(void)
{
@@
-63,7
+69,7
@@
ao_timer_init(void)
/* set the sample rate */
T1CC0H = T1_SAMPLE_TIME >> 8;
/* 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;
T1CCTL0 = T1CCTL_MODE_COMPARE;
T1CCTL1 = 0;