Merge pull request #5798 from Faduf/YupiF4_patch

YupiF4 Motor output Patch
This commit is contained in:
Michael Keller 2018-05-04 15:32:14 +12:00 committed by GitHub
commit 75f82c7f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -33,9 +33,9 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0 ), // S2_OUT - DMA1_ST4
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0 ), // S3_OUT - DMA1_ST1
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1 ), // S4_OUT - DMA1_ST6
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S5_OUT - DMA1_ST7
DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // S6_OUT - DMA1_ST3 - Camera control
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0 ), // S7_OUT
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0 ), // S5_OUT - DMA1_ST7
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S6_OUT - DMA1_ST3
DEF_TIM(TIM3, CH4, PB1, TIM_USE_ANY, 0, 0 ), // Camera control
DEF_TIM(TIM3, CH4, PC9, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM
DEF_TIM(TIM12, CH1, PB14, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM OPT
};

View File

@ -88,8 +88,8 @@
#define UART6_TX_PIN PC6
#define USE_SOFTSERIAL1
#define SOFTSERIAL1_RX_PIN PB0 // PWM5
#define SOFTSERIAL1_TX_PIN PB1 // PWM7
#define SOFTSERIAL1_RX_PIN PB1 // PWM7
#define SOFTSERIAL1_TX_PIN PB0 // PWM5
#define USE_SOFTSERIAL2