From 44504f173fba04757412f7f8b20cc395e4c578dc Mon Sep 17 00:00:00 2001 From: Robert Lacroix Date: Thu, 29 Nov 2018 21:08:43 -0800 Subject: [PATCH] KISSCC: Fix soft serial on TLM pad _Legal disclaimer: I am making my contributions/submissions to this project solely in my personal capacity and am not conveying any rights to any intellectual property of any third parties._ --- src/main/target/KISSFC/target.c | 3 +-- src/main/target/KISSFC/target.h | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/target/KISSFC/target.c b/src/main/target/KISSFC/target.c index ad90a65c1..2e90f72ac 100644 --- a/src/main/target/KISSFC/target.c +++ b/src/main/target/KISSFC/target.c @@ -36,7 +36,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 0), DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM16, CH1N, PA13, TIM_USE_PWM, 0), #else DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), @@ -44,8 +43,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_INVERTED), DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), - DEF_TIM(TIM4, CH3, PA13, TIM_USE_PWM, 0), // On KISSFC TIM16 did not work, using TIM4 works #endif + DEF_TIM(TIM4, CH3, PA13, TIM_USE_PWM, 0), DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM | TIM_USE_PPM, 0), DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, 0), DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0), diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h index baea6dc39..c6de55b2d 100644 --- a/src/main/target/KISSFC/target.h +++ b/src/main/target/KISSFC/target.h @@ -83,10 +83,8 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) -#ifdef KISSCC -#define SOFTSERIAL1_TX_PIN PA13 -#else -#define SOFTSERIAL1_TX_PIN PA13 // AUX1 +#define SOFTSERIAL1_TX_PIN PA13 // KISSFC: AUX1, KISSCC: TLM +#if !defined(KISSCC) #define SOFTSERIAL2_TX_PIN PA15 // ROLL #endif -- 2.11.4.GIT