From 6b632bf65e1b555c01eafbf79fc09e8f45ad7554 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Fri, 20 Apr 2018 07:52:36 +1200 Subject: [PATCH] Added timer for PA3 (PPM in) for OMNIBUSF7. (#5716) --- src/main/target/OMNIBUSF7/target.c | 1 + src/main/target/OMNIBUSF7/target.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/target/OMNIBUSF7/target.c b/src/main/target/OMNIBUSF7/target.c index b776041260..e559da763a 100644 --- a/src/main/target/OMNIBUSF7/target.c +++ b/src/main/target/OMNIBUSF7/target.c @@ -41,6 +41,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM2, CH4, PB11, TIM_USE_NONE, 0, 0 ), // UART3_RX, I2C2_SDA DEF_TIM(TIM8, CH1, PC6, TIM_USE_NONE, 0, 0 ), // UART6_TX DEF_TIM(TIM8, CH2, PC7, TIM_USE_NONE, 0, 0 ), // UART6_RX + DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0, 0 ), // UART2_RX, joined with PE13 // For ESC serial DEF_TIM(TIM9, CH1, PA2, TIM_USE_NONE, 0, 0 ), // UART2_TX (unwired) diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index 1a9f057fe6..ee49466033 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -272,9 +272,9 @@ #define TARGET_IO_PORTE 0xffff #ifdef FPVM_BETAFLIGHTF7 -#define USABLE_TIMER_CHANNEL_COUNT 12 +#define USABLE_TIMER_CHANNEL_COUNT 13 #else -#define USABLE_TIMER_CHANNEL_COUNT 11 +#define USABLE_TIMER_CHANNEL_COUNT 12 #endif #define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(9) )