X3 EEPROM / simulator support added

2019-05-10 00:08:46 +02:00
parent d64397a38a
commit f32e9625c2
12 changed files with 99 additions and 50 deletions
@@ -231,7 +231,9 @@ const int Boards::getCapability(Board::Type board, Board::Capability capability)
      return 4;

    case Pots:
-      if (IS_TARANIS_SMALL(board))
+      if (IS_TARANIS_X3(board))
+        return 1;
+      else if (IS_TARANIS_SMALL(board))
        return 2;
      else if (IS_TARANIS_X9E(board))
        return 4;
@@ -196,9 +196,8 @@ class Boards
 #define IS_TARANIS_X9D(board)          (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP)
 #define IS_TARANIS_PLUS(board)         (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
 #define IS_TARANIS_X9E(board)          (board==Board::BOARD_TARANIS_X9E)
-#define IS_TARANIS(board)              (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_X3(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_XLITES(board))
-#define IS_TARANIS_SMALL(board)        (board==Board::BOARD_TARANIS_X7 || board==Board::BOARD_TARANIS_XLITE || board==Board::BOARD_TARANIS_XLITES || board==Board::BOARD_TARANIS_X3)
-#define IS_TARANIS_NOT_X9E(board)      (IS_TARANIS(board) && !IS_TARANIS_X9E(board))
+#define IS_TARANIS(board)              (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_X3(board) || IS_TARANIS_XLITE(board))
+#define IS_TARANIS_SMALL(board)        (IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_X3(board))
 #define IS_HORUS_X12S(board)           (board==Board::BOARD_X12S)
 #define IS_HORUS_X10(board)            (board==Board::BOARD_X10)
 #define IS_HORUS(board)                (IS_HORUS_X12S(board) || IS_HORUS_X10(board))
