Merge branch 'next' of https://github.com/opentx/opentx into next
This commit is contained in:
@@ -896,7 +896,12 @@ class ExpoField: public TransformedField {
|
|||||||
|
|
||||||
virtual void afterImport()
|
virtual void afterImport()
|
||||||
{
|
{
|
||||||
expo.weight = smallGvarToC9x(_weight);
|
if (IS_TARANIS(board) && version < 216) {
|
||||||
|
expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
|
||||||
|
}
|
||||||
|
|
||||||
|
expo.weight = smallGvarToC9x(_weight);
|
||||||
|
|
||||||
if (!IS_TARANIS(board) || version < 216) {
|
if (!IS_TARANIS(board) || version < 216) {
|
||||||
if (!_curveMode)
|
if (!_curveMode)
|
||||||
expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarToC9x(_curveParam));
|
expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarToC9x(_curveParam));
|
||||||
|
|||||||
@@ -83,7 +83,10 @@ void InputsPanel::update()
|
|||||||
curDest = md->chn;
|
curDest = md->chn;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
str = " ";
|
if (GetEepromInterface()->getCapability(VirtualInputs))
|
||||||
|
str = " ";
|
||||||
|
else
|
||||||
|
str = " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetEepromInterface()->getCapability(VirtualInputs)) {
|
if (GetEepromInterface()->getCapability(VirtualInputs)) {
|
||||||
|
|||||||
+2395
-2418
File diff suppressed because it is too large
Load Diff
@@ -610,6 +610,7 @@ void ConvertModel_215_to_216(ModelData &model)
|
|||||||
|
|
||||||
for (uint8_t i=0; i<9; i++) {
|
for (uint8_t i=0; i<9; i++) {
|
||||||
memcpy(&g_model.phaseData[i], &oldModel.phaseData[i], sizeof(oldModel.phaseData[i])); // the last 4 gvars will remain blank
|
memcpy(&g_model.phaseData[i], &oldModel.phaseData[i], sizeof(oldModel.phaseData[i])); // the last 4 gvars will remain blank
|
||||||
|
g_model.phaseData[i].swtch = ConvertSwitch_215_to_216(oldModel.phaseData[i].swtch);
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
for (uint8_t t=0; t<4; t++) {
|
for (uint8_t t=0; t<4; t++) {
|
||||||
int trim = oldModel.phaseData[i].trim[t];
|
int trim = oldModel.phaseData[i].trim[t];
|
||||||
|
|||||||
Reference in New Issue
Block a user