Fixes #2405 - Trims were shifted by 2
This commit is contained in:
@@ -3014,7 +3014,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
|
|||||||
internalField.Append(new UnsignedField<8>(modelData.moduleData[0].modelId));
|
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));
|
internalField.Append(new SwitchesWarningField<64>(modelData.switchWarningStates, board, version));
|
||||||
else if (IS_TARANIS(board))
|
else if (IS_TARANIS(board))
|
||||||
internalField.Append(new SwitchesWarningField<16>(modelData.switchWarningStates, board, version));
|
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));
|
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));
|
internalField.Append(new UnsignedField<32>(modelData.switchWarningEnable));
|
||||||
else if (version >= 216)
|
else if (version >= 216)
|
||||||
internalField.Append(new UnsignedField<8>(modelData.switchWarningEnable));
|
internalField.Append(new UnsignedField<8>(modelData.switchWarningEnable));
|
||||||
|
|||||||
@@ -917,7 +917,7 @@ void ConvertModel_216_to_217(ModelData &model)
|
|||||||
}
|
}
|
||||||
newModel.telemetryProtocol = oldModel.telemetryProtocol;
|
newModel.telemetryProtocol = oldModel.telemetryProtocol;
|
||||||
newModel.thrTrim = oldModel.thrTrim;
|
newModel.thrTrim = oldModel.thrTrim;
|
||||||
newModel.trimInc = oldModel.trimInc - 2;
|
newModel.trimInc = oldModel.trimInc;
|
||||||
newModel.disableThrottleWarning = oldModel.disableThrottleWarning;
|
newModel.disableThrottleWarning = oldModel.disableThrottleWarning;
|
||||||
newModel.displayChecklist = oldModel.displayChecklist;
|
newModel.displayChecklist = oldModel.displayChecklist;
|
||||||
newModel.extendedLimits = oldModel.extendedLimits;
|
newModel.extendedLimits = oldModel.extendedLimits;
|
||||||
@@ -1044,6 +1044,9 @@ void ConvertModel_216_to_217(ModelData &model)
|
|||||||
newModel.moduleData[i].ppmPulsePol = oldModel.moduleData[i].ppmPulsePol;
|
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;
|
newModel.moduleData[EXTERNAL_MODULE].type = oldModel.externalModule;
|
||||||
|
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
|
|||||||
@@ -420,7 +420,9 @@ void modelDefault(uint8_t id)
|
|||||||
}
|
}
|
||||||
#endif
|
#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;
|
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user