From 534a252342aff0ddb5ece4054bfbbb0f27bb35ac Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Tue, 6 Jun 2017 21:39:34 +0100 Subject: [PATCH 1/2] Merge pull request #2845 from cleanflight/betaflight-master merge recent BF changes --- src/main/target/SPRACINGF4EVO/config.c | 2 +- src/main/target/SPRACINGF4NEO/target.h | 2 +- src/main/telemetry/telemetry.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/target/SPRACINGF4EVO/config.c b/src/main/target/SPRACINGF4EVO/config.c index 43a1226e70..8ea9e98586 100644 --- a/src/main/target/SPRACINGF4EVO/config.c +++ b/src/main/target/SPRACINGF4EVO/config.c @@ -37,7 +37,7 @@ void targetConfiguration(void) rxConfigMutable()->sbus_inversion = 1; serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; // So SPRacingF3OSD users don't have to change anything. serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT; - telemetryConfigMutable()->telemetry_inversion = 0; telemetryConfigMutable()->halfDuplex = 0; + telemetryConfigMutable()->telemetry_inversion = 0; } #endif diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index 8377d59ae0..fc10fc3544 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -18,6 +18,7 @@ #pragma once #define TARGET_BOARD_IDENTIFIER "SP4N" +#define TARGET_CONFIG #ifndef SPRACINGF4NEO_REV #define SPRACINGF4NEO_REV 3 @@ -203,7 +204,6 @@ #define SERIALRX_PROVIDER SERIALRX_SBUS #define TELEMETRY_UART SERIAL_PORT_UART5 -#define TELEMETRY_DEFAULT_HALFDUPLEX 0 // Both pins of UART5 are used for a telemetry circuit #define TELEMETRY_PROVIDER_DEFAULT FUNCTION_TELEMETRY_SMARTPORT #define BUTTONS // Physically located on the optional OSD/VTX board. diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index e7c0b6c551..662d2e0234 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -56,7 +56,9 @@ PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 0); +#ifndef TELEMETRY_DEFAULT_INVERSION #define TELEMETRY_DEFAULT_INVERSION 1 +#endif PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, .telemetry_inversion = TELEMETRY_DEFAULT_INVERSION, From cef13c2a2ba5a5eed838f0abf5eaac2ea42ae5aa Mon Sep 17 00:00:00 2001 From: mikeller Date: Fri, 9 Jun 2017 00:36:36 +1200 Subject: [PATCH 2/2] Fixed the fix. --- src/main/target/SPRACINGF4NEO/config.c | 4 ++-- src/main/telemetry/telemetry.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/target/SPRACINGF4NEO/config.c b/src/main/target/SPRACINGF4NEO/config.c index c426d7ecce..f7261352d1 100644 --- a/src/main/target/SPRACINGF4NEO/config.c +++ b/src/main/target/SPRACINGF4NEO/config.c @@ -30,8 +30,8 @@ void targetConfiguration(void) { serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(GPS_UART)].functionMask = FUNCTION_GPS; - serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = TELEMETRY_PROVIDER_DEFAULT - telemetryConfigMutable()->halfDuplex = TELEMETRY_DEFAULT_HALFDUPLEX; + serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = TELEMETRY_PROVIDER_DEFAULT; + telemetryConfigMutable()->halfDuplex = false; } #endif diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index 662d2e0234..e7c0b6c551 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -56,9 +56,7 @@ PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 0); -#ifndef TELEMETRY_DEFAULT_INVERSION #define TELEMETRY_DEFAULT_INVERSION 1 -#endif PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, .telemetry_inversion = TELEMETRY_DEFAULT_INVERSION,