Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Fixes #1879 - Tests needed (differential is now applied before

Browse source 
weight/offset), just like other curves
This commit is contained in:
bsongis 2014-12-11 07:26:10 +01:00
parent 91e52f82c6
commit f008e6ad88
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/mixer.cpp
View file

@ -875,7 +875,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
//========== CURVES ===============
#if defined(PCBTARANIS)
if (apply_offset_and_curve && md->curve.type != CURVE_REF_DIFF && md->curve.value) {
if (apply_offset_and_curve && md->curve.value) {
v = applyCurve(v, md->curve);
}
#else
@ -894,11 +894,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
}
//========== DIFFERENTIAL =========
#if defined(PCBTARANIS)
if (md->curve.type == CURVE_REF_DIFF && md->curve.value) {
dv = applyCurve(dv, md->curve);
}
#else
#if !defined(PCBTARANIS)
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));