Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[stm32] add support of TIM9 and TIM12 for PPM input (#2584)

Browse Source 
with libopencm3 and stm32F4
This commit is contained in:
Gautier Hattenberger
2020-10-01 12:47:51 +02:00
committed by GitHub
parent cba4c8bcad
commit fab1253574
1 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
+54 -8
View File
@@ -56,7 +56,13 @@
static uint32_t timer_rollover_cnt;
#if USE_PPM_TIM2
#if USE_PPM_TIM1
PRINT_CONFIG_MSG("Using TIM1 for PPM input.")
#define PPM_TIMER TIM1
#define RCC_TIM_PPM RCC_TIM1
#elif USE_PPM_TIM2
PRINT_CONFIG_MSG("Using TIM2 for PPM input.")
#define PPM_TIMER TIM2
@@ -80,18 +86,24 @@ PRINT_CONFIG_MSG("Using TIM5 for PPM input.")
#define PPM_TIMER TIM5
#define RCC_TIM_PPM RCC_TIM5
#elif USE_PPM_TIM1
PRINT_CONFIG_MSG("Using TIM1 for PPM input.")
#define PPM_TIMER TIM1
#define RCC_TIM_PPM RCC_TIM1
#elif USE_PPM_TIM8
PRINT_CONFIG_MSG("Using TIM8 for PPM input.")
#define PPM_TIMER TIM8
#define RCC_TIM_PPM RCC_TIM8
#elif USE_PPM_TIM9
PRINT_CONFIG_MSG("Using TIM9 for PPM input.")
#define PPM_TIMER TIM9
#define RCC_TIM_PPM RCC_TIM9
#elif USE_PPM_TIM12
PRINT_CONFIG_MSG("Using TIM12 for PPM input.")
#define PPM_TIMER TIM12
#define RCC_TIM_PPM RCC_TIM12
#else
#error Unknown PPM input timer configuration.
#endif
@@ -232,7 +244,7 @@ void tim1_cc_isr(void) {
}
}
#elif USE_PPM_TIM8 && defined(STM32F4)
#elif USE_PPM_TIM8
#if defined(STM32F1)
void tim8_up_isr(void) {
@@ -254,5 +266,39 @@ void tim8_cc_isr(void) {
}
}
#elif USE_PPM_TIM9 && defined(STM32F4)
void tim1_brk_tim9_isr(void)
{
if ((TIM9_SR & PPM_CC_IF) != 0) {
timer_clear_flag(TIM9, PPM_CC_IF);
uint32_t now = timer_get_counter(TIM9) + timer_rollover_cnt;
ppm_decode_frame(now);
} else if ((TIM9_SR & TIM_SR_UIF) != 0) {
timer_rollover_cnt += (1 << 16);
timer_clear_flag(TIM9, TIM_SR_UIF);
}
}
#elif USE_PPM_TIM12 && defined(STM32F4)
void tim8_brk_tim12_isr(void)
{
if ((TIM12_SR & PPM_CC_IF) != 0) {
timer_clear_flag(TIM12, PPM_CC_IF);
uint32_t now = timer_get_counter(TIM12) + timer_rollover_cnt;
ppm_decode_frame(now);
} else if ((TIM12_SR & TIM_SR_UIF) != 0) {
timer_rollover_cnt += (1 << 16);
timer_clear_flag(TIM12, TIM_SR_UIF);
}
}
#endif /* USE_PPM_TIM1 */