From 76be4006a4a6ec2d5ce847ddf8cd6b47e7ea09fc Mon Sep 17 00:00:00 2001 From: Hans Christian Olaussen <41271048+klutvott123@users.noreply.github.com> Date: Wed, 21 Nov 2018 13:42:12 +0100 Subject: [PATCH] Rename variables Renamed inputValue/absRc to rcCommandf/rcCommandfAbs to be consistent with betaflight code. Moved scaling of inputValue. Removed rcInput. --- src/js/RateCurve.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/js/RateCurve.js b/src/js/RateCurve.js index 1acac6d0..46791441 100755 --- a/src/js/RateCurve.js +++ b/src/js/RateCurve.js @@ -87,11 +87,12 @@ RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcR rcRate = rcRate + (rcRate - 2) * 14.54; } - var inputValue = this.rcCommand(rcData, rcRate, deadband); var maxRc = 500 * rcRate; - var absRc = Math.abs(inputValue) / maxRc; + var rcCommandf = this.rcCommand(rcData, rcRate, deadband) / maxRc; + var rcCommandfAbs = Math.abs(rcCommandf); var expoPower; var rcRateConstant; + if (semver.gte(CONFIG.apiVersion, "1.20.0")) { expoPower = 3; rcRateConstant = 200; @@ -101,17 +102,15 @@ RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcR } if (rcExpo > 0) { - inputValue = inputValue * Math.pow(absRc, expoPower) * rcExpo + inputValue * (1-rcExpo); + rcCommandf = rcCommandf * Math.pow(rcCommandfAbs, expoPower) * rcExpo + rcCommandf * (1-rcExpo); } - var rcInput = inputValue / maxRc; - if (superExpoActive) { - var rcFactor = 1 / this.constrain(1 - absRc * rate, 0.01, 1); - angleRate = rcRateConstant * rcRate * rcInput; // 200 should be variable checked on version (older versions it's 205,9) + var rcFactor = 1 / this.constrain(1 - rcCommandfAbs * rate, 0.01, 1); + angleRate = rcRateConstant * rcRate * rcCommandf; // 200 should be variable checked on version (older versions it's 205,9) angleRate = angleRate * rcFactor; } else { - angleRate = (((rate * 100) + 27) * inputValue / 16) / 4.1; // Only applies to old versions ? + angleRate = (((rate * 100) + 27) * rcCommandf / 16) / 4.1; // Only applies to old versions ? } angleRate = this.constrain(angleRate, -1998, 1998); // Rate limit protection