Merge pull request #2591 from TheCluster/sprf3evo_softserial

Fixed softserial for SPRACINGF3EVO
This commit is contained in:
Michael Keller 2017-03-08 14:32:39 +13:00 committed by GitHub
commit 27a215c77c
2 changed files with 8 additions and 2 deletions

View File

@ -41,7 +41,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 1 ), // PWM2 [TIM2_CH2 (D1_CH7)] [TIM15_CH1N (D1_CH5)]
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1 ), // PWM3 [TIM2_CH3 (D1_CH1)] [TIM15_CH1 (D1_CH5)]
DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1 ), // PWM4 [TIM2_CH4 (D1_CH7)]
DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 1 ), // PWM5 [TIM3_CH1 (D1_CH6)] [TIM16_CH1 (D1_CH3 / D1_CH6)]
DEF_TIM(TIM16, CH1, PA6, TIM_USE_MOTOR, 1 ), // PWM5 [TIM16_CH1 (D1_CH3 / D1_CH6)] [TIM3_CH1 (D1_CH6)]
DEF_TIM(TIM3, CH2, PA7, TIM_USE_MOTOR, 1 ), // PWM6
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1 ), // PWM7
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1 ), // PWM8

View File

@ -72,6 +72,12 @@
#define USE_SOFTSERIAL1
#define USE_SOFTSERIAL2
#define SOFTSERIAL1_RX_PIN PA6 // PWM 5
#define SOFTSERIAL1_TX_PIN PA7 // PWM 6
#define SOFTSERIAL2_RX_PIN PB0 // PWM 7
#define SOFTSERIAL2_TX_PIN PB1 // PWM 8
#define SERIAL_PORT_COUNT 6
#define USE_ESCSERIAL
@ -158,5 +164,5 @@
#ifdef AIORACERF3
#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15) | TIM_N(17))
#else
#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15))
#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15) | TIM_N(16))
#endif