From 8210a6b9ea29bb47060dbafaf2d95e22f387a33f Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Fri, 2 Dec 2016 20:31:27 +1300
Subject: [PATCH] Added D setpoint adjustment ranges.

---
 _locales/en/messages.json |  7 ++++-
 tabs/adjustments.html     | 54 ++++++++++++++++++++-------------------
 tabs/adjustments.js       | 45 ++++++++++++++++----------------
 3 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 042c5d11..5d69bb1e 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1138,7 +1138,12 @@
     "adjustmentsFunction21": {
         "message": "RC Rate Yaw"
     },
-
+    "adjustmentsFunction22": {
+        "message": "D Setpoint"
+    },
+    "adjustmentsFunction23": {
+        "message": "D Setpoint Transition"
+    },
     "adjustmentsSave": {
         "message": "Save"
     },
diff --git a/tabs/adjustments.html b/tabs/adjustments.html
index d2cad8a5..c63b30d7 100644
--- a/tabs/adjustments.html
+++ b/tabs/adjustments.html
@@ -67,34 +67,36 @@
                     </div>
                 </td>
                 <td class="functionSelection"><select class="function">
-                        <option value="0" i18n="adjustmentsFunction0"></option>
-                        <option value="1" i18n="adjustmentsFunction1"></option>
-                        <option value="2" i18n="adjustmentsFunction2"></option>
-                        <option value="3" i18n="adjustmentsFunction3"></option>
-                        <option value="4" i18n="adjustmentsFunction4"></option>
-                        <option value="5" i18n="adjustmentsFunction5"></option>
-                        <option value="6" i18n="adjustmentsFunction6"></option>
-                        <option value="7" i18n="adjustmentsFunction7"></option>
-                        <option value="8" i18n="adjustmentsFunction8"></option>
-                        <option value="9" i18n="adjustmentsFunction9"></option>
-                        <option value="10" i18n="adjustmentsFunction10"></option>
-                        <option value="11" i18n="adjustmentsFunction11"></option>
-                        <option value="12" i18n="adjustmentsFunction12"></option>
-                        <option value="13" i18n="adjustmentsFunction13"></option>
-                        <option value="14" i18n="adjustmentsFunction14"></option>
-                        <option value="15" i18n="adjustmentsFunction15"></option>
-                        <option value="16" i18n="adjustmentsFunction16"></option>
-                        <option value="17" i18n="adjustmentsFunction17"></option>
-                        <option value="18" i18n="adjustmentsFunction18"></option>
-                        <option value="19" i18n="adjustmentsFunction19"></option>
-                        <option value="20" i18n="adjustmentsFunction20"></option>
-                        <option value="21" i18n="adjustmentsFunction21"></option>
+                    <option value="0" i18n="adjustmentsFunction0"></option>
+                    <option value="1" i18n="adjustmentsFunction1"></option>
+                    <option value="2" i18n="adjustmentsFunction2"></option>
+                    <option value="3" i18n="adjustmentsFunction3"></option>
+                    <option value="4" i18n="adjustmentsFunction4"></option>
+                    <option value="5" i18n="adjustmentsFunction5"></option>
+                    <option value="6" i18n="adjustmentsFunction6"></option>
+                    <option value="7" i18n="adjustmentsFunction7"></option>
+                    <option value="8" i18n="adjustmentsFunction8"></option>
+                    <option value="9" i18n="adjustmentsFunction9"></option>
+                    <option value="10" i18n="adjustmentsFunction10"></option>
+                    <option value="11" i18n="adjustmentsFunction11"></option>
+                    <option value="12" i18n="adjustmentsFunction12"></option>
+                    <option value="13" i18n="adjustmentsFunction13"></option>
+                    <option value="14" i18n="adjustmentsFunction14"></option>
+                    <option value="15" i18n="adjustmentsFunction15"></option>
+                    <option value="16" i18n="adjustmentsFunction16"></option>
+                    <option value="17" i18n="adjustmentsFunction17"></option>
+                    <option value="18" i18n="adjustmentsFunction18"></option>
+                    <option value="19" i18n="adjustmentsFunction19"></option>
+                    <option value="20" i18n="adjustmentsFunction20"></option>
+                    <option value="21" i18n="adjustmentsFunction21"></option>
+                    <option value="22" i18n="adjustmentsFunction22"></option>
+                    <option value="23" i18n="adjustmentsFunction23"></option>
                 </select></td>
                 <td class="adjustmentSlot"><select class="slot">
-                        <option value="0" i18n="adjustmentsSlot0"></option>
-                        <option value="1" i18n="adjustmentsSlot1"></option>
-                        <option value="2" i18n="adjustmentsSlot2"></option>
-                        <option value="3" i18n="adjustmentsSlot3"></option>
+                    <option value="0" i18n="adjustmentsSlot0"></option>
+                    <option value="1" i18n="adjustmentsSlot1"></option>
+                    <option value="2" i18n="adjustmentsSlot2"></option>
+                    <option value="3" i18n="adjustmentsSlot3"></option>
                 </select></td>
                 <td class="functionSwitchChannel"><select class="channel">
                         <option value=""></option>
