From aed219cbd1d95bb3d14218e59f99df6c0e029a84 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sun, 2 Mar 2014 14:35:42 +0100
Subject: [PATCH] EEPROM conversions problems

---
 .../src/firmwares/opentx/opentxeeprom.cpp     | 18 ++++--
 radio/src/eeprom_conversions.cpp              | 55 +++++++++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 6b278c712..0ce62a612 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1091,7 +1091,7 @@ class CurvesField: public TransformedField {
         CurveData *curve = &curves[i];
         int size = (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
         if (offset+size > maxPoints) {
-          EEPROMWarnings += ::QObject::tr("openTx only accepts %1 points in all curves").arg(maxPoints) + "\n";
+          EEPROMWarnings += ::QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints) + "\n";
           break;
         }
         if (!IS_TARANIS(board) || version < 216) {
@@ -1128,6 +1128,16 @@ class CurvesField: public TransformedField {
           }
         }
 
+        if (curve->count > 17) {
+          qDebug() << "Wrong points count" << curve->count;
+          curve->count = 0;
+          for (int j=0; j<maxCurves; j++) {
+            CurveData *curve = &curves[j];
+            curve->clear(5);
+          }
+          return;
+        }
+
         for (int j=0; j<curve->count; j++) {
           curve->points[j].y = *cur++;
         }
@@ -2518,11 +2528,11 @@ void Open9xGeneralDataNew::beforeExport()
     int count = 0;
     for (int i=0; i<inputsCount; i++) {
       sum += generalData.calibMid[i];
-      if (++count == inputsCount+5) break;
+      if (++count == 12) break;
       sum += generalData.calibSpanNeg[i];
-      if (++count == inputsCount+5) break;
+      if (++count == 12) break;
       sum += generalData.calibSpanPos[i];
-      if (++count == inputsCount+5) break;
+      if (++count == 12) break;
     }
   }
   else {
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index 8a8bec2d3..d6f95a775 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -225,6 +225,59 @@ PACK(typedef struct {
   int16_t   calibSpanNeg[NUM_STICKS+NUM_POTS_215];
   int16_t   calibSpanPos[NUM_STICKS+NUM_POTS_215];
   uint16_t  chkSum;
+  int8_t    currModel;
+  uint8_t   contrast;
+  uint8_t   vBatWarn;
+  int8_t    vBatCalib;
+  int8_t    backlightMode;
+  TrainerData trainer;
+  uint8_t   view;            // index of view in main screen
+  int8_t    buzzerMode:2;    // -2=quiet, -1=only alarms, 0=no keys, 1=all
+  uint8_t   fai:1;
+  int8_t    beepMode:2;      // -2=quiet, -1=only alarms, 0=no keys, 1=all
+  uint8_t   alarmsFlash:1;
+  uint8_t   disableMemoryWarning:1;
+  uint8_t   disableAlarmWarning:1;
+  uint8_t   stickMode:2;
+  int8_t    timezone:5;
+  uint8_t   spare1:1;
+  uint8_t   inactivityTimer;
+  uint8_t   mavbaud:3;
+  SPLASH_MODE; /* 3bits */
+  int8_t    hapticMode:2;    // -2=quiet, -1=only alarms, 0=no keys, 1=all
+  uint8_t   blOffBright:4;
+  uint8_t   blOnBright:4;
+  uint8_t   lightAutoOff;
+  uint8_t   templateSetup;   // RETA order for receiver channels
+  int8_t    PPM_Multiplier;
+  int8_t    hapticLength;
+  uint8_t   reNavigation;    // not used on STOCK board
+  int8_t    beepLength:3;
+  uint8_t   hapticStrength:3;
+  uint8_t   gpsFormat:1;
+  uint8_t   unexpectedShutdown:1;
+  uint8_t   speakerPitch;
+  int8_t    speakerVolume;
+  int8_t    vBatMin;
+  int8_t    vBatMax;
+  uint8_t   backlightBright;
+  int8_t    currentCalib;
+  int8_t    temperatureWarn;
+  uint8_t   mAhWarn;
+  uint16_t  mAhUsed;
+  uint32_t  globalTimer;
+  int8_t    temperatureCalib;
+  uint8_t   btBaudrate;
+  uint8_t   optrexDisplay;
+  uint8_t   sticksGain;
+  uint8_t   rotarySteps;
+  uint8_t   countryCode;
+  uint8_t   imperial;
+  char      ttsLanguage[2];
+  int8_t    beepVolume;
+  int8_t    wavVolume;
+  int8_t    varioVolume;
+  int8_t    backgroundVolume;
 }) GeneralSettings_v215;
 
 void ConvertGeneralSettings_215_to_216(EEGeneral &settings)
@@ -243,6 +296,8 @@ void ConvertGeneralSettings_215_to_216(EEGeneral &settings)
     j++;
   }
   settings.chkSum = evalChkSum();
+
+  memcpy(&settings.currModel, &oldSettings.currModel, sizeof(GeneralSettings_v215)-offsetof(GeneralSettings_v215, currModel));
 }
 
 int ConvertTelemetrySource_215_to_216(int source)