Skip to content

Commit dc8eafa

Browse files
authored
Merge pull request betaflight#7149 from robertlacroix/kisscc-tlm-serial
KISSCC: Fix soft serial on TLM pad
2 parents f7fc096 + 44504f1 commit dc8eafa

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/main/target/KISSFC/target.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
3636

3737
DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 0),
3838
DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0),
39-
DEF_TIM(TIM16, CH1N, PA13, TIM_USE_PWM, 0),
4039
#else
4140
DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED),
4241
DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED),
4342
DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED),
4443
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED),
4544
DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_INVERTED),
4645
DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED),
47-
DEF_TIM(TIM4, CH3, PA13, TIM_USE_PWM, 0), // On KISSFC TIM16 did not work, using TIM4 works
4846
#endif
47+
DEF_TIM(TIM4, CH3, PA13, TIM_USE_PWM, 0),
4948
DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM | TIM_USE_PPM, 0),
5049
DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, 0),
5150
DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0),

src/main/target/KISSFC/target.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@
8383
#define UART3_TX_PIN PB10 // PB10 (AF7)
8484
#define UART3_RX_PIN PB11 // PB11 (AF7)
8585

86-
#ifdef KISSCC
87-
#define SOFTSERIAL1_TX_PIN PA13
88-
#else
89-
#define SOFTSERIAL1_TX_PIN PA13 // AUX1
86+
#define SOFTSERIAL1_TX_PIN PA13 // KISSFC: AUX1, KISSCC: TLM
87+
#if !defined(KISSCC)
9088
#define SOFTSERIAL2_TX_PIN PA15 // ROLL
9189
#endif
9290

0 commit comments

Comments
 (0)