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

Merge pull request #6764 from jflyper/bfdev-avoid-inactive-telemetry-from-registering-as-displayport-device 

Avoid inactive telemetry port from being registered as a displayport …
This commit is contained in:
Michael Keller 2018-09-24 09:46:31 +12:00 committed by GitHub
parent f814459497 159cb5449b
commit d414cf3b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/telemetry/crsf.c
View File

@ -432,6 +432,10 @@ void initCrsfTelemetry(void)
// and feature is enabled, if so, set CRSF telemetry enabled // and feature is enabled, if so, set CRSF telemetry enabled
crsfTelemetryEnabled = crsfRxIsActive(); crsfTelemetryEnabled = crsfRxIsActive();
if (!crsfTelemetryEnabled) {
return;
}
deviceInfoReplyPending = false; deviceInfoReplyPending = false;
#if defined(USE_MSP_OVER_TELEMETRY) #if defined(USE_MSP_OVER_TELEMETRY)
mspReplyPending = false; mspReplyPending = false;

5
src/main/telemetry/hott.c
View File

@ -351,6 +351,11 @@ void freeHoTTTelemetryPort(void)
void initHoTTTelemetry(void) void initHoTTTelemetry(void)
{ {
portConfig = findSerialPortConfig(FUNCTION_TELEMETRY_HOTT); portConfig = findSerialPortConfig(FUNCTION_TELEMETRY_HOTT);
if (!portConfig) {
return;
}
hottPortSharing = determinePortSharing(portConfig, FUNCTION_TELEMETRY_HOTT); hottPortSharing = determinePortSharing(portConfig, FUNCTION_TELEMETRY_HOTT);
#if defined (USE_HOTT_TEXTMODE) && defined (USE_CMS) #if defined (USE_HOTT_TEXTMODE) && defined (USE_CMS)