From 3c47da2b39a3fb552b2c6c3e76643b74cd160a35 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 27 Nov 2016 19:45:23 +0100 Subject: [PATCH] [Companion] .eepe files should be again OK --- companion/src/firmwares/opentx/opentxeeprom.cpp | 6 ++++-- companion/src/firmwares/opentx/opentxinterface.cpp | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index d95383fb2..0e4be85da 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -3392,8 +3392,10 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne internalField.Append(new UnsignedField<8>(modelData.toplcdTimer)); } - for (int i=0; i<5; i++) { - internalField.Append(new CharField<610>(modelData.customScreenData[i], true, "Custom screen blob")); + if (IS_HORUS(board)) { + for (int i = 0; i < 5; i++) { + internalField.Append(new CharField<610>(modelData.customScreenData[i], true, "Custom screen blob")); + } } } diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 42a83ce13..3cb25979d 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -149,14 +149,14 @@ bool OpenTxEepromInterface::loadModelFromRLE(ModelData & model, RleFile * rleFil rleFile->openRd(FILE_MODEL(index)); int size = rleFile->readRlc2((uint8_t *)data.data(), data.size()); if (size) { - if (loadFromByteArray(model, data, version, variant) == 0) { + if (loadFromByteArray(model, data, version, variant)) { model.used = true; - return true; } } - std::cout << " error when loading model"; - model.clear(); - return false; + else { + model.clear(); + } + return true; } template @@ -1043,7 +1043,7 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari } bool -OpenTxEepromInterface::loadModelFromBackup(ModelData &model, const uint8_t * data, unsigned int size, uint8_t version, uint32_t variant) +OpenTxEepromInterface::loadModelFromBackup(ModelData & model, const uint8_t * data, unsigned int size, uint8_t version, uint32_t variant) { QByteArray backupData((char *) data, size); QByteArray modelData; @@ -1054,7 +1054,7 @@ OpenTxEepromInterface::loadModelFromBackup(ModelData &model, const uint8_t * dat importRlc(modelData, backupData); } if (modelData.size()) { - if (loadFromByteArray(model, modelData, version, variant) == 0) { + if (loadFromByteArray(model, modelData, version, variant)) { model.used = true; return true; }