From ca8fa6087478db63c18c903311ad4dffa3c81e4e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 4 Apr 2019 07:14:43 +0200
Subject: [PATCH] Removed this as it prevents us from having many RX streaming
 in the same time

---
 radio/src/telemetry/frsky_sport.cpp       |  2 +-
 radio/src/telemetry/telemetry_sensors.cpp | 19 -------------------
 radio/src/telemetry/telemetry_sensors.h   |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 751d660d0..cce6cc737 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -159,7 +159,7 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packe
 
   if (primId == DATA_FRAME) {
     uint8_t instance = physicalId + (origin << 5);
-    if (dataId == RSSI_ID && isValidIdAndInstance(RSSI_ID, instance)) {
+    if (dataId == RSSI_ID) {
       telemetryStreaming = TELEMETRY_TIMEOUT10ms; // reset counter only if valid packets are being detected
       data = SPORT_DATA_U8(packet);
       if (data == 0)
diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp
index d73021eb8..bc26f87b6 100644
--- a/radio/src/telemetry/telemetry_sensors.cpp
+++ b/radio/src/telemetry/telemetry_sensors.cpp
@@ -479,25 +479,6 @@ int lastUsedTelemetryIndex()
   return -1;
 }
 
-bool isValidIdAndInstance(uint16_t id, uint8_t instance)
-{
-  bool sensorFound = false;
-
-  for (int index=0; index<MAX_TELEMETRY_SENSORS; index++) {
-    TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
-    if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id) {
-      sensorFound = true;
-      if (telemetrySensor.instance == instance || g_model.ignoreSensorIds)
-        return true;
-    }
-  }
-
-  if (sensorFound)
-    return false;
-
-  return true;
-}
-
 int setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, uint8_t instance, int32_t value, uint32_t unit, uint32_t prec)
 {
   bool available = false;
diff --git a/radio/src/telemetry/telemetry_sensors.h b/radio/src/telemetry/telemetry_sensors.h
index d891502fb..0b8085985 100644
--- a/radio/src/telemetry/telemetry_sensors.h
+++ b/radio/src/telemetry/telemetry_sensors.h
@@ -137,6 +137,5 @@ class TelemetryItem
 extern TelemetryItem telemetryItems[MAX_TELEMETRY_SENSORS];
 extern uint8_t allowNewSensors;
 bool isFaiForbidden(source_t idx);
-bool isValidIdAndInstance(uint16_t id, uint8_t instance);
 
 #endif // _TELEMETRY_SENSORS_H_