From 86bd251f7441de3789cac4eba2f4d90b439c33f6 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 7 Feb 2014 07:34:40 +0100
Subject: [PATCH] Simulator always asked for calibration

---
 .../src/firmwares/opentx/opentxeeprom.cpp     | 22 +++++++++++++++----
 companion/src/firmwares/opentx/opentxeeprom.h |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 9b7154a9d..60996f68f 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2167,6 +2167,7 @@ Open9xGeneralDataNew::Open9xGeneralDataNew(GeneralSettings & generalData, BoardE
   internalField("General Settings"),
   generalData(generalData),
   board(board),
+  version(version),
   inputsCount(IS_TARANIS(board) ? 8 : 7)
 {
   generalData.version = version;
@@ -2296,10 +2297,23 @@ Open9xGeneralDataNew::Open9xGeneralDataNew(GeneralSettings & generalData, BoardE
 void Open9xGeneralDataNew::beforeExport()
 {
   uint16_t sum = 0;
-  for (int i=0; i<inputsCount; i++)
-    sum += generalData.calibMid[i];
-  for (int i=0; i<5; i++)
-    sum += generalData.calibSpanNeg[i];
+  if (version >= 216) {
+    int count = 0;
+    for (int i=0; i<inputsCount; i++) {
+      sum += generalData.calibMid[i];
+      if (++count == inputsCount+5) break;
+      sum += generalData.calibSpanNeg[i];
+      if (++count == inputsCount+5) break;
+      sum += generalData.calibSpanPos[i];
+      if (++count == inputsCount+5) break;
+    }
+  }
+  else {
+    for (int i=0; i<inputsCount; i++)
+      sum += generalData.calibMid[i];
+    for (int i=0; i<5; i++)
+      sum += generalData.calibSpanNeg[i];
+  }
   chkSum = sum;
 }
 
diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
index 67d051663..50421ea0f 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -64,6 +64,7 @@ class Open9xGeneralDataNew: public TransformedField {
     StructField internalField;
     GeneralSettings & generalData;
     BoardEnum board;
+    unsigned int version;
     int inputsCount;
     unsigned int chkSum;
 };