piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Companion] .eepe files should be again OK

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+4 -2
View File
@@ -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"));
}
}
}
companion/src/firmwares/opentx/opentxinterface.cpp
+7 -7
View File
@@ -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<ModelData, OpenTxModelData>(model, data, version, variant) == 0) {
if (loadFromByteArray<ModelData, OpenTxModelData>(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 <class T, class M>
@@ -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<ModelData, OpenTxModelData>(model, modelData, version, variant) == 0) {
if (loadFromByteArray<ModelData, OpenTxModelData>(model, modelData, version, variant)) {
model.used = true;
return true;
}