From 3996fa17bc92bf469a4a054b92c08aa14f059726 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 19 Mar 2019 12:14:51 +0100
Subject: [PATCH] Conversion continued

---
 .../conversions/conversions_216_218.cpp       |  3 +-
 .../conversions/conversions_218_219.cpp       |  6 +-
 .../src/storage/conversions/datastructs_218.h | 57 +++++++------------
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/radio/src/storage/conversions/conversions_216_218.cpp b/radio/src/storage/conversions/conversions_216_218.cpp
index fc9ffa687..f558efd17 100644
--- a/radio/src/storage/conversions/conversions_216_218.cpp
+++ b/radio/src/storage/conversions/conversions_216_218.cpp
@@ -1234,8 +1234,7 @@ void convertModelData_217_to_218(ModelData &model)
     }
   }
   for (int i=0; i<NUM_MODULES+1; i++) {
-    // newModel.moduleData[i] = oldModel.moduleData[i];
-#warning "Conversion from v217 to v218 is broken"
+    memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], sizeof(ModuleData_v218));
   }
 #if defined(PCBTARANIS)
   newModel.trainerMode = oldModel.trainerMode;
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 1c81d8583..a12161cb4 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -56,9 +56,9 @@ void convertModelData_218_to_219(ModelData &model)
   newModel.trainerData.mode = oldModel.trainerMode;
   newModel.trainerData.channelsStart = oldModel.moduleData[NUM_MODULES].channelsStart;
   newModel.trainerData.channelsCount = oldModel.moduleData[NUM_MODULES].channelsCount;
-  newModel.trainerData.frameLength = oldModel.moduleData[NUM_MODULES].frameLength;
-  newModel.trainerData.delay = oldModel.moduleData[NUM_MODULES].delay;
-  newModel.trainerData.pulsePol = oldModel.moduleData[NUM_MODULES].pulsePol;
+  newModel.trainerData.frameLength = oldModel.moduleData[NUM_MODULES].ppm.frameLength;
+  newModel.trainerData.delay = oldModel.moduleData[NUM_MODULES].ppm.delay;
+  newModel.trainerData.pulsePol = oldModel.moduleData[NUM_MODULES].ppm.pulsePol;
 
   memcpy(newModel.scriptsData, oldModel.scriptsData,
          sizeof(newModel.scriptsData) +
diff --git a/radio/src/storage/conversions/datastructs_218.h b/radio/src/storage/conversions/datastructs_218.h
index fe43dffbe..887bcb0d2 100644
--- a/radio/src/storage/conversions/datastructs_218.h
+++ b/radio/src/storage/conversions/datastructs_218.h
@@ -151,42 +151,29 @@ PACK(typedef struct {
       int8_t  frameLength;
     } ppm;
     struct {
-               uint8_t rfProtocolExtra:2;
-               uint8_t spare1:3;
-               uint8_t customProto:1;
-               uint8_t autoBindMode:1;
-               uint8_t lowPowerMode:1;
-               int8_t optionValue;
-             } multi;
+      uint8_t rfProtocolExtra:2;
+      uint8_t spare1:3;
+      uint8_t customProto:1;
+      uint8_t autoBindMode:1;
+      uint8_t lowPowerMode:1;
+      int8_t optionValue;
+    } multi;
     struct {
-               uint8_t power:2;                  // 0=10 mW, 1=100 mW, 2=500 mW, 3=1W
-               uint8_t spare1:2;
-               uint8_t receiver_telem_off:1;     // false = receiver telem enabled
-               uint8_t receiver_channel_9_16:1;  // false = pwm out 1-8, true 9-16
-               uint8_t external_antenna:1;       // false = internal antenna, true = external antenna
-               uint8_t fast:1;                   // TODO: to be used later by external module (fast means serial @ high speed)
-               uint8_t spare2;
-             } pxx;
+      uint8_t power:2;                  // 0=10 mW, 1=100 mW, 2=500 mW, 3=1W
+      uint8_t spare1:2;
+      uint8_t receiver_telem_off:1;     // false = receiver telem enabled
+      uint8_t receiver_channel_9_16:1;  // false = pwm out 1-8, true 9-16
+      uint8_t external_antenna:1;       // false = internal antenna, true = external antenna
+      uint8_t fast:1;                   // TODO: to be used later by external module (fast means serial @ high speed)
+      uint8_t spare2;
+    } pxx;
     struct {
-               uint8_t spare1:6;
-               uint8_t noninverted:1;
-               uint8_t spare2:1;
-               int8_t refreshRate;  // definition as framelength for ppm (* 5 + 225 = time in 1/10 ms)
-             } sbus;
+      uint8_t spare1:6;
+      uint8_t noninverted:1;
+      uint8_t spare2:1;
+      int8_t refreshRate;  // definition as framelength for ppm (* 5 + 225 = time in 1/10 ms)
+    } sbus;
   };
-
-  // Helper functions to set both of the rfProto protocol at the same time
-  inline uint8_t getMultiProtocol(bool returnCustom) {
-    if (returnCustom && multi.customProto)
-      return MM_RF_CUSTOM_SELECTED;
-    return ((uint8_t) (rfProtocol & 0x0f)) + (multi.rfProtocolExtra << 4);
-  }
-
-  inline void setMultiProtocol(uint8_t proto)
-  {
-    rfProtocol = (uint8_t) (proto & 0x0f);
-    multi.rfProtocolExtra = (proto & 0x30) >> 4;
-  }
 }) ModuleData_v218;
 
 PACK(typedef struct {
@@ -310,7 +297,7 @@ PACK(typedef struct {
 #elif defined(PCBTARANIS)
 #define MODELDATA_EXTRA_218   uint8_t spare:3; uint8_t trainerMode:3; uint8_t potsWarnMode:2; ModuleData_v218 moduleData[NUM_MODULES+1]; ScriptData scriptsData[MAX_SCRIPTS_218]; char inputNames[MAX_INPUTS_218][LEN_INPUT_NAME_218]; uint8_t potsWarnEnabled; int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS];
 #elif defined(PCBSKY9X)
-#define MODELDATA_EXTRA_218   uint8_t spare:6; uint8_t potsWarnMode:2; ModuleData moduleData[NUM_MODULES+1]; char inputNames[MAX_INPUTS_218][LEN_INPUT_NAME_218]; uint8_t potsWarnEnabled; int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]; uint8_t rxBattAlarms[2];
+#define MODELDATA_EXTRA_218   uint8_t spare:6; uint8_t potsWarnMode:2; ModuleData_v218 moduleData[NUM_MODULES+1]; char inputNames[MAX_INPUTS_218][LEN_INPUT_NAME_218]; uint8_t potsWarnEnabled; int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]; uint8_t rxBattAlarms[2];
 #else
   #define MODELDATA_EXTRA_218
 #endif
@@ -354,7 +341,7 @@ PACK(typedef struct {
 
   MODELDATA_EXTRA_218
 
-    TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS_218];
+  TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS_218];
 
   TARANIS_PCBX9E_FIELD(uint8_t toplcdTimer)
 }) ModelData_v218;