From 52d3a3584c7c14b46e24a29a006c7ec31448ab23 Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Thu, 4 Mar 2021 16:50:22 +0100
Subject: [PATCH] Separate D and CD/FF adjustments, osd elements

---
 _locales/en/messages.json | 100 +++++++++++++++++++++-----------------
 tabs/adjustments.html     |   4 ++
 tabs/osd.js               |   6 +--
 3 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2d69cc6e..5881ab3f 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1284,138 +1284,150 @@
         "message": "Pitch & Roll I Adjustment"
     },
     "adjustmentsFunction8": {
-        "message": "Pitch & Roll D/FF Adjustment"
+        "message": "Pitch & Roll D"
     },
     "adjustmentsFunction9": {
-        "message": "Yaw P Adjustment"
+        "message": "Pitch & Roll CD/FF Adjustment"
     },
     "adjustmentsFunction10": {
-        "message": "Yaw I Adjustment"
+        "message": "Pitch P Adjustment"
     },
     "adjustmentsFunction11": {
-        "message": "Yaw D/FF Adjustment"
+        "message": "Pitch I Adjustment"
     },
     "adjustmentsFunction12": {
-        "message": "Rate Profile Selection"
+        "message": "Pitch D Adjustment"
     },
     "adjustmentsFunction13": {
-        "message": "Pitch Rate"
+        "message": "Pitch CD/FF Adjustment"
     },
     "adjustmentsFunction14": {
-        "message": "Roll Rate"
+        "message": "Roll P Adjustment"
     },
     "adjustmentsFunction15": {
-        "message": "Pitch P Adjustment"
+        "message": "Roll I Adjustment"
     },
     "adjustmentsFunction16": {
-        "message": "Pitch I Adjustment"
+        "message": "Roll D Adjustment"
     },
     "adjustmentsFunction17": {
-        "message": "Pitch D/FF Adjustment"
+        "message": "Roll CD/FF Adjustment"
     },
     "adjustmentsFunction18": {
-        "message": "Roll P Adjustment"
+        "message": "Yaw P Adjustment"
     },
     "adjustmentsFunction19": {
-        "message": "Roll I Adjustment"
+        "message": "Yaw I Adjustment"
     },
     "adjustmentsFunction20": {
-        "message": "Roll D/FF Adjustment"
+        "message": "Yaw D Adjustment"
     },
     "adjustmentsFunction21": {
-        "message": "RC Yaw Expo Adjustment"
+        "message": "Yaw CD/FF Adjustment"
     },
     "adjustmentsFunction22": {
-        "message": "Manual RC Expo Adjustment"
+        "message": "Rate Profile Selection"
     },
     "adjustmentsFunction23": {
-        "message": "Manual RC Yaw Expo Adjustment"
+        "message": "Pitch Rate"
     },
     "adjustmentsFunction24": {
-        "message": "Manual Pitch & Roll Rate Adjustment"
+        "message": "Roll Rate"
     },
     "adjustmentsFunction25": {
-        "message": "Manual Roll Rate Adjustment"
+        "message": "RC Yaw Expo Adjustment"
     },
     "adjustmentsFunction26": {
-        "message": "Manual Pitch Rate Adjustment"
+        "message": "Manual RC Expo Adjustment"
     },
     "adjustmentsFunction27": {
-        "message": "Manual Yaw Rate Adjustment"
+        "message": "Manual RC Yaw Expo Adjustment"
     },
     "adjustmentsFunction28": {
-        "message": "Navigation FW Cruise Throttle Adjustment"
+        "message": "Manual Pitch & Roll Rate Adjustment"
     },
     "adjustmentsFunction29": {
-        "message": "Navigation FW Pitch To Throttle Adjustment"
+        "message": "Manual Roll Rate Adjustment"
     },
     "adjustmentsFunction30": {
-        "message": "Board Roll Alignment Adjustment"
+        "message": "Manual Pitch Rate Adjustment"
     },
     "adjustmentsFunction31": {
-        "message": "Board Pitch Alignment Adjustment"
+        "message": "Manual Yaw Rate Adjustment"
     },
     "adjustmentsFunction32": {
-        "message": "Level P Adjustment"
+        "message": "Navigation FW Cruise Throttle Adjustment"
     },
     "adjustmentsFunction33": {
-        "message": "Level I Adjustment"
+        "message": "Navigation FW Pitch To Throttle Adjustment"
     },
     "adjustmentsFunction34": {
-        "message": "Level D Adjustment"
+        "message": "Board Roll Alignment Adjustment"
     },
     "adjustmentsFunction35": {
-        "message": "Pos XY P Adjustment"
+        "message": "Board Pitch Alignment Adjustment"
     },
     "adjustmentsFunction36": {
-        "message": "Pos XY I Adjustment"
+        "message": "Level P Adjustment"
     },
     "adjustmentsFunction37": {
-        "message": "Pos XY D Adjustment"
+        "message": "Level I Adjustment"
     },
     "adjustmentsFunction38": {
-        "message": "Pos Z P Adjustment"
+        "message": "Level D Adjustment"
     },
     "adjustmentsFunction39": {
-        "message": "Pos Z I Adjustment"
+        "message": "Pos XY P Adjustment"
     },
     "adjustmentsFunction40": {
-        "message": "Pos Z D Adjustment"
+        "message": "Pos XY I Adjustment"
     },
     "adjustmentsFunction41": {
-        "message": "Heading P Adjustment"
+        "message": "Pos XY D Adjustment"
     },
     "adjustmentsFunction42": {
-        "message": "Vel XY P Adjustment"
+        "message": "Pos Z P Adjustment"
     },
     "adjustmentsFunction43": {
-        "message": "Vel XY I Adjustment"
+        "message": "Pos Z I Adjustment"
     },
     "adjustmentsFunction44": {
-        "message": "Vel XY D Adjustment"
+        "message": "Pos Z D Adjustment"
     },
     "adjustmentsFunction45": {
-        "message": "Vel Z P Adjustment"
+        "message": "Heading P Adjustment"
     },
     "adjustmentsFunction46": {
-        "message": "Vel Z I Adjustment"
+        "message": "Vel XY P Adjustment"
     },
     "adjustmentsFunction47": {
-        "message": "Vel Z D Adjustment"
+        "message": "Vel XY I Adjustment"
     },
     "adjustmentsFunction48": {
-        "message": "FW min thr down pitch angle Adjustment"
+        "message": "Vel XY D Adjustment"
     },
     "adjustmentsFunction49": {
-        "message": "VTX power level Adjustment"
+        "message": "Vel Z P Adjustment"
     },
     "adjustmentsFunction50": {
-        "message": "Thrust PID Attenuation (TPA) Adjustment"
+        "message": "Vel Z I Adjustment"
     },
     "adjustmentsFunction51": {
-        "message": "TPA Breakpoint Adjustment"
+        "message": "Vel Z D Adjustment"
     },
     "adjustmentsFunction52": {
+        "message": "FW min thr down pitch angle Adjustment"
+    },
+    "adjustmentsFunction53": {
+        "message": "VTX power level Adjustment"
+    },
+    "adjustmentsFunction54": {
+        "message": "Thrust PID Attenuation (TPA) Adjustment"
+    },
+    "adjustmentsFunction55": {
+        "message": "TPA Breakpoint Adjustment"
+    },
+    "adjustmentsFunction56": {
         "message": "Control Smoothness Adjustment"
     },
     "adjustmentsSave": {
diff --git a/tabs/adjustments.html b/tabs/adjustments.html
index 01798e28..a50ffc6c 100644
--- a/tabs/adjustments.html
+++ b/tabs/adjustments.html
@@ -117,6 +117,10 @@
                         <option value="50" i18n="adjustmentsFunction50"></option>
                         <option value="51" i18n="adjustmentsFunction51"></option>
                         <option value="52" i18n="adjustmentsFunction52"></option>
+                        <option value="53" i18n="adjustmentsFunction53"></option>
+                        <option value="54" i18n="adjustmentsFunction54"></option>
+                        <option value="55" i18n="adjustmentsFunction55"></option>
+                        <option value="56" i18n="adjustmentsFunction56"></option>
                 </select></td>
                 <td class="adjustmentSlot"><select class="slot">
                         <option value="0" i18n="adjustmentsSlot0"></option>
diff --git a/tabs/osd.js b/tabs/osd.js
index a1146c1d..233da04c 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1425,17 +1425,17 @@ OSD.constants = {
                 {
                     name: 'ROLL_PIDS',
                     id: 16,
-                    preview: 'ROL  40  30  23'
+                    preview: 'ROL  40  30  20  23'
                 },
                 {
                     name: 'PITCH_PIDS',
                     id: 17,
-                    preview: 'PIT  40  30  23'
+                    preview: 'ROL  40  30  20  23'
                 },
                 {
                     name: 'YAW_PIDS',
                     id: 18,
-                    preview: 'YAW  85  45   0'
+                    preview: 'YAW  85  45   0  20'
                 },
                 {
                     name: 'LEVEL_PIDS',