Skip to content

Commit

Permalink
[Companion] Fix GVar min corrupted when upgrading from firmware <= v2…
Browse files Browse the repository at this point in the history
…17 (fixes opentx#5466). (opentx#5477)
  • Loading branch information
mpaperno authored and mr-pokryshkin committed Dec 19, 2017
1 parent 8d47a29 commit 213866f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions companion/src/firmwares/opentx/opentxeeprom.cpp
Expand Up @@ -3227,15 +3227,16 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
for (int i=0; i<MAX_GVARS(board, version); i++) {
if (version >= 218) {
internalField.Append(new ZCharField<3>(this, modelData.gvarData[i].name, "GVar name"));
internalField.Append(new SignedField<12>(this, modelData.gvarData[i].min));
internalField.Append(new SignedField<12>(this, modelData.gvarData[i].max));
internalField.Append(new UnsignedField<12>(this, (unsigned &)modelData.gvarData[i].min));
internalField.Append(new UnsignedField<12>(this, (unsigned &)modelData.gvarData[i].max));
internalField.Append(new BoolField<1>(this, modelData.gvarData[i].popup));
internalField.Append(new UnsignedField<1>(this, modelData.gvarData[i].prec));
internalField.Append(new UnsignedField<2>(this, modelData.gvarData[i].unit));
internalField.Append(new SpareBitsField<4>(this));
}
else {
internalField.Append(new ZCharField<6>(this, modelData.gvarData[i].name, "GVar name"));
internalField.Append(new ZCharField<3>(this, modelData.gvarData[i].name, "GVar name"));
internalField.Append(new SpareBitsField<3*8>(this));
if (version >= 216) {
internalField.Append(new BoolField<1>(this, modelData.gvarData[i].popup));
internalField.Append(new SpareBitsField<7>(this));
Expand Down

0 comments on commit 213866f

Please sign in to comment.