diff --git a/tabs/adjustments.js b/tabs/adjustments.js
index 17ab3f62..12eeebe7 100644
--- a/tabs/adjustments.js
+++ b/tabs/adjustments.js
@@ -38,8 +38,8 @@ TABS.adjustments.initialize = function (callback) {
         // update selected slot
         //
         
-        var channelList = $(newAdjustment).find('.adjustmentSlot .slot');
-        channelList.val(adjustmentRange.slotIndex);
+        var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
+        adjustmentList.val(adjustmentRange.slotIndex);
 
         //
         // populate source channel select box
@@ -69,16 +69,17 @@ TABS.adjustments.initialize = function (callback) {
         // populate function channel select box
         //
 
-        var channelList = $(newAdjustment).find('.functionSwitchChannel .channel');
-        var channelOptionTemplate = $(channelList).find('option');
-        channelOptionTemplate.remove();
-        for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
-            var channelOption = channelOptionTemplate.clone();
-            channelOption.text('AUX ' + (channelIndex + 1));
-            channelOption.val(channelIndex);
-            channelList.append(channelOption);
+        var switchList = $(newAdjustment).find('.functionSwitchChannel .channel');
+        var switchOptionTemplate = $(switchList).find('option');
+        switchOptionTemplate.remove();
+        var switchOption;
+        for (var switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) {
+            switchOption = switchOptionTemplate.clone();
+            switchOption.text('AUX ' + (switchIndex + 1));
+            switchOption.val(switchIndex);
+            switchList.append(switchOption);
         }
-        channelList.val(adjustmentRange.auxSwitchChannelIndex);
+        switchList.val(adjustmentRange.auxSwitchChannelIndex);
 
         //
         // configure range
@@ -88,9 +89,8 @@ TABS.adjustments.initialize = function (callback) {
                 'min': [  900 ],
                 'max': [ 2100 ]
             };
-        
-        var defaultRangeValues = [1300, 1700];
-        var rangeValues = defaultRangeValues;
+
+        var rangeValues = [1300, 1700];
         if (adjustmentRange.range != undefined) {
             rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end];
         }
@@ -105,11 +105,10 @@ TABS.adjustments.initialize = function (callback) {
             connect: true,
             range: channel_range,
             format: wNumb({
-                decimals: 0,
+                decimals: 0
             })
         });
 
-        var elementName =  '#adjustment-' + adjustmentIndex;
         $(newAdjustment).find('.channel-slider').Link('lower').to($(newAdjustment).find('.lowerLimitValue'));
         $(newAdjustment).find('.channel-slider').Link('upper').to($(newAdjustment).find('.upperLimitValue'));
 
@@ -156,7 +155,7 @@ TABS.adjustments.initialize = function (callback) {
 
         var auxChannelCount = RC.active_channels - 4;
 
-        var modeTableBodyElement = $('.tab-adjustments .adjustments tbody') 
+        var modeTableBodyElement = $('.tab-adjustments .adjustments tbody');
         for (var adjustmentIndex = 0; adjustmentIndex < ADJUSTMENT_RANGES.length; adjustmentIndex++) {
             var newAdjustment = addAdjustment(adjustmentIndex, ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
             modeTableBodyElement.append(newAdjustment);
@@ -197,7 +196,7 @@ TABS.adjustments.initialize = function (callback) {
                             end: rangeValues[1]
                         },
                         adjustmentFunction: parseInt($(this).find('.functionSelection .function').val()),
-                        auxSwitchChannelIndex: parseInt($(this).find('.functionSwitchChannel .channel').val()),
+                        auxSwitchChannelIndex: parseInt($(this).find('.functionSwitchChannel .channel').val())
                     };
                     ADJUSTMENT_RANGES.push(adjustmentRange);
                 } else {
@@ -273,12 +272,14 @@ TABS.adjustments.cleanup = function (callback) {
 };
 
 TABS.adjustments.adjust_template = function () {
-    var availableFunctionCount = 21; // Available in betaflight 2.9
-    if (semver.gte(CONFIG.flightControllerVersion, '3.1.0')) {
-        availableFunctionCount += 1; // RC rate Yaw added to 3.1.0
+    var availableFunctionCount;
+    if (semver.lt(CONFIG.flightControllerVersion, '3.1.0')) {
+        availableFunctionCount = 21; // Available in betaflight 2.9
+    } else {
+        availableFunctionCount = 24; // RC rate Yaw / D setpoint / D setpoint transition added to 3.1.0
     }
     var template = $('#tab-adjustments-templates .adjustments .adjustment');
     var functionList = $(template).find('.functionSelection .function');
-    var functionListOptions = $(functionList).find('option').slice(0,availableFunctionCount);;
+    var functionListOptions = $(functionList).find('option').slice(0,availableFunctionCount);
     functionList.empty().append(functionListOptions);
 };