Fix RC Expo representation above rc rate of 2.0

betaflight · Sep 6, 2016 · f8c5ce5 · f8c5ce5
1 parent 2588f9d
commit f8c5ce5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/changelog.html b/changelog.html
@@ -1,3 +1,7 @@
+<span>2016.09.07 - 1.7.9 - BetaFlight</span>
+<ul>
+    <li>Fix representation of rc expo above rc rate of 2.0</li>
+</ul>
 <span>2016.09.06 - 1.7.8 - BetaFlight</span>
 <ul>
     <li>Change rates to super rates</li>

diff --git a/js/RateCurve.js b/js/RateCurve.js
@@ -13,11 +13,6 @@ var RateCurve = function (useLegacyCurve) {
 
     this.rcCommand = function (rcData, rcRate) {
         var tmp = Math.min(Math.abs(rcData - midRc), 500);
-        rcRate = rcRate;
-
-        if (rcRate > 2) {
-            rcRate = rcRate + (rcRate - 2) * 14.54;
-        }
 
         var result = tmp * rcRate;
 
@@ -66,7 +61,9 @@ var RateCurve = function (useLegacyCurve) {
 RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcRate, rcExpo, superExpoActive) {
     var angleRate;
     if (rate !== undefined && rcRate !== undefined && rcExpo !== undefined) {
-
+        if (rcRate > 2) {
+            rcRate = rcRate + (rcRate - 2) * 14.54;
+        }
         var inputValue = this.rcCommand(rcData, rcRate);
         var maxRc = 500 * rcRate;
 

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "minimum_chrome_version": "38",
-    "version": "1.7.8",
+    "version": "1.7.9",
     "author": "Betaflight Squad",
     "name": "Betaflight - Configurator",
     "short_name": "Betaflight",