projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: All STM ADC users need to declare HAS_ADC_TEMP
[fw/altos]
/
src
/
stm
/
ao_timer.c
diff --git
a/src/stm/ao_timer.c
b/src/stm/ao_timer.c
index d69035f82b76227c2033eb3397a15a1d4f3c51f9..8b7c2327ff2bdd34f93e7f93a8351f0c3ff63a4f 100644
(file)
--- a/
src/stm/ao_timer.c
+++ b/
src/stm/ao_timer.c
@@
-18,15
+18,12
@@
#include "ao.h"
#include <ao_task.h>
#include "ao.h"
#include <ao_task.h>
-volatile
__data
AO_TICK_TYPE ao_tick_count;
+volatile AO_TICK_TYPE ao_tick_count;
-uint16_t ao_time(void)
+AO_TICK_TYPE
+ao_time(void)
{
{
- uint16_t v;
- ao_arch_critical(
- v = ao_tick_count;
- );
- return v;
+ return ao_tick_count;
}
#if AO_DATA_ALL
}
#if AO_DATA_ALL
@@
-44,7
+41,8
@@
void stm_tim6_isr(void)
stm_tim6.sr = 0;
++ao_tick_count;
#if HAS_TASK_QUEUE
stm_tim6.sr = 0;
++ao_tick_count;
#if HAS_TASK_QUEUE
- ao_task_check_alarm((uint16_t) ao_tick_count);
+ if (ao_task_alarm_tick && (int16_t) (ao_tick_count - ao_task_alarm_tick) >= 0)
+ ao_task_check_alarm((uint16_t) ao_tick_count);
#endif
#if AO_DATA_ALL
if (++ao_data_count == ao_data_interval) {
#endif
#if AO_DATA_ALL
if (++ao_data_count == ao_data_interval) {