Merge pull request #7149 from robertlacroix/kisscc-tlm-serial

KISSCC: Fix soft serial on TLM pad
betaflight · Dec 27, 2018 · e5d699e · e5d699e
1 parent 4760190
commit e5d699e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/target/KISSFC/target.c b/src/main/target/KISSFC/target.c
@@ -36,16 +36,15 @@ 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),
     DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR,               TIMER_OUTPUT_INVERTED),
     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
@@ -81,10 +81,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