From fcf32c82ba23b420778616a266a3f17cf828b2e4 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 28 Feb 2018 18:09:18 +0100 Subject: [PATCH] multi protocol --- radio/src/telemetry/telemetry_sensors.cpp | 32 ++++++++++++++++------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp index a960779aa..4f69771f5 100644 --- a/radio/src/telemetry/telemetry_sensors.cpp +++ b/radio/src/telemetry/telemetry_sensors.cpp @@ -23,17 +23,31 @@ TelemetryItem telemetryItems[MAX_TELEMETRY_SENSORS]; uint8_t allowNewSensors; -bool isFaiForbidden(source_t idx) { +bool isFaiForbidden(source_t idx) +{ TelemetrySensor * sensor = &g_model.telemetrySensors[(idx-MIXSRC_FIRST_TELEM)/3]; - if (sensor->id == RSSI_ID) { - return false; - } - else if (sensor->id == BATT_ID) { - return false; - } - else{ - return true; + + switch (telemetryProtocol) { + + case PROTOCOL_FRSKY_SPORT: + if (sensor->id == RSSI_ID) { + return false; + } + else if (sensor->id == BATT_ID) { + return false; + } + break; + + case PROTOCOL_FRSKY_D: + if (sensor->id == D_RSSI_ID) { + return false; + } + else if (sensor->id == D_A1_ID) { + return false; + } + break; } + return true; } // TODO in maths