From 19f4145965a231a24f539aa5529278dc9d7d8869 Mon Sep 17 00:00:00 2001
From: Miguel Angel Mulero Martinez <migmul@gmail.com>
Date: Sat, 21 Jul 2018 08:52:00 +0200
Subject: [PATCH] Add PID F inflight adjustments

---
 locales/en/messages.json   | 15 +++++++++++++++
 src/js/tabs/adjustments.js | 18 +++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index 35410767..354db4f4 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1636,15 +1636,30 @@
     "adjustmentsFunction22": {
         "message": "D Setpoint"
     },
+    "adjustmentsFunction22_2": {
+        "message": "Pitch & Roll F Adjustment"
+    },
     "adjustmentsFunction23": {
         "message": "D Setpoint Transition"
     },
+    "adjustmentsFunction23_2": {
+        "message": "Feedforward Transition"
+    },
     "adjustmentsFunction24": {
         "message": "Horizon Strength Adjustment"
     },
     "adjustmentsFunction25": {
         "message": "PID-Audio Selection"
     },
+    "adjustmentsFunction26": {
+        "message": "Pitch F Adjustment"
+    },
+    "adjustmentsFunction27": {
+        "message": "Roll F Adjustment"
+    },
+    "adjustmentsFunction28": {
+        "message": "Yaw F Adjustment"
+    },
     "adjustmentsSave": {
         "message": "Save"
     },
diff --git a/src/js/tabs/adjustments.js b/src/js/tabs/adjustments.js
index 490a1632..38be7ab5 100644
--- a/src/js/tabs/adjustments.js
+++ b/src/js/tabs/adjustments.js
@@ -277,7 +277,9 @@ TABS.adjustments.adjust_template = function () {
     var selectFunction = $('#functionSelectionSelect');
     var elementsNumber;
 
-    if (semver.gte(CONFIG.apiVersion, "1.39.0")) {
+    if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
+        elementsNumber = 29; // PID Audio
+    } else if (semver.gte(CONFIG.apiVersion, "1.39.0")) {
         elementsNumber = 26; // PID Audio
     } else if (semver.gte(CONFIG.apiVersion, "1.37.0")) {
         elementsNumber = 25; // Horizon Strength
@@ -288,5 +290,19 @@ TABS.adjustments.adjust_template = function () {
     for (let i = 0; i < elementsNumber; i++) {
         selectFunction.append(new Option(i18n.getMessage('adjustmentsFunction' + i), i));
     }
+    
+    // For 1.40, the D Setpoint has been replaced, so we replace it with the correct values
+    if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
 
+        var element22 = selectFunction.find("option[value='22']");
+        var element23 = selectFunction.find("option[value='23']");
+
+        // Change the "text"
+        element22.text(i18n.getMessage('adjustmentsFunction22_2'));
+        element23.text(i18n.getMessage('adjustmentsFunction23_2'));
+
+        // Reorder, we insert it with the other FF elements to be coherent...
+        element22.insertAfter(selectFunction.find("option[value='25']"));
+        element23.insertAfter(selectFunction.find("option[value='28']"));
+    }
 };