From 3e0d17e6eade4f2b36230cb6dc85d73d6072f893 Mon Sep 17 00:00:00 2001 From: borisbstyle Date: Thu, 20 Jul 2017 11:02:00 +0200 Subject: [PATCH] Add SBUS_TELEMETRY_UART initialisation // Change BFF4 target --- src/main/io/serial.c | 7 +++++++ src/main/target/BETAFLIGHTF4/target.c | 2 ++ src/main/target/BETAFLIGHTF4/target.h | 13 ++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/io/serial.c b/src/main/io/serial.c index 65c59c0220..866b0240e2 100644 --- a/src/main/io/serial.c +++ b/src/main/io/serial.c @@ -135,6 +135,13 @@ void pgResetFn_serialConfig(serialConfig_t *serialConfig) } #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->serial_update_rate_hz = 100; } diff --git a/src/main/target/BETAFLIGHTF4/target.c b/src/main/target/BETAFLIGHTF4/target.c index 39a6a8c90f..068d2b353a 100755 --- a/src/main/target/BETAFLIGHTF4/target.c +++ b/src/main/target/BETAFLIGHTF4/target.c @@ -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(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(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 }; diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h index 42a88ca66c..af19cbb4dc 100755 --- a/src/main/target/BETAFLIGHTF4/target.h +++ b/src/main/target/BETAFLIGHTF4/target.h @@ -89,7 +89,11 @@ #define UART6_RX_PIN PC7 #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 ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0, PPM) @@ -118,13 +122,12 @@ #define LED_STRIP #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL - #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2 +#define SBUS_TELEMETRY_UART SERIAL_PORT_SOFTSERIAL1 #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 // USART3, @@ -138,6 +141,6 @@ #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) )