XLite EEPROM 218 import fix

This commit is contained in:
Bertrand Songis
2019-05-22 17:12:12 +02:00
parent be035ed612
commit 61b66ef230
3 changed files with 18 additions and 16 deletions
+8 -8
View File
@@ -45,7 +45,7 @@ class DataField {
return name;
}
virtual unsigned int size() = 0;
virtual unsigned int size() = 0; // size in bits
virtual void ExportBits(QBitArray & output) = 0;
virtual void ImportBits(const QBitArray & input) = 0;
@@ -81,15 +81,15 @@ class DataField {
int Import(const QByteArray & input)
{
QBitArray bits = bytesToBits(input);
if ((unsigned int)bits.size() < size()) {
qDebug() << QString("Error importing %1: size to small %2/%3").arg(getName()).arg(input.size()).arg(size());
if (unsigned(bits.size()) < size()) {
qDebug() << QString("Error importing %1: size too small %2 bits / %3 bits").arg(getName()).arg(bits.size()).arg(size());
return -1;
}
ImportBits(bits);
return 0;
}
virtual int Dump(int level=0, int offset=0)
virtual int dump(int level=0, int offset=0)
{
QBitArray bits;
ExportBits(bits);
@@ -521,12 +521,12 @@ class StructField: public DataField {
return result;
}
virtual int Dump(int level=0, int offset=0)
virtual int dump(int level=0, int offset=0)
{
for (int i=0; i<level; i++) printf(" ");
printf("%s (%d bytes)\n", getName().toLatin1().constData(), size()/8);
foreach(DataField *field, fields) {
offset = field->Dump(level+1, offset);
offset = field->dump(level+1, offset);
}
return offset;
}
@@ -575,10 +575,10 @@ class TransformedField: public DataField {
virtual void afterImport() = 0;
virtual int Dump(int level=0, int offset=0)
virtual int dump(int level=0, int offset=0)
{
beforeExport();
return field.Dump(level, offset);
return field.dump(level, offset);
}
protected:
@@ -2627,7 +2627,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
internalField.Append(new UnsignedField<7>(this, generalData.backlightOffBright));
internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
}
else if (IS_TARANIS_X9E(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_XLITES(board)) {
else if (IS_TARANIS_X9E(board) || (version >= 219 && (IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_XLITES(board)))) {
internalField.Append(new SpareBitsField<8>(this));
internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
}
@@ -2639,9 +2639,11 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
}
}
internalField.Append(new ZCharField<8>(this, generalData.registrationId, "PXX2 Registration ID"));
if (version >= 219) {
internalField.Append(new ZCharField<8>(this, generalData.registrationId, "PXX2 Registration ID"));
}
if(IS_TARANIS_XLITES(board) || IS_HORUS(board)) {
if (version >= 219 && (IS_TARANIS_XLITES(board) || IS_HORUS(board))) {
internalField.Append(new SignedField<8>(this, generalData.gyroMax, "Gyro full scale"));
internalField.Append(new SignedField<8>(this, generalData.gyroOffset, "Gyro Offset"));
}
@@ -136,7 +136,7 @@ bool OpenTxEepromInterface::saveToByteArray(const T & src, QByteArray & data, ui
QByteArray raw;
T srcCopy(src); // work on a copy of radio data, because Export() will modify it!
M manager(srcCopy, board, version, 0);
// manager.Dump();
// manager.dump();
manager.Export(raw);
data.resize(8);
*((uint32_t*)&data.data()[0]) = Boards::getFourCC(board);
@@ -154,7 +154,7 @@ bool OpenTxEepromInterface::loadFromByteArray(T & dest, const QByteArray & data,
if (manager.Import(data) != 0) {
return false;
}
// manager.Dump(); // Dumps the structure so that it's easy to check with firmware datastructs.h
// manager.dump(); // Dumps the structure so that it's easy to check with firmware datastructs.h
return true;
}
@@ -333,7 +333,7 @@ int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, u
}
OpenTxGeneralData generator((GeneralSettings &)radioData.generalSettings, board, version, variant);
// generator.Dump();
// generator.dump();
QByteArray data;
generator.Export(data);
int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (const uint8_t *)data.constData(), data.size());
@@ -345,7 +345,7 @@ int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, u
for (int i = 0; i < getCurrentFirmware()->getCapability(Models); i++) {
if (i < (int)radioData.models.size() && !radioData.models[i].isEmpty()) {
OpenTxModelData generator((ModelData &)radioData.models[i], board, version, variant);
// generator.Dump();
// generator.dump();
QByteArray data;
generator.Export(data);
int sz = efile->writeRlc2(FILE_MODEL(i), FILE_TYP_MODEL, (const uint8_t *)data.constData(), data.size());
@@ -392,7 +392,7 @@ int OpenTxEepromInterface::getSize(const GeneralSettings &settings)
GeneralSettings srcCopy(settings); // work on a copy of settings data, because Export() may modify it!
OpenTxGeneralData open9xGeneral(srcCopy, board, 255, getCurrentFirmware()->getVariantNumber());
// open9xGeneral.Dump();
// open9xGeneral.dump();
QByteArray eeprom;
open9xGeneral.Export(eeprom);