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 'origin/master'
[fw/altos]
/
src
/
stm
/
ao_fast_timer.c
diff --git
a/src/stm/ao_fast_timer.c
b/src/stm/ao_fast_timer.c
index d61b40c99bed32f5a25af6010f41ad1e93ef9869..9a73eb51c30c3c2e1562907124e9d44c3768cb8c 100644
(file)
--- a/
src/stm/ao_fast_timer.c
+++ b/
src/stm/ao_fast_timer.c
@@
-88,7
+88,11
@@
void stm_tim6_isr(void)
#define TIMER_23467_SCALER 1
#endif
#define TIMER_23467_SCALER 1
#endif
-#define TIMER_10kHz ((AO_PCLK1 * TIMER_23467_SCALER) / 10000)
+#ifndef FAST_TIMER_FREQ
+#define FAST_TIMER_FREQ 10000
+#endif
+
+#define TIMER_FAST ((AO_PCLK1 * TIMER_23467_SCALER) / FAST_TIMER_FREQ)
void
ao_fast_timer_init(void)
void
ao_fast_timer_init(void)
@@
-100,7
+104,7
@@
ao_fast_timer_init(void)
/* Turn on timer 6 */
stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);
/* Turn on timer 6 */
stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);
- stm_tim6.psc = TIMER_
10kHz
;
+ stm_tim6.psc = TIMER_
FAST
;
stm_tim6.arr = 9;
stm_tim6.cnt = 0;
stm_tim6.arr = 9;
stm_tim6.cnt = 0;