From c50677881fc137183c13fedd91b4b7d960b27f2d Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 4 Jan 2015 17:12:44 +0100 Subject: [PATCH] Fixes #1961 --- radio/src/mixer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 32c93a162..996a2f88d 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -526,8 +526,14 @@ void evalInputs(uint8_t mode) vStud *= td->studWeight; vStud /= 50; switch (td->mode) { - case 1: v += vStud; break; // add-mode - case 2: v = vStud; break; // subst-mode + case 1: + // add-mode + v = limit(-RESX, v+vStud, RESX); + break; + case 2: + // subst-mode + v = vStud; + break; } #if defined(PCBTARANIS) calibratedStick[ch] = v;