Skip to content

Commit

Permalink
Added MATEKF411SE_SS2_CH6 variant (#6895)
Browse files Browse the repository at this point in the history
This moves SS2 from TX2 to Ch6, so that UART 2 remains full, while allowing SS2 support, for things like ESC telemetry.
  • Loading branch information
MrD-RC committed May 11, 2021
1 parent fac79ee commit 0eed666
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 10 deletions.
26 changes: 26 additions & 0 deletions docs/Board - Matek F411-WSE.md
@@ -0,0 +1,26 @@
# Board - [MATEKSYS F411-WSE](http://www.mateksys.com/?portfolio=f411-wse)

![Matek F411 Wing](http://www.mateksys.com/wp-content/uploads/2019/06/F411-WSE_1-1500x600.jpg)

## Specification:

* STM32F411 CPU
* OSD
* BMP280 barometer
* Integrated PDB for 2 motors
* 2 UART ports
* 6 servos
* no SD card slot
* 3 BECs

## Details

* [Full specification](http://www.mateksys.com/?portfolio=f411-wse)
* SBUS pad has a built-in inverter and is connected to UART2 RX

## Available TARGETS

* `MATEKF411SE` Stock target. LED control and have SS1 on ST1 pad, SS2 on TX2 pad.
* `MATEKF411SE_PINIO` Adds USER 2 PINIO support on the LED pad.
* `MATEKF411SE_FD_SFTSRL1` Adds full duplex SS1 by putting the RX on the LED pad.
* `MATEKF411SE_SS2_CH6` SS2 moved to Ch6 pad. This keeps UART 2 as a full UART (for example, for use with Crossfire) and SS2 support.
1 change: 1 addition & 0 deletions src/main/target/MATEKF411SE/CMakeLists.txt
@@ -1,3 +1,4 @@
target_stm32f411xe(MATEKF411SE)
target_stm32f411xe(MATEKF411SE_PINIO)
target_stm32f411xe(MATEKF411SE_FD_SFTSRL1)
target_stm32f411xe(MATEKF411SE_SS2_CH6)
25 changes: 15 additions & 10 deletions src/main/target/MATEKF411SE/target.c
Expand Up @@ -24,19 +24,24 @@
#include "drivers/pinio.h"

const timerHardware_t timerHardware[] = {
DEF_TIM(TIM3, CH1, PB4, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S1 D(1,4,5)
DEF_TIM(TIM3, CH2, PB5, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S2 D(1,5,5)
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S3 D(2,1,6)
DEF_TIM(TIM1, CH2, PA9, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S4 D(2,2,6)
DEF_TIM(TIM1, CH3, PA10, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S5 D(2,6,6)
DEF_TIM(TIM4, CH3, PB8, TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6 D(1,7,2)
DEF_TIM(TIM3, CH1, PB4, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S1 D(1,4,5)
DEF_TIM(TIM3, CH2, PB5, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S2 D(1,5,5)
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S3 D(2,1,6)
DEF_TIM(TIM1, CH2, PA9, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S4 D(2,2,6)
DEF_TIM(TIM1, CH3, PA10, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 1), // S5 D(2,6,6)
#ifndef MATEKF411SE_SS2_CH6
DEF_TIM(TIM4, CH3, PB8, TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6 D(1,7,2)

DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, 0, 0), //ST1 pad -softserial_tx1
DEF_TIM(TIM5, CH3, PA2, TIM_USE_ANY, 0, 0), //TX2 pad -softserial_tx2
DEF_TIM(TIM5, CH3, PA2, TIM_USE_ANY, 0, 0), //TX2 pad - softserial_tx2
#else
DEF_TIM(TIM4, CH3, PB8, TIM_USE_ANY, 0, 0), //CH6 pad - softserial 2
#endif

DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, 0, 0), //ST1 pad -softserial_tx1

DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), //RX2 Pad -PPM
DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), //RX2 Pad -PPM
#ifndef MATEKF411SE_PINIO
DEF_TIM(TIM2, CH3, PB10, TIM_USE_ANY, 0, 0), // softserial_rx1 - LED 2812 D(1,1,3)
DEF_TIM(TIM2, CH3, PB10, TIM_USE_ANY, 0, 0), // softserial_rx1 - LED 2812 D(1,1,3)
#endif

};
Expand Down
5 changes: 5 additions & 0 deletions src/main/target/MATEKF411SE/target.h
Expand Up @@ -77,8 +77,13 @@
#endif

#define USE_SOFTSERIAL2
#ifdef MATEKF411SE_SS2_CH6
#define SOFTSERIAL_2_TX_PIN PB8 // CH6 pad
#define SOFTSERIAL_2_RX_PIN PB8
#else
#define SOFTSERIAL_2_TX_PIN PA2 // TX2 pad
#define SOFTSERIAL_2_RX_PIN PA2
#endif

#define SERIAL_PORT_COUNT 5

Expand Down

0 comments on commit 0eed666

Please sign in to comment.