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

[Taranis] EEPROM import/export fixes

Browse Source
This commit is contained in:
Bertrand Songis
2016-03-10 18:38:53 +01:00
parent 02fdede06b
commit f1f6bbfc24
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+8 -2
View File
@@ -1465,7 +1465,13 @@ class CurvesField: public TransformedField {
maxPoints(IS_ARM(board) ? 512 : 112-8) maxPoints(IS_ARM(board) ? 512 : 112-8)
{ {
for (int i=0; i<maxCurves; i++) { for (int i=0; i<maxCurves; i++) {
if (IS_TARANIS(board) && version >= 216) { if (IS_TARANIS(board) && version >= 218) {
internalField.Append(new UnsignedField<1>((unsigned int &)curves[i].type));
internalField.Append(new BoolField<1>(curves[i].smooth));
internalField.Append(new ConversionField< SignedField<6> >(curves[i].count, -5));
internalField.Append(new ZCharField<3>(curves[i].name));
}
else if (IS_TARANIS(board) && version >= 216) {
internalField.Append(new UnsignedField<3>((unsigned int &)curves[i].type)); internalField.Append(new UnsignedField<3>((unsigned int &)curves[i].type));
internalField.Append(new BoolField<1>(curves[i].smooth)); internalField.Append(new BoolField<1>(curves[i].smooth));
internalField.Append(new SpareBitsField<4>()); internalField.Append(new SpareBitsField<4>());
@@ -3193,7 +3199,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
} }
} }
if (IS_TARANIS(board)) { if (IS_TARANIS(board) && version < 218) {
for (int i=0; i<MAX_CURVES(board, version); i++) { for (int i=0; i<MAX_CURVES(board, version); i++) {
internalField.Append(new ZCharField<6>(modelData.curves[i].name)); internalField.Append(new ZCharField<6>(modelData.curves[i].name));
} }