fix: Sort mixer lines after loading model (#3172)

* fix: sort mixer lines after loading model

Fixes #2806

* fix(cpn): sort mixer lines after loading model

* More efficient swap

---------

Co-authored-by: elecpower <neilh713@tpg.com.au>
This commit is contained in:
Raphael Coeffic
2023-02-15 15:11:13 +10:00
committed by GitHub
co-authored by elecpower
parent d57afea89e
commit 3695930242
3 changed files with 39 additions and 3 deletions
@@ -312,7 +312,7 @@ bool convert<TimerData>::decode(const Node& node, TimerData& rhs)
node["showElapsed"] >> rhs.showElapsed;
node["extraHaptic"] >> rhs.extraHaptic;
if (rhs.extraHaptic)
if (rhs.extraHaptic)
rhs.countdownBeep += TimerData::COUNTDOWNBEEP_VOICE + 1;
return true;
@@ -577,7 +577,7 @@ struct RFAlarms {
int critical = 0;
RFAlarms() {}
RFAlarms(const RSSIAlarmData& rhs)
: warning(rhs.warning), critical(rhs.critical)
{}
@@ -1206,6 +1206,10 @@ bool convert<ModelData>::decode(const Node& node, ModelData& rhs)
}
}
// perform integrity checks and fix-ups
rhs.sortMixes(); // critical for Companion and radio that mix lines are in sequence
return true;
}
+1 -1
View File
@@ -230,6 +230,7 @@ class ModelData {
int linkedFlightModeValueToIndex(const int phaseIdx, const int val, const int maxOwnValue);
void clearMixes();
void sortMixes();
void clearInputs();
int getChannelsMax(bool forceExtendedLimits=false) const;
@@ -363,6 +364,5 @@ class ModelData {
if (value != swtch.toValue())
value = swtch.toValue();
}
void sortMixes();
void updateResetParam(CustomFunctionData * cfd);
};