rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2175 from mikeller/reinstate_telemetry_msp_port_sharing 

Reinstated telemetry / MSP port sharing, since it can work if 'telemetry_switch' is set to true.
This commit is contained in:
Michael Keller 2017-01-23 12:46:33 +13:00 committed by GitHub
parent 1395d1cd34 8319bf4c69
commit 6ad09ee244
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/io/serial.c
View File

@ -210,10 +210,10 @@ serialPort_t *findNextSharedSerialPort(uint16_t functionMask, serialPortFunction
#ifdef TELEMETRY #ifdef TELEMETRY
#define ALL_TELEMETRY_FUNCTIONS_MASK (TELEMETRY_SHAREABLE_PORT_FUNCTIONS_MASK | FUNCTION_TELEMETRY_HOTT | FUNCTION_TELEMETRY_SMARTPORT) #define ALL_TELEMETRY_FUNCTIONS_MASK (TELEMETRY_SHAREABLE_PORT_FUNCTIONS_MASK | FUNCTION_TELEMETRY_HOTT | FUNCTION_TELEMETRY_SMARTPORT)
#else
#define ALL_TELEMETRY_FUNCTIONS_MASK (FUNCTION_TELEMETRY_FRSKY | FUNCTION_TELEMETRY_HOTT | FUNCTION_TELEMETRY_SMARTPORT | FUNCTION_TELEMETRY_LTM | FUNCTION_TELEMETRY_MAVLINK)
#endif
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | ALL_TELEMETRY_FUNCTIONS_MASK) #define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | ALL_TELEMETRY_FUNCTIONS_MASK)
#else
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX)
#endif
bool isSerialConfigValid(serialConfig_t *serialConfigToCheck) bool isSerialConfigValid(serialConfig_t *serialConfigToCheck)
{ {
@ -222,7 +222,9 @@ bool isSerialConfigValid(serialConfig_t *serialConfigToCheck)
* rules: * rules:
* - 1 MSP port minimum, max MSP ports is defined and must be adhered to. * - 1 MSP port minimum, max MSP ports is defined and must be adhered to.
* - MSP is allowed to be shared with EITHER any telemetry OR blackbox. * - MSP is allowed to be shared with EITHER any telemetry OR blackbox.
* (using either / or, switching based on armed / disarmed or an AUX channel if 'telemetry_switch' is true
* - serial RX and FrSky / LTM / MAVLink telemetry can be shared * - serial RX and FrSky / LTM / MAVLink telemetry can be shared
* (serial RX using RX line, telemetry using TX line)
* - No other sharing combinations are valid. * - No other sharing combinations are valid.
*/ */
uint8_t mspPortCount = 0; uint8_t mspPortCount = 0;

2
src/main/telemetry/smartport.c
View File

@ -352,7 +352,7 @@ bool canSendSmartPortTelemetry(void)
void checkSmartPortTelemetryState(void) void checkSmartPortTelemetryState(void)
{ {
bool newTelemetryEnabledValue = (smartPortPortSharing == PORTSHARING_NOT_SHARED); bool newTelemetryEnabledValue = telemetryDetermineEnabledState(smartPortPortSharing);
if (newTelemetryEnabledValue == smartPortTelemetryEnabled) { if (newTelemetryEnabledValue == smartPortTelemetryEnabled) {
return; return;
} }