X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao_timer.c;h=716befe658f567acd06f14dfd4f1b0503c007bef;hb=00d5610caff61559eb24c24beaa56629d6bb03be;hp=9583a388d26983e01b0b9bdb2788ba3073d06f43;hpb=fb63262699d3a6fbf347d24efda8b01f75b7d0d3;p=fw%2Faltos

diff --git a/ao_timer.c b/ao_timer.c
index 9583a388..716befe6 100644
--- a/ao_timer.c
+++ b/ao_timer.c
@@ -21,12 +21,10 @@ static volatile __data uint16_t ao_tick_count;
 
 uint16_t ao_time(void)
 {
-	volatile bit ea_save;
-	__data uint16_t ret;
-	
-	ea_save = EA;
-	ret = ao_tick_count;
-	EA = ea_save;
+	uint16_t ret;
+	__critical {
+		ret = ao_tick_count;
+	}
 	return ret;
 }
 
@@ -42,13 +40,25 @@ ao_delay(uint16_t ticks)
 #define T1_CLOCK_DIVISOR	8	/* 24e6/8 = 3e6 */
 #define T1_SAMPLE_TIME		30000	/* 3e6/30000 = 100 */
 
+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;
-	ao_adc_poll();
+	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;
+}
+
 void
 ao_timer_init(void)
 {
@@ -59,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;