X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao_timer.c;h=2bd47af1417dd9de3d4090bbc9200e4475110407;hb=ed6f67dc47d750d5ff8bea63ae7cbb560689b9b6;hp=9583a388d26983e01b0b9bdb2788ba3073d06f43;hpb=fb63262699d3a6fbf347d24efda8b01f75b7d0d3;p=fw%2Faltos diff --git a/ao_timer.c b/ao_timer.c index 9583a388..2bd47af1 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; + __critical { + ret = ao_tick_count; + } return ret; } @@ -42,10 +40,16 @@ 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; + 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)); }