Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Add SBUS_TELEMETRY_UART initialisation // Change BFF4 target

Browse source
This commit is contained in:
borisbstyle 2017-07-20 11:02:00 +02:00
parent 75055a5a66
commit 3e0d17e6ea
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/io/serial.c
View file

@ -135,6 +135,13 @@ void pgResetFn_serialConfig(serialConfig_t *serialConfig)
} }
#endif #endif
#ifdef SBUS_TELEMETRY_UART
serialPortConfig_t *serialTlemetryUartConfig = serialFindPortConfiguration(SBUS_TELEMETRY_UART);
if (serialTlemetryUartConfig) {
serialTlemetryUartConfig->functionMask = FUNCTION_TELEMETRY_SMARTPORT;
}
#endif
serialConfig->reboot_character = 'R'; serialConfig->reboot_character = 'R';
serialConfig->serial_update_rate_hz = 100; serialConfig->serial_update_rate_hz = 100;
} }

2
src/main/target/BETAFLIGHTF4/target.c
View file

@ -33,5 +33,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S4_OUT D1_ST1 DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S4_OUT D1_ST1
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S5_OUT DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S5_OUT
DEF_TIM(TIM3, CH2, PA1, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S6_OUT D1_ST2 DEF_TIM(TIM3, CH2, PA1, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // S6_OUT D1_ST2
DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // UART6 TX Softserial Smartport
DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, TIMER_OUTPUT_STANDARD, 0), // UART6 RX
DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_STANDARD, 0), // LED DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_STANDARD, 0), // LED
}; };

13
src/main/target/BETAFLIGHTF4/target.h
View file

@ -89,7 +89,11 @@
#define UART6_RX_PIN PC7 #define UART6_RX_PIN PC7
#define UART6_TX_PIN PC6 #define UART6_TX_PIN PC6
#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART2, USART3, USART6 #define USE_SOFTSERIAL1
#define SOFTSERIAL1_RX_PIN PC7
#define SOFTSERIAL1_TX_PIN PC6
#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART2, USART3, USART6
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0, PPM) #define ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0, PPM)
@ -118,13 +122,12 @@
#define LED_STRIP #define LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define SBUS_TELEMETRY_UART SERIAL_PORT_SOFTSERIAL1
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD) #define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_SOFTSERIAL)
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART3, // USART3,
@ -138,6 +141,6 @@
#define TARGET_IO_PORTD (BIT(2)) #define TARGET_IO_PORTD (BIT(2))
#define USABLE_TIMER_CHANNEL_COUNT 8 #define USABLE_TIMER_CHANNEL_COUNT 10
#define USED_TIMERS ( TIM_N(1) | TIM_N(3) | TIM_N(4) | TIM_N(8) ) #define USED_TIMERS ( TIM_N(1) | TIM_N(3) | TIM_N(4) | TIM_N(8) )