From ea0da791f9046d926a501523f72dac7dbeb76203 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 19 Jun 2019 09:32:22 +0200
Subject: [PATCH] EEPROM conversion fix (sensors physID)

---
 radio/src/datastructs.h                               | 5 +++--
 radio/src/storage/conversions/conversions_218_219.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 833abd52c..da984a14d 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -334,7 +334,8 @@ PACK(struct TelemetrySensor {
   };
   char     label[TELEM_LABEL_LEN]; // user defined label
   uint8_t  subId;
-  uint8_t  type:2;                   // 0=custom / 1=calculated// user can choose what unit to display each value in
+  uint8_t  type:1; // 0=custom / 1=calculated // user can choose what unit to display each value in
+  uint8_t  spare1:1;
   uint8_t  unit:6;
   uint8_t  prec:2;
   uint8_t  autoOffset:1;
@@ -342,7 +343,7 @@ PACK(struct TelemetrySensor {
   uint8_t  logs:1;
   uint8_t  persistent:1;
   uint8_t  onlyPositive:1;
-  uint8_t  spare:1;
+  uint8_t  spare2:1;
   union {
     NOBACKUP(PACK(struct {
       uint16_t ratio;
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index beb485726..578b87e82 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -216,7 +216,10 @@ void convertModelData_218_to_219(ModelData &model)
 
   for (uint8_t i=0; i<MAX_TELEMETRY_SENSORS_218; i++) {
     newModel.telemetrySensors[i].id = oldModel.telemetrySensors[i].id;
-    newModel.telemetrySensors[i].instance = 0xE0 + (oldModel.telemetrySensors[i].instance & 0x1F) - 1;
+    if (oldModel.telemetrySensors[i].type == 0)
+      newModel.telemetrySensors[i].instance = 0xE0 + (oldModel.telemetrySensors[i].instance & 0x1F) - 1;
+    else
+      newModel.telemetrySensors[i].instance = oldModel.telemetrySensors[i].instance;
     memcpy(newModel.telemetrySensors[i].label, oldModel.telemetrySensors[i].label, TELEM_LABEL_LEN); // id + instance + label
     newModel.telemetrySensors[i].subId = oldModel.telemetrySensors[i].subId;
     newModel.telemetrySensors[i].type = oldModel.telemetrySensors[i].type;