From f4e34d5e863081d7d0f94394accfc7cc5a9de9c3 Mon Sep 17 00:00:00 2001
From: Darren Lines <darren@darrenlines.uk>
Date: Thu, 6 Oct 2022 20:42:36 +0100
Subject: [PATCH] Changes to fixed wing Advanced Tuning options

- Rearranged **Fixed Wing Navigation Settings** to a more logical order.
- Added setting for `fw_min_throttle_down_pitch`
---
 _locales/en/messages.json |  6 ++++++
 tabs/advanced_tuning.html | 35 ++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e3d2e7f57..a5fa7a00d 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2901,6 +2901,12 @@
     "pitchToThrottleHelp": {
         "message": "In navigation modes, each degree of climb will add this many units to the cruise throttle. Conversely, each degree of diving will substract from it."
     },
+    "minThrottleDownPitch": {
+        "message": "Min Throttle Down Pitch"
+    },
+    "minThrottleDownPitchHelp": {
+        "message": "Automatic pitch down angle when throttle is at 0 in angle mode. Progressively applied between cruise throttle and zero throttle."
+    },
     "pitchToThrottleSmoothing": {
         "message": "Throttle smoothing"
     },
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index e1a81a4c9..158410cde 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -104,16 +104,19 @@
                         <div class="spacer_box_title" data-i18n="fixedWingNavigationConfiguration"></div>
                     </div>
                     <div class="spacer_box">
+                        <div class="number">
+                            <input id="minThrottle" type="number" data-unit="us" data-setting="nav_fw_min_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
+                            <label for="minThrottle"><span data-i18n="minThrottle"></span></label>
+                        </div>
 
                         <div class="number">
-                            <input id="cruiseThrottle" type="number" data-unit="us" data-setting="nav_fw_cruise_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
-                            <label for="cruiseThrottle"><span data-i18n="cruiseThrottle"></span></label>
+                            <input id="maxThrottle" type="number" data-unit="us" data-setting="nav_fw_max_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
+                            <label for="maxThrottle"><span data-i18n="maxThrottle"></span></label>
                         </div>
 
                         <div class="number">
-                            <input id="pitchToThrottle" type="number" data-unit="us" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" />
-                            <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label>
-                            <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
+                            <input id="cruiseThrottle" type="number" data-unit="us" data-setting="nav_fw_cruise_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
+                            <label for="cruiseThrottle"><span data-i18n="cruiseThrottle"></span></label>
                         </div>
 
                         <div class="checkbox">
@@ -123,13 +126,15 @@
                         </div>
 
                         <div class="number">
-                            <input id="minThrottle" type="number" data-unit="us" data-setting="nav_fw_min_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
-                            <label for="minThrottle"><span data-i18n="minThrottle"></span></label>
+                            <input id="minThrottleDownPitch" type="number" data-unit="decideg" data-setting="fw_min_throttle_down_pitch" data-setting-multiplier="1" step="1" min="0" max="450" />
+                            <label for="minThrottleDownPitch"><span data-i18n="minThrottleDownPitch"></span></label>
+                            <div for="minThrottleDownPitch" class="helpicon cf_tip" data-i18n_title="minThrottleDownPitchHelp"></div>
                         </div>
 
                         <div class="number">
-                            <input id="maxThrottle" type="number" data-unit="us" data-setting="nav_fw_max_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
-                            <label for="maxThrottle"><span data-i18n="maxThrottle"></span></label>
+                            <input id="pitchToThrottle" type="number" data-unit="us" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" />
+                            <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label>
+                            <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
                         </div>
 
                         <div class="number">
@@ -144,12 +149,6 @@
                             <div for="pitchToThrottleThreshold" class="helpicon cf_tip" data-i18n_title="pitchToThrottleThresholdHelp"></div>
                         </div>
 
-                        <div class="number">
-                            <input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" />
-                            <label for="cruiseYawRate"><span data-i18n="cruiseYawRateLabel"></span></label>
-                            <div for="cruiseYawRate" class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div>
-                        </div>
-
                         <div class="number">
                             <input id="maxBankAngle" type="number" data-unit="deg" data-setting="nav_fw_bank_angle" data-setting-multiplier="1" step="1" min="5" max="80" />
                             <label for="maxBankAngle"><span data-i18n="maxBankAngle"></span></label>
@@ -168,6 +167,12 @@
                             <div for="maxDiveAngle" class="helpicon cf_tip" data-i18n_title="maxDiveAngleHelp"></div>
                         </div>
 
+                        <div class="number">
+                            <input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" />
+                            <label for="cruiseYawRate"><span data-i18n="cruiseYawRateLabel"></span></label>
+                            <div for="cruiseYawRate" class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div>
+                        </div>
+
                         <div class="number">
                             <input id="loiterRadius" type="number" data-unit="cm" data-setting="nav_fw_loiter_radius" data-setting-multiplier="1" step="1" min="0" max="30000" />
                             <label for="loiterRadius"><span data-i18n="loiterRadius"></span></label>