fix

ArduPilot · Nov 13, 2024 · 00bc683 · 00bc683
1 parent 62efeaf
commit 00bc683
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/common/source/docs/common-auxiliary-functions.rst b/common/source/docs/common-auxiliary-functions.rst
@@ -280,13 +280,17 @@ Supported Features
 +----------------------+----------------------------+----------+---------+---------+
 |        175           | Camera Lens                |    X     |    X    |    X    |
 +----------------------+----------------------------+----------+---------+---------+
+<<<<<<< HEAD
 |        176           | VTOL Fwd Throttle disable  |          |    X    |         |
 +----------------------+----------------------------+----------+---------+---------+
 |        177           | Mount LRF Enable           |    X     |    X    |    X    |
 +----------------------+----------------------------+----------+---------+---------+
+|        178           | FlightMode Pause/Resume    |    X     |         |         |
++----------------------+----------------------------+----------+---------+---------+
 |        180           | Autotune_test_gains        |    X     |    X    |         |
 +----------------------+----------------------------+----------+---------+---------+
 
+
 Intended as continuous PWM range control inputs:
 
 +----------------------+----------------------------+----------+---------+---------+
@@ -575,8 +579,10 @@ Other functions are:
                                          | approach phase of a VTOL landing, QLAND or QRTL modes.
     Camera Image Tracking                 Activate Camera Image Tracking (only supported by ViewPro camera gimbals)
     Camera Lens                           Select the active camera lens (only supported by ViewPro camera gimbals)
+<<<<<<< HEAD
     VTOL Fwd Throttle disable             Overrides use of forward throttle in VTOL modes
     Mount LRF Enable                      Enable(switch high) ranging updates
+    FlightMode Pause                      In Guided/Auto modes, pauses mission
     Autotune_test_gains                   After autotune,allows selecting tune(high) or pretune gains
     ROLL Input                            ROLL input channel. (replaces RCMAP)
     PITCH Input                           PITCH input channel. (replaces RCMAP)