Adding more Nav settings

Woga65 · Oct 23, 2022 · 1cd591c · 1cd591c
1 parent 566b25d
commit 1cd591c
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 1 deletion.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -2994,9 +2994,39 @@
     "waypointConfiguration": {
         "message": "Waypoint Navigation Settings"
     },
+    "wpLoadBoot": {
+        "message": "Load Waypoints on Boot"
+    },
+    "wpLoadBootHelp": {
+        "message": "If enabled, Waypoint Missions in EEPROM will be loaded automatically after bootup."
+    },
+    "wpEnforceAlt": {
+        "message": "Enforce Altitude at Waypoint"
+    },
+    "wpEnforceAltHelp": {
+        "message": "Ensures that the altitude at each waypoint is reached before continue to the next one. Craft will hold position [loiter for fixed wing] and climb/decent until the altitude is within the set range [1-2000 cm] from the waypoint altitude. Set to [0] to disable. Fixed wing crafts should not be set below 500cm."
+    },
     "waypointRadius": {
         "message": "Waypoint radius"
     },
+    "wpRestartMission": {
+        "message": "Restart Waypoint Mission"
+    },
+    "wpRestartMissionHelp": {
+        "message": "Sets restart behaviour for a WP mission when interrupted mid mission. START from first WP, RESUME from last active WP or SWITCH between START and RESUME each time WP Mode is reselected ON. SWITCH effectively allows resuming once only from a previous mid mission waypoint after which the mission will restart from the first waypoint."
+    },
+    "wpTurnSmoothing": {
+        "message": "Waypoint Turn Smoothing"
+    },
+    "wpTurnSmoothingHelp": {
+        "message": "Smooths turns during WP missions by switching to a loiter turn at waypoints. When set to ON the craft will reach the waypoint during the turn. When set to ON-CUT the craft will turn inside the waypoint without actually reaching it (cuts the corner)."
+    },
+    "navMotorStop": {
+        "message": "Navigation Motor Stop Override"
+    },
+    "navMotorStopHelp": {
+        "message": "When set to OFF the navigation system will not take over the control of the motor if the throttle is low (motor will stop). When set to OFF_ALWAYS the navigation system will not take over the control of the motor if the throttle was low even when failsafe is triggered. When set to AUTO_ONLY the navigation system will only take over the control of the throttle in autonomous navigation modes (NAV WP and NAV RTH). When set to ALL_NAV (default) the navigation system will take over the control of the motor completely and never allow the motor to stop even when the throttle is low. This setting only has an effect on NAV modes which take control of the throttle when combined with MOTOR_STOP and is likely to cause a stall if fw_min_throttle_down_pitch isn't set correctly or the pitch estimation is wrong for fixed wing models when not set to ALL_NAV."
+    },
     "waypointRadiusHelp": {
         "message": "This sets the distance away from a waypoint that triggers the waypoint as reached."
     },

diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
@@ -136,6 +136,12 @@
                             <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label>
                             <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
                         </div>
+
+                        <div class="select">
+                            <select id="navMotorStop" data-setting="nav_overrides_motor_stop"></select>
+                            <label for="navMotorStop"><span data-i18n="navMotorStop"></span></label>
+                            <div for="navMotorStop" class="helpicon cf_tip" data-i18n_title="navMotorStopHelp"></div>
+                        </div>
 
                         <div class="number">
                             <input id="pitchToThrottleSmoothing" type="number" data-setting="nav_fw_pitch2thr_smoothing" data-setting-multiplier="1" step="0" min="0" max="9" />
@@ -174,10 +180,16 @@
                         </div>
 
                         <div class="number">
-                            <input type="number" id="wpTrackingAngle" data-setting="nav_fw_wp_tracking_max_angle" data-setting-multiplier="1" step="1" min="30" max="80" />
+                            <input type="number" id="wpTrackingAngle" data-unit="deg" data-setting="nav_fw_wp_tracking_max_angle" data-setting-multiplier="1" step="1" min="30" max="80" />
                             <label for="wpTrackingAngle"><span data-i18n="wpTrackingAngle"></span></label>
                             <div for="wpTrackingAngle" class="helpicon cf_tip" data-i18n_title="wpTrackingAngleHelp"></div>
                         </div>
+
+                        <div class="select">
+                            <select id="wpTurnSmoothing" data-setting="nav_fw_wp_turn_smoothing"></select>
+                            <label for="wpTurnSmoothing"><span data-i18n="wpTurnSmoothing"></span></label>
+                            <div for="wpTurnSmoothing" class="helpicon cf_tip" data-i18n_title="wpTurnSmoothingHelp"></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" />
@@ -420,6 +432,7 @@
                             <label for="navAutoClimbRate"><span data-i18n="navAutoClimbRate"></span></label>
                             <div for="navAutoClimbRate" class="helpicon cf_tip" data-i18n_title="navAutoClimbRateHelp"></div>
                         </div>
+
                     </div>
                 </div>
 
@@ -441,6 +454,24 @@
                             <div for="waypointSafeDistance" class="helpicon cf_tip" data-i18n_title="waypointSafeDistanceHelp"></div>
                         </div>
 
+                        <div class="checkbox">
+                            <input type="checkbox" class="toggle update_preview" id="wpLoadBoot" data-setting="nav_wp_load_on_boot" data-live="true" />
+                            <label for="wpLoadBoot"><span data-i18n="wpLoadBoot"></span></label>
+                            <div for="wpLoadBoot" class="helpicon cf_tip" data-i18n_title="wpLoadBootHelp"></div>
+                        </div>
+
+                        <div class="number">
+                            <input type="number" id="wpEnforceAlt" data-unit="cm" data-setting="nav_wp_enforce_altitude" data-setting-multiplier="1" step="1" min="0" max="2000" />
+                            <label for="wpEnforceAlt"><span data-i18n="wpEnforceAlt"></span></label>
+                            <div for="wpEnforceAlt" class="helpicon cf_tip" data-i18n_title="wpEnforceAltHelp"></div>
+                        </div>
+
+                        <div class="select">
+                            <select id="wpRestartMission" data-setting="nav_wp_mission_restart"></select>
+                            <label for="wpRestartMission"><span data-i18n="wpRestartMission"></span></label>
+                            <div for="wpRestartMission" class="helpicon cf_tip" data-i18n_title="wpRestartMissionHelp"></div>
+                        </div>
+
                     </div>
                 </div>