projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/altosui: Report log format in the version command
[fw/altos]
/
src
/
ao_timer.c
diff --git
a/src/ao_timer.c
b/src/ao_timer.c
index 78c6e063f0991eb5c71e628b652cca08e928c02b..c977fbc8b85a2f997c38e48df05f857306bac658 100644
(file)
--- a/
src/ao_timer.c
+++ b/
src/ao_timer.c
@@
-24,37
+24,42
@@
uint16_t ao_time(void) __critical
return ao_tick_count;
}
return ao_tick_count;
}
+static __xdata uint8_t ao_forever;
+
void
ao_delay(uint16_t ticks)
{
void
ao_delay(uint16_t ticks)
{
- uint16_t until = ao_time() + ticks;
-
- while ((int16_t) (until - ao_time()) > 0)
- ao_sleep(DATA_TO_XDATA(&ao_tick_count));
+ ao_alarm(ticks);
+ ao_sleep(&ao_forever);
}
#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 */
+#if HAS_ADC
volatile __data uint8_t ao_adc_interval = 1;
volatile __data uint8_t ao_adc_count;
volatile __data uint8_t ao_adc_interval = 1;
volatile __data uint8_t ao_adc_count;
+#endif
-void ao_timer_isr(void) interrupt 9
+void ao_timer_isr(void)
__
interrupt 9
{
++ao_tick_count;
{
++ao_tick_count;
+#if HAS_ADC
if (++ao_adc_count == ao_adc_interval) {
ao_adc_count = 0;
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));
+#endif
}
}
+#if HAS_ADC
void
ao_timer_set_adc_interval(uint8_t interval) __critical
{
ao_adc_interval = interval;
ao_adc_count = 0;
}
void
ao_timer_set_adc_interval(uint8_t interval) __critical
{
ao_adc_interval = interval;
ao_adc_count = 0;
}
+#endif
void
ao_timer_init(void)
void
ao_timer_init(void)