From ed292a9649b4bcd5badc34a8388c10200c0fad1a Mon Sep 17 00:00:00 2001
From: Bruce Luckcuck <github@etracer.net>
Date: Wed, 7 Oct 2020 10:33:43 -0400
Subject: [PATCH] Add feedforward to OSD PID element preview Also change the
 element preview to use the default PIDs for the firmware version (as defined
 in the Configurator) so that the display is more representative of the actual
 values (and not display 20 for D on yaw!).

---
 src/js/tabs/osd.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js
index 8b333cda..78400f86 100644
--- a/src/js/tabs/osd.js
+++ b/src/js/tabs/osd.js
@@ -434,6 +434,19 @@ OSD.drawCameraFramePreview = function() {
     return cameraFrame;
 };
 
+OSD.formatPidsPreview = function(axis) {
+    const pidDefaults = FC.getPidDefaults();
+    const p = pidDefaults[axis * 5].toString().padStart(3);
+    const i = pidDefaults[axis * 5 + 1].toString().padStart(3);
+    const d = pidDefaults[axis * 5 + 2].toString().padStart(3);
+    const f = pidDefaults[axis * 5 + 4].toString().padStart(3);
+    if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+        return `${p} ${i} ${d}`;
+    } else {
+        return `${p} ${i} ${d} ${f}`;
+    }
+};
+
 OSD.loadDisplayFields = function() {
 
  // All display fields, from every version, do not remove elements, only add!
@@ -745,7 +758,7 @@ OSD.loadDisplayFields = function() {
             defaultPosition: 0x800 | (10 << 5) | 2, // 0x0800 | (y << 5) | x
             draw_order: 170,
             positionable: true,
-            preview: 'ROL  43  40  20',
+            preview: `ROL ${OSD.formatPidsPreview(0)}`,
         },
         PID_PITCH: {
             name: 'PID_PITCH',
@@ -754,7 +767,7 @@ OSD.loadDisplayFields = function() {
             defaultPosition: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x
             draw_order: 180,
             positionable: true,
-            preview: 'PIT  58  50  22',
+            preview: `PIT ${OSD.formatPidsPreview(1)}`,
         },
         PID_YAW: {
             name: 'PID_YAW',
@@ -763,7 +776,7 @@ OSD.loadDisplayFields = function() {
             defaultPosition: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x
             draw_order: 190,
             positionable: true,
-            preview: 'YAW  70  45  20',
+            preview: `YAW ${OSD.formatPidsPreview(2)}`,
         },
         POWER: {
             name: 'POWER',