Merge pull request #2711 from betaflight/spracingf3neo-fix-1
CF/BF - SPRACINGF3NEO - Fix incorrect LED strip output pin.
This commit is contained in:
parent
2698861e3a
commit
7641c8eb67
2
Makefile
2
Makefile
|
@ -101,7 +101,7 @@ HSE_VALUE ?= 8000000
|
||||||
# used for turning on features like VCP and SDCARD
|
# used for turning on features like VCP and SDCARD
|
||||||
FEATURES =
|
FEATURES =
|
||||||
|
|
||||||
SAMPLE_TARGETS = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO STM32F3DISCOVERY
|
SAMPLE_TARGETS = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO SPRACINGF3NEO STM32F3DISCOVERY
|
||||||
ALT_TARGETS = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
|
ALT_TARGETS = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
|
||||||
OPBL_TARGETS = $(filter %_OPBL, $(ALT_TARGETS))
|
OPBL_TARGETS = $(filter %_OPBL, $(ALT_TARGETS))
|
||||||
|
|
||||||
|
|
|
@ -53,11 +53,9 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
|
||||||
DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 1 ), // PWM3 - PB10 - *TIM2_CH3, UART3_TX (AF7)
|
DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 1 ), // PWM3 - PB10 - *TIM2_CH3, UART3_TX (AF7)
|
||||||
DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 1 ), // PWM4 - PB11 - *TIM2_CH4, UART3_RX (AF7)
|
DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 1 ), // PWM4 - PB11 - *TIM2_CH4, UART3_RX (AF7)
|
||||||
|
|
||||||
#ifndef USE_DSHOT
|
|
||||||
// with DSHOT DMA1-CH3 conflicts with TIM3_CH4 / ESC1.
|
// with DSHOT DMA1-CH3 conflicts with TIM3_CH4 / ESC1.
|
||||||
DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0 ),
|
DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0 ),
|
||||||
// with DSHOT TIM8 is used for DSHOT and cannot be used for LED too.
|
|
||||||
DEF_TIM(TIM8, CH1, PA15, TIM_USE_LED, 0 ),
|
DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0 ),
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue