projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/master'
[fw/altos]
/
src
/
stm
/
ao_timer.c
diff --git
a/src/stm/ao_timer.c
b/src/stm/ao_timer.c
index 0c44f352fb56009bb35b7f1e34e2f22a15faa40b..adec7aad950f617fc3effe7055db3749167ebaa5 100644
(file)
--- a/
src/stm/ao_timer.c
+++ b/
src/stm/ao_timer.c
@@
-17,7
+17,7
@@
#include "ao.h"
#include "ao.h"
-
static volatile __data uint16_t
ao_tick_count;
+
volatile __data AO_TICK_TYPE
ao_tick_count;
uint16_t ao_time(void)
{
uint16_t ao_time(void)
{
@@
-87,7
+87,7
@@
void
ao_timer_init(void)
{
stm_nvic_set_enable(STM_ISR_TIM6_POS);
ao_timer_init(void)
{
stm_nvic_set_enable(STM_ISR_TIM6_POS);
- stm_nvic_set_priority(STM_ISR_TIM6_POS,
1
);
+ stm_nvic_set_priority(STM_ISR_TIM6_POS,
AO_STM_NVIC_CLOCK_PRIORITY
);
/* Turn on timer 6 */
stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);
/* Turn on timer 6 */
stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);