From 7aec5762a9fb3e2b729ceb7a36c44dd93dff5510 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 17 May 2014 07:50:44 +0200 Subject: [PATCH] EEPROM shift --- companion/src/firmwares/opentx/opentxeeprom.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index a847dbe7c..02ed2ec2b 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2475,8 +2475,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[1].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol"))); internalField.Append(new UnsignedField<8>(modelData.trainerMode)); } - - if (IS_ARM(board) && version >= 216) { + else if (IS_ARM(board) && version >= 216) { modulesCount = 3; internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol"))); } @@ -2495,13 +2494,6 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne } } - if (board==BOARD_SKY9X && version >= 216) { - internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn)); - for (int i=0; i < GetCurrentFirmware()->getCapability(Pots); i++) { - internalField.Append(new SignedField<8>(modelData.potPosition[i])); - } - } - if (IS_TARANIS(board)) { for (int i=0; i(modelData.curves[i].name)); @@ -2520,6 +2512,9 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne for (int i=0; i<32; i++) { internalField.Append(new ZCharField<4>(modelData.inputNames[i])); } + } + + if (IS_ARM(board) && version >= 216) { internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn)); for (int i=0; i < GetCurrentFirmware()->getCapability(Pots); i++) { internalField.Append(new SignedField<8>(modelData.potPosition[i]));