@@ -132,11 +132,11 @@ void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox
    b->setCurrentIndex(value);
  }
  if (model && IS_ARM(board)) {
-    for (int i=0; i<CPN_MAX_SENSORS; ++i) {
+    for (unsigned i=0; i<CPN_MAX_SENSORS; ++i) {
      if (model->sensorData[i].isAvailable()) {
        RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i);
        b->addItem(item.toString(model), val+i);
-        if ((int)value == val+i) {
+        if (value == val+i) {
          b->setCurrentIndex(b->count()-1);
        }
      }
@@ -126,8 +126,8 @@ void EEPROMInterface::showEepromWarnings(QWidget *parent, const QString &title,

 // static
 QVector<Firmware *> Firmware::registeredFirmwares;
-Firmware * Firmware::defaultVariant = NULL;
-Firmware * Firmware::currentVariant = NULL;
+Firmware * Firmware::defaultVariant = nullptr;
+Firmware * Firmware::currentVariant = nullptr;

 // static
 Firmware * Firmware::getFirmwareForId(const QString & id)
@@ -229,7 +229,7 @@ void ModelData::clear()
  swashRingData.clear();
  frsky.clear();
  rssiAlarms.clear();
-  for (int i=0; i<CPN_MAX_SENSORS; i++)
+  for (unsigned i=0; i<CPN_MAX_SENSORS; i++)
    sensorData[i].clear();

  static const uint8_t blob[] = { 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x32, 0x50, 0x31, 0x00, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x6d, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -28,7 +28,6 @@
 using namespace Board;

 #define MAX_VIEWS(board)                      (HAS_LARGE_LCD(board) ? 2 : 256)
-#define MAX_POTS(board, version)              (Boards::getCapability(board, Board::Pots))
 #define MAX_SLIDERS(board)                    (IS_HORUS_X10(board) ? 4 : (Boards::getCapability(board, Board::Sliders))) //TODO need to be remove when x10 eeprom gets fixed
 #define MAX_MOUSE_ANALOGS(board)              (IS_HORUS_X10(board) ? 2 : (Boards::getCapability(board, Board::MouseAnalogs))) //TODO need to be remove when x10 eeprom gets fixed
 #define MAX_SWITCHES(board, version)          (Boards::getCapability(board, Board::Switches))
@@ -43,10 +42,10 @@ using namespace Board;
 #define MAX_EXPOS(board, version)             (IS_HORUS_OR_TARANIS(board) ? 64 : 32)
 #define MAX_LOGICAL_SWITCHES(board, version)  (version >= 218 ? 64 : 32)
 #define MAX_CUSTOM_FUNCTIONS(board, version)  64
-#define MAX_CURVES(board, version)            (HAS_LARGE_LCD(board) ? 32 : 16)
+#define MAX_CURVES(board, version)            ((version >= 219 || HAS_LARGE_LCD(board)) ? 32 : 16)
 #define MAX_GVARS(board, version)             9
 #define MAX_SCRIPTS(board)                    (IS_HORUS(board) ? 9 : 7)
-#define MAX_TELEMETRY_SENSORS(board, version) (32)
+#define MAX_TELEMETRY_SENSORS(board, version) (version <= 218 ? 32 : ((IS_HORUS(board) || IS_TARANIS_X9(board)) ? 60 : 40))
 #define NUM_PPM_INPUTS(board, version)        16
 #define ROTENC_COUNT(board, version)          ((IS_STM32(board) && version >= 218) ? 0 : 1)
 #define MAX_AUX_TRIMS(board)                  (IS_HORUS(board) ? 2 : 0)
@@ -84,7 +83,7 @@ class SwitchesConversionTable: public ConversionTable {
      }

      if (IS_HORUS_OR_TARANIS(board)) {
-        for (int i=1; i<=MAX_POTS(board, version)*6; i++) {
+        for (int i=1; i<=Boards::getCapability(board, Board::Pots)*6; i++) {
          addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i), -val+offset);
          addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i), val++);
        }
@@ -118,7 +117,7 @@ class SwitchesConversionTable: public ConversionTable {
      if (version >= 218) {
        addConversion(RawSwitch(SWITCH_TYPE_TELEMETRY, -1), -val+offset);
        addConversion(RawSwitch(SWITCH_TYPE_TELEMETRY, 1), val++);
-        for (int i=1; i<=CPN_MAX_SENSORS; i++) {
+        for (unsigned i=1; i<=CPN_MAX_SENSORS; i++) {
          addConversion(RawSwitch(SWITCH_TYPE_SENSOR, -i), -val+offset);
          addConversion(RawSwitch(SWITCH_TYPE_SENSOR, i), val++);
        }
@@ -206,7 +205,7 @@ class SourcesConversionTable: public ConversionTable {
        }
      }

-      for (int i=0; i<CPN_MAX_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board)+MAX_MOUSE_ANALOGS(board); i++) {
+      for (int i=0; i<CPN_MAX_STICKS+Boards::getCapability(board, Board::Pots)+MAX_SLIDERS(board)+MAX_MOUSE_ANALOGS(board); i++) {
        addConversion(RawSource(SOURCE_TYPE_STICK, i), val++);
      }

@@ -248,7 +247,7 @@ class SourcesConversionTable: public ConversionTable {
        addConversion(RawSource(SOURCE_TYPE_SPECIAL, 2), val++); // Timer1
        addConversion(RawSource(SOURCE_TYPE_SPECIAL, 3), val++); // Timer2
        addConversion(RawSource(SOURCE_TYPE_SPECIAL, 4), val++); // Timer3
-        for (int i=0; i<CPN_MAX_SENSORS*3; ++i) {
+        for (unsigned i=0; i<CPN_MAX_SENSORS*3; ++i) {
          addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
        }
      }
@@ -714,7 +713,7 @@ class MixField: public TransformedField {
        internalField.Append(new UnsignedField<8>(this, mix.speedDown));
        if (IS_HORUS(board))
          internalField.Append(new ZCharField<6>(this, mix.name));
-        else if (HAS_LARGE_LCD(board))
+        else if (HAS_LARGE_LCD(board) && version <= 218)
          internalField.Append(new ZCharField<8>(this, mix.name));
        else
          internalField.Append(new ZCharField<6>(this, mix.name));
@@ -851,7 +850,7 @@ class InputField: public TransformedField {
        internalField.Append(new SpareBitsField<1>(this));
        if (IS_HORUS(board))
          internalField.Append(new ZCharField<6>(this, expo.name));
-        else if (HAS_LARGE_LCD(board))
+        else if (HAS_LARGE_LCD(board) && version <= 218)
          internalField.Append(new ZCharField<8>(this, expo.name));
        else
          internalField.Append(new ZCharField<6>(this, expo.name));
@@ -1869,18 +1868,20 @@ class FrskyField: public StructField {
      telemetryVoltsSourceConversionTable(board, version),
      telemetryCurrentSourceConversionTable(board, version)
    {
-      rssiConversionTable[0] = RSSIConversionTable(0);
-      rssiConversionTable[1] = RSSIConversionTable(1);
+      if (version <= 218) {
+        rssiConversionTable[0] = RSSIConversionTable(0);
+        rssiConversionTable[1] = RSSIConversionTable(1);

-      if (!IS_HORUS(board)) {
-        Append(new UnsignedField<8>(this, frsky.voltsSource, "Volts Source"));
-        Append(new UnsignedField<8>(this, frsky.altitudeSource, "Altitude Source"));
+        if (!IS_HORUS(board)) {
+          Append(new UnsignedField<8>(this, frsky.voltsSource, "Volts Source"));
+          Append(new UnsignedField<8>(this, frsky.altitudeSource, "Altitude Source"));

-        for (int i = 0; i < 4; i++) {
-          Append(new UnsignedField<2>(this, frsky.screens[i].type));
-        }
-        for (int i = 0; i < 4; i++) {
-          Append(new FrskyScreenField(this, frsky.screens[i], board, version, variant));
+          for (int i = 0; i < 4; i++) {
+            Append(new UnsignedField<2>(this, frsky.screens[i].type));
+          }
+          for (int i = 0; i < 4; i++) {
+            Append(new FrskyScreenField(this, frsky.screens[i], board, version, variant));
+          }
        }
      }

@@ -1890,11 +1891,13 @@ class FrskyField: public StructField {
      Append(new SignedField<8>(this, frsky.varioCenterMin));
      Append(new SignedField<8>(this, frsky.varioMin));
      Append(new SignedField<8>(this, frsky.varioMax));
-      Append(new BoolField<1>(this, rssiAlarms.disabled));
-      Append(new SpareBitsField<1>(this));
-      Append(new ConversionField<SignedField<6> >(this, rssiAlarms.warning, -45));
-      Append(new SpareBitsField<2>(this));
-      Append(new ConversionField<SignedField<6> >(this, rssiAlarms.critical, -42));
+      if (version <= 218) {
+        Append(new BoolField<1>(this, rssiAlarms.disabled));
+        Append(new SpareBitsField<1>(this));
+        Append(new ConversionField<SignedField<6> >(this, rssiAlarms.warning, -45));
+        Append(new SpareBitsField<2>(this));
+        Append(new ConversionField<SignedField<6> >(this, rssiAlarms.critical, -42));
+      }
    }

  protected:
@@ -2033,7 +2036,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
 {
  sprintf(name, "Model %s", modelData.name);

-  qCDebug(eepromImport) << QString("OpenTxModelData::OpenTxModelData(name: %1, board: %2, ver: %3, var: %4)").arg(name).arg(board).arg(version).arg(variant);
+  qDebug() << QString("OpenTxModelData::OpenTxModelData(name: %1, board: %2, ver: %3, var: %4)").arg(name).arg(board).arg(version).arg(variant);

  if (IS_HORUS(board))
    internalField.Append(new ZCharField<15>(this, modelData.name, "Model name"));
@@ -2143,9 +2146,23 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
    }
  }

+  // TODO rename to VARIO
  internalField.Append(new FrskyField(this, modelData.frsky, modelData.rssiAlarms, board, version, variant));

-  if (IS_STM32(board)) {
+  if (version >= 219) {
+    // TODO RSSI SOURCE
+    internalField.Append(new SpareBitsField<8>(this));
+
+    if (IS_TARANIS_X9(board)) {
+      // TODO TOPBAR
+      internalField.Append(new SpareBitsField<16>(this));
+    }
+
+    // TODO RSSI ALARMS
+    internalField.Append(new SpareBitsField<16>(this));
+  }
+
+  if (IS_STM32(board) && version <= 218) {
    internalField.Append(new SpareBitsField<3>(this));
    internalField.Append(new UnsignedField<3>(this, modelData.trainerMode));
    internalField.Append(new UnsignedField<2>(this, modelData.potsWarningMode));
@@ -2155,7 +2172,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
    internalField.Append(new UnsignedField<2>(this, modelData.potsWarningMode));
  }

-  int modulesCount = 3;
+  int modulesCount = (version <= 218 ? 3 : 2);
  for (int module=0; module<modulesCount; module++) {
    internalField.Append(new ConversionField<SignedField<4> >(this, modelData.moduleData[module].protocol, &protocolsConversionTable, "Protocol", DataField::tr("OpenTX doesn't accept this radio protocol")));
    internalField.Append(new SignedField<4>(this, subprotocols[module]));
@@ -2164,13 +2181,37 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
    internalField.Append(new UnsignedField<4>(this, modelData.moduleData[module].failsafeMode));
    internalField.Append(new UnsignedField<3>(this, modelData.moduleData[module].subType));
    internalField.Append(new BoolField<1>(this, modelData.moduleData[module].invertedSerial));
-    for (int i=0; i<32; i++) {
-      internalField.Append(new SignedField<16>(this, modelData.moduleData[module].failsafeChannels[i]));
+    if (version <= 218) {
+      for (int i=0; i<32; i++) {
+        internalField.Append(new SignedField<16>(this, modelData.moduleData[module].failsafeChannels[i]));
+      }
    }
    internalField.Append(new ConversionField< SignedField<6> >(this, modelData.moduleData[module].ppm.delay, exportPpmDelay, importPpmDelay));
    internalField.Append(new BoolField<1>(this, modelData.moduleData[module].ppm.pulsePol));
    internalField.Append(new BoolField<1>(this, modelData.moduleData[module].ppm.outputType));
    internalField.Append(new SignedField<8>(this, modelData.moduleData[module].ppm.frameLength));
+    if (version >= 219) {
+      // TODO ACCESS
+      internalField.Append(new SpareBitsField<(1 + 3 * 8 - 2) * 8>(this));
+    }
+  }
+
+  if (version >= 219) {
+    for (int i = 0; i < 32; i++) {
+      internalField.Append(new SignedField<16>(this, modelData.moduleData[0].failsafeChannels[i]));
+    }
+  }
+
+  if (version >= 219) {
+    // Trainer PPM settings
+    internalField.Append(new SpareBitsField<3>(this)); // TODO mode
+    internalField.Append(new SpareBitsField<5>(this));
+    internalField.Append(new UnsignedField<8>(this, modelData.moduleData[2].channelsStart));
+    internalField.Append(new ConversionField<SignedField<8> >(this, modelData.moduleData[2].channelsCount, -8));
+    internalField.Append(new SignedField<8>(this, modelData.moduleData[2].ppm.frameLength));
+    internalField.Append(new ConversionField<SignedField<6> >(this, modelData.moduleData[2].ppm.delay, exportPpmDelay, importPpmDelay));
+    internalField.Append(new BoolField<1>(this, modelData.moduleData[2].ppm.pulsePol));
+    internalField.Append(new SpareBitsField<1>(this));
  }

  if (IS_TARANIS(board) && version < 218) {
@@ -2210,13 +2251,13 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
  }

  for (int i=0; i<8; i++) {
-    if (i < MAX_POTS(board, version)+MAX_SLIDERS(board))
+    if (i < Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board))
      internalField.Append(new BoolField<1>(this, modelData.potsWarningEnabled[i]));
    else
      internalField.Append(new SpareBitsField<1>(this));
  }

-  for (int i=0; i < MAX_POTS(board, version)+MAX_SLIDERS(board); i++) {
+  for (int i=0; i < Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board); i++) {
    internalField.Append(new SignedField<8>(this, modelData.potPosition[i]));
  }

@@ -2346,7 +2387,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
  generalData(generalData),
  board(board),
  version(version),
-  inputsCount(CPN_MAX_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board)+MAX_MOUSE_ANALOGS(board))
+  inputsCount(CPN_MAX_STICKS + Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board) + MAX_MOUSE_ANALOGS(board))
 {
  qCDebug(eepromImport) << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant);

@@ -2513,7 +2554,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
      }
    }
    for (int i=0; i<4; i++) {
-      if (i < MAX_POTS(board, version))
+      if (i < Boards::getCapability(board, Board::Pots))
        internalField.Append(new UnsignedField<2>(this, generalData.potConfig[i]));
      else
        internalField.Append(new SpareBitsField<2>(this));
@@ -2551,7 +2592,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
    for (int i=0; i<CPN_MAX_STICKS; ++i) {
      internalField.Append(new ZCharField<3>(this, generalData.stickName[i], "Stick name"));
    }
-    for (int i=0; i<MAX_POTS(board, version); ++i) {
+    for (int i=0; i<Boards::getCapability(board, Board::Pots); ++i) {
      internalField.Append(new ZCharField<3>(this, generalData.potName[i], "Pot name"));
    }
    for (int i=0; i<MAX_SLIDERS(board); ++i) {
@@ -2572,7 +2613,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
    for (int i=0; i<CPN_MAX_STICKS; ++i) {
      internalField.Append(new ZCharField<3>(this, generalData.stickName[i], "Stick name"));
    }
-    for (int i=0; i<MAX_POTS(board, version); ++i) {
+    for (int i=0; i<Boards::getCapability(board, Board::Pots); ++i) {
      internalField.Append(new ZCharField<3>(this, generalData.potName[i], "Pot name"));
    }
    for (int i=0; i<MAX_SLIDERS(board); ++i) {
@@ -74,6 +74,8 @@ const char * OpenTxEepromInterface::getName()
      return "OpenTX for FrSky Taranis X9E";
    case BOARD_TARANIS_X7:
      return "OpenTX for FrSky Taranis X7";
+    case BOARD_TARANIS_X3:
+      return "OpenTX for FrSky Taranis X3";
    case BOARD_TARANIS_XLITE:
      return "OpenTX for FrSky Taranis X-Lite";
    case BOARD_SKY9X:
@@ -300,6 +302,8 @@ int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, u
 {
  // TODO QMessageBox::warning should not be called here

+  qDebug() << "ICI";
+
  if (version == 0) {
    version = getLastDataVersion(board);
  }
@@ -1261,6 +1265,7 @@ OpenTxEepromInterface * loadFromByteArray(T & dest, const QByteArray & data)
 template <class T, class M>
 bool saveToByteArray(const T & dest, QByteArray & data)
 {
+  qDebug() << "ICI SAVE";
  Board::Type board = getCurrentBoard();
  foreach(OpenTxEepromInterface * eepromInterface, opentxEEpromInterfaces) {
    if (eepromInterface->getBoard() == board) {
@@ -23,7 +23,7 @@

 #include <QtCore>

-#define CPN_MAX_SENSORS       32
+constexpr unsigned CPN_MAX_SENSORS = 60;

 class SensorData {
  Q_DECLARE_TR_FUNCTIONS(SensorData)
@@ -746,7 +746,7 @@ void populateTelemetrySourcesComboBox(AutoComboBox * cb, const ModelData * model
    }
  }
  cb->addItem("---", 0);
-  for (int i=1; i<=CPN_MAX_SENSORS; ++i) {
+  for (unsigned i=1; i<=CPN_MAX_SENSORS; ++i) {
    if (model->sensorData[i-1].isAvailable())
      cb->addItem(model->sensorData[i-1].label, i);
  }
@@ -834,7 +834,7 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent, this);
    ui->A1GB->hide();
    ui->A2GB->hide();
-    for (int i=0; i<CPN_MAX_SENSORS; ++i) {
+    for (unsigned i=0; i<CPN_MAX_SENSORS; ++i) {
      TelemetrySensorPanel * panel = new TelemetrySensorPanel(this, model.sensorData[i], model, generalSettings, firmware);
      ui->sensorsLayout->addWidget(panel);
      sensorPanels[i] = panel;
@@ -899,7 +899,7 @@ void TelemetryPanel::update()
  }

  if (IS_ARM(firmware->getBoard())) {
-    for (int i=0; i<CPN_MAX_SENSORS; ++i) {
+    for (unsigned i=0; i<CPN_MAX_SENSORS; ++i) {
      sensorPanels[i]->update();
    }
  }
@@ -1063,7 +1063,7 @@ QString ModelPrinter::printTelemetrySource(int val)
 {
  QStringList strings = QStringList() << tr("None");

-  for (int i=1; i<=CPN_MAX_SENSORS; ++i) {
+  for (unsigned i=1; i<=CPN_MAX_SENSORS; ++i) {
    strings << QString("%1").arg(model.sensorData[i-1].label);
  }

@@ -859,7 +859,7 @@ QString MultiModelPrinter::printSensors()
  int count = 0;
  columns.appendSectionTableStart();
  columns.appendRowHeader(QStringList() << tr("Name") << tr("Type") << tr("Parameters"));
-  for (int i=0; i<CPN_MAX_SENSORS; ++i) {
+  for (unsigned i=0; i<CPN_MAX_SENSORS; ++i) {
    bool tsEmpty = true;
    for (int k=0; k < modelPrinterMap.size(); k++) {
      if (modelPrinterMap.value(k).first->sensorData[i].isAvailable()) {
@@ -614,6 +614,8 @@ class OpenTxSimulatorFactory: public SimulatorFactory
      return Board::BOARD_X10;
 #elif defined(PCBX7)
      return Board::BOARD_TARANIS_X7;
+#elif defined(PCBX3)
+      return Board::BOARD_TARANIS_X3;
 #elif defined(PCBTARANIS)
      return Board::BOARD_TARANIS_X9D;
 #else