From 6f21556b8125ce2d6d7cf4533f4a2c3eb3209c5e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Wed, 22 Jul 2015 22:30:37 +0200
Subject: [PATCH] #2538 - Proposal for a fix. We have many wrong sensors,
 including openXsensor. The first ID is stored in EEPROM, but not used during
 the search loop

---
 radio/src/gui/Taranis/menu_model_telemetry.cpp | 15 +++++++++++----
 radio/src/myeeprom.h                           |  4 ++--
 radio/src/telemetry/telemetry.cpp              |  6 ++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp
index d99741a7a..394876668 100644
--- a/radio/src/gui/Taranis/menu_model_telemetry.cpp
+++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp
@@ -74,6 +74,7 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_SENSOR31,
   ITEM_TELEMETRY_SENSOR32,
   ITEM_TELEMETRY_NEWSENSOR,
+  ITEM_TELEMETRY_IGNORE_SENSORID,
 #if defined(VARIO)
   ITEM_TELEMETRY_VARIO_LABEL,
   ITEM_TELEMETRY_VARIO_SOURCE,
@@ -120,7 +121,7 @@ enum menuModelTelemetryItems {
 #define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0)
 
 #define SENSOR_ROWS(x)    (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
-#define SENSORS_ROWS      LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0,
+#define SENSORS_ROWS      LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0,
 #if defined(VARIO)
   #define VARIO_ROWS      LABEL(Vario), 0, 1, 2,
 #else
@@ -529,7 +530,7 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsAtt(TELEM_COL2, y, "---", 0); // TODO shortcut
       }
       TelemetrySensor * sensor = & g_model.telemetrySensors[index];
-      if (sensor->type == TELEM_TYPE_CUSTOM) {
+      if (sensor->type == TELEM_TYPE_CUSTOM && !g_model.ignoreSensorIds) {
         lcd_outdezAtt(TELEM_COL3, y, sensor->instance, LEFT);
       }
       if (attr) {
@@ -555,8 +556,10 @@ void menuModelTelemetry(uint8_t event)
 
       case ITEM_TELEMETRY_SENSORS_LABEL:
         lcd_putsLeft(y, STR_TELEMETRY_SENSORS);
-        lcd_putsAtt(TELEM_COL2, y, STR_VALUE, 0);
-        lcd_putsAtt(TELEM_COL3, y, STR_ID, 0);
+        if (!g_model.ignoreSensorIds) {
+          lcd_putsAtt(TELEM_COL2, y, STR_VALUE, 0);
+          lcd_putsAtt(TELEM_COL3, y, STR_ID, 0);
+        }
         break;
 
       case ITEM_TELEMETRY_NEWSENSOR:
@@ -574,6 +577,10 @@ void menuModelTelemetry(uint8_t event)
         }
         break;
 
+      case ITEM_TELEMETRY_IGNORE_SENSORID:
+        ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, INDENT "Ignore IDs", attr, event);
+        break;
+
       case ITEM_TELEMETRY_RSSI_LABEL:
         lcd_putsLeft(y, PSTR("RSSI"));
         break;
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 99e1c6980..a7a52fcc1 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1272,7 +1272,7 @@ enum TelemetrySensorFormula
 
 PACK(typedef struct {
   union {
-    uint16_t id;                     // data identifier, for FrSky we can reuse existing ones. Source unit is derived from type.
+    uint16_t id;                   // data identifier, for FrSky we can reuse existing ones. Source unit is derived from type.
     uint16_t persistentValue;
   };
   union {
@@ -2130,7 +2130,7 @@ PACK(typedef struct {
   AVR_FIELD(int8_t    ppmNCH:4)
   ARM_FIELD(uint8_t   noGlobalFunctions:1)
   ARM_FIELD(uint8_t   displayTrims:2)
-  ARM_FIELD(uint8_t   spare2:1)
+  ARM_FIELD(uint8_t   ignoreSensorIds:1)
   int8_t    trimInc:3;            // Trim Increments
   uint8_t   disableThrottleWarning:1;
   ARM_FIELD(uint8_t displayChecklist:1)
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 93fd18719..51e99f68b 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -179,7 +179,9 @@ void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t val, uint32
     newVal = 0;
   }
   else if (unit == UNIT_RPMS) {
-    newVal = (newVal * sensor.custom.offset) / sensor.custom.ratio;
+    if (sensor.custom.ratio != 0) {
+      newVal = (newVal * sensor.custom.offset) / sensor.custom.ratio;
+    }
   }
   else {
     newVal = sensor.getValue(newVal, unit, prec);
@@ -486,7 +488,7 @@ void setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t instance
 
   for (int index=0; index<MAX_SENSORS; index++) {
     TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
-    if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id && telemetrySensor.instance == instance) {
+    if (telemetrySensor.type == TELEM_TYPE_CUSTOM && (telemetrySensor.id == id || g_model.ignoreSensorIds) && telemetrySensor.instance == instance) {
       telemetryItems[index].setValue(telemetrySensor, value, unit, prec);
       available = true;
       // we continue search here, because more than one sensor can have the same id and instance