[Companion] .eepe files should be again OK

This commit is contained in:
Bertrand Songis
2016-11-27 19:45:41 +01:00
parent 7a8f8d611e
commit 3c47da2b39
2 changed files with 11 additions and 9 deletions
@@ -3392,8 +3392,10 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
internalField.Append(new UnsignedField<8>(modelData.toplcdTimer)); internalField.Append(new UnsignedField<8>(modelData.toplcdTimer));
} }
for (int i=0; i<5; i++) { if (IS_HORUS(board)) {
internalField.Append(new CharField<610>(modelData.customScreenData[i], true, "Custom screen blob")); for (int i = 0; i < 5; i++) {
internalField.Append(new CharField<610>(modelData.customScreenData[i], true, "Custom screen blob"));
}
} }
} }
@@ -149,14 +149,14 @@ bool OpenTxEepromInterface::loadModelFromRLE(ModelData & model, RleFile * rleFil
rleFile->openRd(FILE_MODEL(index)); rleFile->openRd(FILE_MODEL(index));
int size = rleFile->readRlc2((uint8_t *)data.data(), data.size()); int size = rleFile->readRlc2((uint8_t *)data.data(), data.size());
if (size) { if (size) {
if (loadFromByteArray<ModelData, OpenTxModelData>(model, data, version, variant) == 0) { if (loadFromByteArray<ModelData, OpenTxModelData>(model, data, version, variant)) {
model.used = true; model.used = true;
return true;
} }
} }
std::cout << " error when loading model"; else {
model.clear(); model.clear();
return false; }
return true;
} }
template <class T, class M> template <class T, class M>
@@ -1043,7 +1043,7 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
} }
bool 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 backupData((char *) data, size);
QByteArray modelData; QByteArray modelData;
@@ -1054,7 +1054,7 @@ OpenTxEepromInterface::loadModelFromBackup(ModelData &model, const uint8_t * dat
importRlc(modelData, backupData); importRlc(modelData, backupData);
} }
if (modelData.size()) { if (modelData.size()) {
if (loadFromByteArray<ModelData, OpenTxModelData>(model, modelData, version, variant) == 0) { if (loadFromByteArray<ModelData, OpenTxModelData>(model, modelData, version, variant)) {
model.used = true; model.used = true;
return true; return true;
} }