Skip to content

Commit c48b843

Browse files
committed
made some changes to how the mixer chooses the mixer to use base don the override type. Not sure if it's correct or good, but I'm saving the changes in case we come back to it later
1 parent 908e4d8 commit c48b843

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/mixer.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,13 @@ void Mixer::select_primary_or_secondary_mixer()
635635
mixer_to_use_.u[3] = &secondary_mixer_.u[3];
636636
mixer_to_use_.u[4] = &secondary_mixer_.u[4];
637637
mixer_to_use_.u[5] = &secondary_mixer_.u[5];
638+
639+
for (uint8_t i = 0; i < NUM_MIXER_OUTPUTS; i++) { // Go through each row of the mixing matrix
640+
if (primary_mixer_.override_type[i] == override_type_t.THR || primary_mixer_.override_type[i] == override_type_t.ATT) {
641+
mixer_to_use_.u[i] = &primary_mixer_.u[i];
642+
} else {
643+
mixer_to_use_.u[i] = &secondary_mixer_.u[i];
644+
}
638645
}
639646
}
640647

0 commit comments

Comments
 (0)