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

Fixes #2405 - Trims were shifted by 2

Browse Source
This commit is contained in:
bsongis
2015-07-04 00:33:05 +02:00
parent ae4fc0888a
commit ffaf3401a2
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+2 -2
View File
@@ -3014,7 +3014,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
internalField.Append(new UnsignedField<8>(modelData.moduleData[0].modelId));
}
if (IS_TARANIS_X9E(board) && version >= 217)
if (IS_TARANIS_X9E(board))
internalField.Append(new SwitchesWarningField<64>(modelData.switchWarningStates, board, version));
else if (IS_TARANIS(board))
internalField.Append(new SwitchesWarningField<16>(modelData.switchWarningStates, board, version));
@@ -3022,7 +3022,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
internalField.Append(new SwitchesWarningField<8>(modelData.switchWarningStates, board, version));
if (IS_TARANIS_X9E(board) && version >= 217)
if (IS_TARANIS_X9E(board))
internalField.Append(new UnsignedField<32>(modelData.switchWarningEnable));
else if (version >= 216)
internalField.Append(new UnsignedField<8>(modelData.switchWarningEnable));
radio/src/eeprom_conversions.cpp
+4 -1
View File
@@ -917,7 +917,7 @@ void ConvertModel_216_to_217(ModelData &model)
}
newModel.telemetryProtocol = oldModel.telemetryProtocol;
newModel.thrTrim = oldModel.thrTrim;
newModel.trimInc = oldModel.trimInc - 2;
newModel.trimInc = oldModel.trimInc;
newModel.disableThrottleWarning = oldModel.disableThrottleWarning;
newModel.displayChecklist = oldModel.displayChecklist;
newModel.extendedLimits = oldModel.extendedLimits;
@@ -1044,6 +1044,9 @@ void ConvertModel_216_to_217(ModelData &model)
newModel.moduleData[i].ppmPulsePol = oldModel.moduleData[i].ppmPulsePol;
}
#if defined(PCBTARANIS)
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT;
#endif
newModel.moduleData[EXTERNAL_MODULE].type = oldModel.externalModule;
#if defined(PCBTARANIS)
radio/src/opentx.cpp
+3 -1
View File
@@ -420,7 +420,9 @@ void modelDefault(uint8_t id)
}
#endif
#if defined(PCBSKY9X)
#if defined(PCBTARANIS)
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT;
#elif defined(PCBSKY9X)
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM;
#endif