From 22f598cdac74ad66c563979ebffcd7d7f6580e97 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Fri, 3 Jul 2015 14:02:27 +0200
Subject: [PATCH] [Taranis] Fixes #2403 - Differential changes we did in 2.1
 reverted

---
 radio/src/mixer.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 44377a898..a082cc2d5 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -841,7 +841,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
 
       //========== CURVES ===============
 #if defined(XCURVES)
-      if (apply_offset_and_curve && md->curve.value) {
+      if (apply_offset_and_curve && md->curve.type != CURVE_REF_DIFF && md->curve.value) {
         v = applyCurve(v, md->curve);
       }
 #else
@@ -860,7 +860,11 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
       }
 
       //========== DIFFERENTIAL =========
-#if !defined(XCURVES)
+#if defined(XCURVES)
+      if (md->curve.type == CURVE_REF_DIFF && md->curve.value) {
+        dv = applyCurve(dv, md->curve);
+      }
+#else
       if (md->curveMode == MODE_DIFFERENTIAL) {
         // @@@2 also recalculate curveParam to a 256 basis which ease the calculation later a lot
         int16_t curveParam = calc100to256(GET_GVAR(md->curveParam, -100, 100, mixerCurrentFlightMode));