Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 04:46:51 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[stm32][ppm] config cleanup

Browse Source
This commit is contained in:
Felix Ruess
2013-06-13 21:49:38 +02:00
parent 4222a3a4c6
commit 272cb37a93
5 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
+12 -19
View File
@@ -42,6 +42,7 @@
#include <libopencm3/cm3/nvic.h>
#include "mcu_periph/sys_time.h"
#include "mcu_periph/gpio.h"
#define ONE_MHZ_CLK 1000000
@@ -74,24 +75,16 @@ void ppm_arch_init ( void ) {
/* timer clock enable */
rcc_peripheral_enable_clock(PPM_RCC, PPM_PERIPHERAL);
#if defined(STM32F1)
/* GPIOA clock enable */
rcc_peripheral_enable_clock(&RCC_APB2ENR, PPM_GPIO_PERIPHERAL);
/* timer gpio configuration */
gpio_set_mode(PPM_GPIO_PORT, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT, PPM_GPIO_PIN);
#elif defined(STM32F4)
/* GPIO clock enable */
rcc_peripheral_enable_clock(&RCC_AHB1ENR, PPM_GPIO_PERIPHERAL);
gpio_enable_clock(PPM_GPIO_PORT);
/* timer gpio configuration */
gpio_mode_setup(PPM_GPIO_PORT, GPIO_MODE_AF, GPIO_PUPD_NONE, PPM_GPIO_PIN);
gpio_set_af(PPM_GPIO_PORT, PPM_GPIO_AF, PPM_GPIO_PIN);
#endif
gpio_setup_pin_af(PPM_GPIO_PORT, PPM_GPIO_PIN, PPM_GPIO_AF, FALSE);
/* Time Base configuration */
timer_reset(PPM_TIMER);
timer_set_mode(PPM_TIMER, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
timer_set_period(PPM_TIMER, 0xFFFF);
timer_set_prescaler(PPM_TIMER, (AHB_CLK / (RC_PPM_TICKS_PER_USEC*ONE_MHZ_CLK)) - 1);
@@ -118,8 +111,8 @@ void ppm_arch_init ( void ) {
nvic_enable_irq(PPM_IRQ2);
#endif
/* Enable the CC2 and Update interrupt requests. */
timer_enable_irq(PPM_TIMER, (PPM_IRQ_FLAGS | TIM_DIER_UIE));
/* Enable the Capture/Compare and Update interrupt requests. */
timer_enable_irq(PPM_TIMER, (PPM_CC_IE | TIM_DIER_UIE));
/* Enable capture channel. */
timer_ic_enable(PPM_TIMER, PPM_CHANNEL);
@@ -137,8 +130,8 @@ void ppm_arch_init ( void ) {
void tim2_isr(void) {
if((TIM2_SR & TIM_SR_CC2IF) != 0) {
timer_clear_flag(TIM2, TIM_SR_CC2IF);
if((TIM2_SR & PPM_CC_IF) != 0) {
timer_clear_flag(TIM2, PPM_CC_IF);
uint32_t now = timer_get_counter(TIM2) + timer_rollover_cnt;
DecodePpmFrame(now);
@@ -164,13 +157,13 @@ void tim1_up_tim10_isr(void) {
}
void tim1_cc_isr(void) {
if((TIM1_SR & PPM_IRQ_CCIF) != 0) {
timer_clear_flag(TIM1, PPM_IRQ_CCIF);
if((TIM1_SR & PPM_CC_IF) != 0) {
timer_clear_flag(TIM1, PPM_CC_IF);
uint32_t now = timer_get_counter(TIM1) + timer_rollover_cnt;
DecodePpmFrame(now);
}
}
#endif
#endif /* USE_PPM_TIM1 */
sw/airborne/boards/apogee_0.99.h
+6 -5
View File
@@ -269,17 +269,18 @@
#define PWM_TIM2_CHAN_MASK (PWM_SERVO_0_OC_BIT|PWM_SERVO_1_OC_BIT|PWM_SERVO_4_OC_BIT|PWM_SERVO_5_OC_BIT)
#define PWM_TIM3_CHAN_MASK (PWM_SERVO_2_OC_BIT|PWM_SERVO_3_OC_BIT)
/* PPM */
/*
* PPM
*/
#define USE_PPM_TIM1 1
#define PPM_CHANNEL TIM_IC1
#define PPM_TIMER_INPUT TIM_IC_IN_TI1
#define PPM_IRQ NVIC_TIM1_CC_IRQ
#define PPM_IRQ2 NVIC_TIM1_UP_TIM10_IRQ
#define PPM_IRQ_FLAGS TIM_DIER_CC1IE
#define PPM_IRQ_CCIF TIM_SR_CC1IF
#define PPM_GPIO_PERIPHERAL RCC_AHB1ENR_IOPAEN
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_IE TIM_DIER_CC1IE
#define PPM_CC_IF TIM_SR_CC1IF
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO8
#define PPM_GPIO_AF GPIO_AF1
sw/airborne/boards/krooz_sd.h
+3 -3
View File
@@ -386,9 +386,9 @@
#define PPM_TIMER_INPUT TIM_IC_IN_TI1
#define PPM_IRQ NVIC_TIM2_IRQ
//#define PPM_IRQ2 NVIC_TIM2_UP_TIM10_IRQ
#define PPM_IRQ_FLAGS TIM_DIER_CC2IE
#define PPM_IRQ_CCIF TIM_SR_CC2IF
#define PPM_GPIO_PERIPHERAL RCC_AHB1ENR_IOPBEN
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_EN TIM_DIER_CC2IE
#define PPM_CC_IF TIM_SR_CC2IF
#define PPM_GPIO_PORT GPIOB
#define PPM_GPIO_PIN GPIO3
#define PPM_GPIO_AF GPIO_AF1
sw/airborne/boards/lisa_l_1.0.h
+3 -3
View File
@@ -124,9 +124,9 @@
#define PPM_CHANNEL TIM_IC2
#define PPM_TIMER_INPUT TIM_IC_IN_TI2
#define PPM_IRQ NVIC_TIM2_IRQ
#define PPM_IRQ_FLAGS (TIM_DIER_CC2IE | TIM_DIER_UIE)
#define PPM_IRQ_CCIF TIM_SR_CC2IF
#define PPM_GPIO_PERIPHERAL RCC_APB2ENR_IOPAEN
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_IE TIM_DIER_CC2IE
#define PPM_CC_IF TIM_SR_CC2IF
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO1
sw/airborne/boards/lisa_m_common.h
+8 -6
View File
@@ -103,11 +103,12 @@
#define PPM_TIMER_INPUT TIM_IC_IN_TI3
#define PPM_IRQ NVIC_TIM1_UP_IRQ
#define PPM_IRQ2 NVIC_TIM1_CC_IRQ
#define PPM_IRQ_FLAGS (TIM_DIER_CC3IE | TIM_DIER_UIE)
#define PPM_IRQ_CCIF TIM_SR_CC3IF
#define PPM_GPIO_PERIPHERAL RCC_APB2ENR_IOPAEN
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_IE TIM_DIER_CC3IE
#define PPM_CC_IF TIM_SR_CC3IF
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO10
#define PPM_GPIO_AF 0
#elif PPM_CONFIG == 2
/* input on PA10 (Servo 6 pin) */
@@ -115,11 +116,12 @@
#define PPM_CHANNEL TIM_IC2
#define PPM_TIMER_INPUT TIM_IC_IN_TI2
#define PPM_IRQ NVIC_TIM2_IRQ
#define PPM_IRQ_FLAGS (TIM_DIER_CC2IE | TIM_DIER_UIE)
#define PPM_IRQ_CCIF TIM_SR_CC2IF
#define PPM_GPIO_PERIPHERAL RCC_APB2ENR_IOPAEN
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_IE TIM_DIER_CC2IE
#define PPM_CC_IF TIM_SR_CC2IF
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO1
#define PPM_GPIO_AF 0
// Move default ADC timer
#if USE_AD_TIM2