Decrease telemetry rate on the pad to 1/sec instead of 20/sec

[fw/altos] / ao_timer.c

diff --git a/ao_timer.c b/ao_timer.c
index 2bd47af1417dd9de3d4090bbc9200e4475110407..a6a7646f5a22c0b48aeb7ff0cbb0245ddea30467 100644 (file)
--- a/ao_timer.c
+++ b/ao_timer.c
@@ -19,13 +19,9 @@
 
 static volatile __data uint16_t ao_tick_count;
 
-uint16_t ao_time(void)
+uint16_t ao_time(void) __critical
 {
-       __data uint16_t ret;
-       __critical {
-               ret = ao_tick_count;
-       }
-       return ret;
+       return ao_tick_count;
 }
 
 void
@@ -40,19 +36,26 @@ 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
 {
        ++ao_tick_count;
-       if (++ao_adc_count >= ao_adc_interval) {
+       if (++ao_adc_count == ao_adc_interval) {
                ao_adc_count = 0;
                ao_adc_poll();
        }
        ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
 }
 
+void
+ao_timer_set_adc_interval(uint8_t interval) __critical
+{
+       ao_adc_interval = interval;
+       ao_adc_count = 0;
+}
+
 void
 ao_timer_init(void)
 {
@@ -63,7 +66,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;