rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Merged in mindnever/librepilot/LP-463-Fix_Incorrect_timer_prescaler (pull request #374)

Browse Source 
LP-463 Use correct timer clock for F1 target. All timers get 72M clock regardless of APB domain they live on.
This commit is contained in:
Philippe Renon 2017-01-09 22:45:31 +01:00
commit 246706ac9d
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flight/pios/common/pios_servo.c
View File

@ -261,26 +261,23 @@ void PIOS_Servo_SetHz(const uint16_t *speeds, const uint32_t *clock, uint8_t ban
new_clock = clock[i];
}
uint32_t apb_clock;
uint32_t timer_clock;
// Choose the correct prescaler value for the APB the timer is attached
#if defined(STM32F10X_MD)
if (timer == TIM1 || timer == TIM8) {
apb_clock = PIOS_PERIPHERAL_APB2_CLOCK;
} else {
apb_clock = PIOS_PERIPHERAL_APB1_CLOCK;
}
// F1 has both timer clock domains running at master clock speed
timer_clock = PIOS_MASTER_CLOCK;
#elif defined(STM32F40_41xxx) || defined(STM32F446xx) || defined(STM32F411xE)
if (timer == TIM1 || timer == TIM8 || timer == TIM9 || timer == TIM10 || timer == TIM11) {
apb_clock = PIOS_PERIPHERAL_APB2_CLOCK;
timer_clock = PIOS_PERIPHERAL_APB2_CLOCK;
} else {
apb_clock = PIOS_PERIPHERAL_APB1_CLOCK;
timer_clock = PIOS_PERIPHERAL_APB1_CLOCK;
}
#else
#error Unsupported MCU
#endif
TIM_TimeBaseStructure.TIM_Prescaler = (apb_clock / new_clock) - 1;
TIM_TimeBaseStructure.TIM_Prescaler = (timer_clock / new_clock) - 1;
TIM_TimeBaseStructure.TIM_Period = ((new_clock / speeds[i]) - 1);
TIM_TimeBaseInit((TIM_TypeDef *)timer, &TIM_TimeBaseStructure);
}

2
flight/targets/boards/coptercontrol/pios_board.h
View File

@ -88,8 +88,6 @@
// System Settings
// -------------------------
#define PIOS_MASTER_CLOCK 72000000
#define PIOS_PERIPHERAL_APB1_CLOCK (PIOS_MASTER_CLOCK / 2)
#define PIOS_PERIPHERAL_APB2_CLOCK (PIOS_MASTER_CLOCK / 1)
// -------------------------
// Interrupt Priorities

2
flight/targets/boards/oplinkmini/pios_board.h
View File

@ -139,8 +139,6 @@
// System Settings
// -------------------------
#define PIOS_MASTER_CLOCK 72000000
#define PIOS_PERIPHERAL_APB1_CLOCK (PIOS_MASTER_CLOCK / 2)
#define PIOS_PERIPHERAL_APB2_CLOCK (PIOS_MASTER_CLOCK / 1)
// -------------------------
// Interrupt Priorities