Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 01:05:27 +03:00
Code Issues Wiki Activity

Merge pull request #2845 from cleanflight/betaflight-master

Browse source 
merge recent BF changes
This commit is contained in:
Dominic Clifton 2017-06-06 21:39:34 +01:00 • committed by mikeller
parent 51f607fdfc
commit 534a252342
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/target/SPRACINGF4EVO/config.c
View file

@ -37,7 +37,7 @@ void targetConfiguration(void)
rxConfigMutable()->sbus_inversion = 1; rxConfigMutable()->sbus_inversion = 1;
serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; // So SPRacingF3OSD users don't have to change anything. serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; // So SPRacingF3OSD users don't have to change anything.
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT; serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
telemetryConfigMutable()->telemetry_inversion = 0;
telemetryConfigMutable()->halfDuplex = 0; telemetryConfigMutable()->halfDuplex = 0;
telemetryConfigMutable()->telemetry_inversion = 0;
} }
#endif #endif

2
src/main/target/SPRACINGF4NEO/target.h
View file

@ -18,6 +18,7 @@
#pragma once #pragma once
#define TARGET_BOARD_IDENTIFIER "SP4N" #define TARGET_BOARD_IDENTIFIER "SP4N"
#define TARGET_CONFIG
#ifndef SPRACINGF4NEO_REV #ifndef SPRACINGF4NEO_REV
#define SPRACINGF4NEO_REV 3 #define SPRACINGF4NEO_REV 3
@ -203,7 +204,6 @@
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define TELEMETRY_UART SERIAL_PORT_UART5 #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 TELEMETRY_PROVIDER_DEFAULT FUNCTION_TELEMETRY_SMARTPORT
#define BUTTONS // Physically located on the optional OSD/VTX board. #define BUTTONS // Physically located on the optional OSD/VTX board.

2
src/main/telemetry/telemetry.c
View file

@ -56,7 +56,9 @@
PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 0); PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 0);
#ifndef TELEMETRY_DEFAULT_INVERSION
#define TELEMETRY_DEFAULT_INVERSION 1 #define TELEMETRY_DEFAULT_INVERSION 1
#endif
PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
.telemetry_inversion = TELEMETRY_DEFAULT_INVERSION, .telemetry_inversion = TELEMETRY_DEFAULT_INVERSION,