X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_timer.c;h=0c44f352fb56009bb35b7f1e34e2f22a15faa40b;hp=099a0ece8a6bbdd92d594ab51984238ca06cc900;hb=ab85337aa942cb73a08bd3b783771179773b9a67;hpb=ff4f3a56e09d595abbe32293cbdf1fe368633c49 diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c index 099a0ece..0c44f352 100644 --- a/src/stm/ao_timer.c +++ b/src/stm/ao_timer.c @@ -69,7 +69,19 @@ ao_timer_set_adc_interval(uint8_t interval) __critical } #endif -#define TIMER_10kHz (AO_PCLK1 / 10000) +/* + * According to the STM clock-configuration, timers run + * twice as fast as the APB1 clock *if* the APB1 prescaler + * is greater than 1. + */ + +#if AO_APB1_PRESCALER > 1 +#define TIMER_23467_SCALER 2 +#else +#define TIMER_23467_SCALER 1 +#endif + +#define TIMER_10kHz ((AO_PCLK1 * TIMER_23467_SCALER) / 10000) void ao_timer_init(void)