[boards] elle0: possibility to use PPM input on SERVO8

<configure name="RADIO_CONTROL_PPM_PIN" value="SERVO8"/>
This commit is contained in:
Felix Ruess
2016-04-16 10:34:58 +02:00
parent 4bbf237657
commit f11c80be43
3 changed files with 22 additions and 2 deletions
+3 -1
View File
@@ -60,8 +60,10 @@ ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_10 PA10 UART
PPM_CONFIG=1 PPM_CONFIG=1
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6)) else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6))
PPM_CONFIG=2 PPM_CONFIG=2
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PB_07 PB07 PB7 SERVO8))
PPM_CONFIG=3
else else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01, PA10) $(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01, PA10, PB07)
endif endif
+3 -1
View File
@@ -60,8 +60,10 @@ ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_10 PA10 UART
PPM_CONFIG=1 PPM_CONFIG=1
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6)) else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6))
PPM_CONFIG=2 PPM_CONFIG=2
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PB_07 PB07 PB7 SERVO8))
PPM_CONFIG=3
else else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01, PA10) $(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01, PA10, PB07)
endif endif
+16
View File
@@ -187,6 +187,22 @@
#endif #endif
#define USE_AD_TIM1 1 #define USE_AD_TIM1 1
#elif PPM_CONFIG == 3
#if USE_SERVOS_7AND8
#error "You cannot USE_SERVOS_7AND8 and PPM input on PB07 (SERVO8) at the same time"
#endif
/* input on PB07 (Servo 8 pin) */
#define USE_PPM_TIM4 1
#define PPM_CHANNEL TIM_IC2
#define PPM_TIMER_INPUT TIM_IC_IN_TI2
#define PPM_IRQ NVIC_TIM4_IRQ
// Capture/Compare InteruptEnable and InterruptFlag
#define PPM_CC_IE TIM_DIER_CC2IE
#define PPM_CC_IF TIM_SR_CC2IF
#define PPM_GPIO_PORT GPIOB
#define PPM_GPIO_PIN GPIO7
#define PPM_GPIO_AF GPIO_AF2
#else #else
#error "Unknown PPM config" #error "Unknown PPM config"