From 0602a550d7baff2777a94b97f9741cb652789e88 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 21 Feb 2014 22:22:05 +0100
Subject: [PATCH] Issue #731 - Calibration conversion

---
 radio/src/eeprom_conversions.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index 8a0e6bac9..d92460598 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -212,9 +212,27 @@ PACK(typedef struct {
 
 }) ModelData_v215;
 
+PACK(typedef struct {
+  uint8_t   version;
+  uint16_t  variant;
+  int16_t   calibMid[NUM_STICKS+NUM_POTS];
+  int16_t   calibSpanNeg[NUM_STICKS+NUM_POTS];
+  int16_t   calibSpanPos[NUM_STICKS+NUM_POTS];
+  uint16_t  chkSum;
+}) GeneralSettings_v215;
+
 void ConvertGeneralSettings_215_to_216(EEGeneral &settings)
 {
+  GeneralSettings_v215 oldSettings;
+  memcpy(&oldSettings, &settings, sizeof(oldSettings));
+
   settings.version = 216;
+  for (int i=0; i<NUM_STICKS+NUM_POTS; i++) {
+    settings.calib[i].mid = oldSettings.calibMid[i];
+    settings.calib[i].spanNeg = oldSettings.calibSpanNeg[i];
+    settings.calib[i].spanPos = oldSettings.calibSpanPos[i];
+  }
+  settings.chkSum = evalChkSum();
 }
 
 #if defined(PCBTARANIS)