fix build errors

Hwurzburg · Hwurzburg · commit 536aff7c20b5 · 2026-03-09T09:25:47.000-05:00
diff --git a/common/source/docs/common-acns-cm4pilot.rst b/common/source/docs/common-acns-cm4pilot.rst
@@ -137,5 +137,5 @@ This board does not come with ArduPilot firmware pre-installed. Use instructions
 Firmware for this board can be found `here <https://firmware.ardupilot.org>`_ in  sub-folders labeled
 "ACNS-CM4Pilot".
 
-[copywiki destination="plane,copter,rover,blimp"]
+[copywiki destination="plane,copter,rover,blimp,sub"]
 
diff --git a/common/source/docs/common-autopilots.rst b/common/source/docs/common-autopilots.rst
@@ -235,7 +235,6 @@ Closed Hardware
     StellarF4V2 <common-stellarf4v2>
     StellarH7V2 <common-stellarh7v2>
     SVehicle E2 <https://github.com/ArduPilot/ardupilot/blob/master/libraries/AP_HAL_ChibiOS/hwdef/SVehicle-E2/README.md>
-    StellarF4V2 <common-stellarf4v2>
     TBS Lucid H7 <common-tbs-lucidh7>
     TBS Lucid H7 Wing <common-tbs-lucid-h7-wing>
     TBS Lucid H7 Wing AIO <https://github.com/ArduPilot/ardupilot/blob/master/libraries/AP_HAL_ChibiOS/hwdef/TBS_LUCID_H7_WING_AIO/README.md>
diff --git a/common/source/docs/common-auxiliary-functions.rst b/common/source/docs/common-auxiliary-functions.rst
@@ -442,6 +442,7 @@ Other functions are:
                                          | Disarms the vehicle if brought low.
    ===================================== =======================================================================
 
+
    ===================================== =======================================================================
     Option                                Description
    ===================================== =======================================================================
@@ -608,7 +609,6 @@ Other functions are:
     ICEngine start / stop                 Controls ICE engine starter output :ref:`ICE engines<common-ice>`
     Autotune_test_gains                   After autotune,allows selecting tune(high) or pretune gains
     VTOL QuickTune                        Autotunes QuadPlane VTOL PIDs, see :ref:`quicktune`
-<<<<<<< HEAD
     Mount RP Lock                        | In RC targeting mode, if gimbal is capable and ANGLE RC targeting is
                                          | used instead of RATE, the roll and or pitch axes
                                          | which normally are assumed to stabilize in earth frame at the target
@@ -622,9 +622,7 @@ Other functions are:
                                          | has been captured, switches gimbal target mode back to mode before 
                                          | it was switched high, or does nothing otherwise. Low clears the POI
                                          | and switches to the default gimbal mode.
-=======
     AHRS AutoTrim                         Auto Trim for Copter, see :ref:`autotrim`
->>>>>>> 18cf4e488 (4.7:Copter_trim)
     ROLL Input                            ROLL input channel. (replaces RCMAP)
     PITCH Input                           PITCH input channel. (replaces RCMAP)
     THROTTLE Input                        THROTTLE input channel. (replaces RCMAP)
diff --git a/common/source/docs/common-positioning-landing-page.rst b/common/source/docs/common-positioning-landing-page.rst
@@ -38,13 +38,10 @@ GPS/Compass
     Holybro M9N GPS Module (DroneCAN) <https://holybro.com/collections/gps/products/dronecan-m9n-gps>
     Holybro M10 GPS Module <https://holybro.com/collections/gps/products/m10-gps>
     Holybro DroneCAN RM3100 Professional Grade Compass <https://holybro.com/products/dronecan-rm3100-compass>
-<<<<<<< HEAD
+    MakeFlyEasy POS3 DroneCAN GPS/Compass <common-mfe-pos3>
     Matek DroneCAN GNSS M10-L4-3100 <http://www.mateksys.com/?portfolio=m10-l4-3100>
     Matek DroneCAN GNSS M9N-G4-3100 <https://www.mateksys.com/?portfolio=m9n-g4-3100>
-=======
-    MakeFlyEasy POS3 DroneCAN GPS/Compass <common-mfe-pos3>
     Matek DroneCAN AP_Periph GNSS M10-L4-3100 <http://www.mateksys.com/?portfolio=m10-l4-3100>
->>>>>>> 8b0eaae58 (4.7:add MFE POS3 DroneCAN GPS)
     Matek SAM-M8Q <http://www.mateksys.com/?portfolio=sam-m8q>
     Matek M8Q-CAN/DroneCAN GPS+Compass+Baro+Airspeed I2C port <common-matek-m8q>
     mRo GPS, GPS+Compass,RTK, and DroneCAN modules <https://store.mrobotics.io/category-s/109.htm>
diff --git a/common/source/docs/common-rangefinder-landingpage.rst b/common/source/docs/common-rangefinder-landingpage.rst
@@ -103,11 +103,7 @@ Omnidirectional Proximity Rangefinders
 .. toctree::
     :maxdepth: 1
 
-<<<<<<< HEAD
     Hexsoon 77G MWW Radar <common-rangefinder-hexsoon-radar>
-=======
-    Hexsoon Radar <common-rangefinder-hexsoon-radar>
->>>>>>> 05e69c971 (4.7:Hexsoon Radar)
     LDRobot LD-06 TOF <common-ld06>
     Lightware SF40/C (360 degree) <common-lightware-sf40c-objectavoidance>
     Lightware SF45/B (350 degree) <common-lightware-sf45b>
diff --git a/copter/source/docs/auto-mode.rst b/copter/source/docs/auto-mode.rst
@@ -80,7 +80,7 @@ position which is the location where the copter was armed.
 
 As the copter touches down at the end of the mission the vehicle should automatically disarm but occasionally the vehicle may not sense the landing and the pilot may need to hold the throttle down and takeoff in another mode like Stabilize or Loiter and then manually disarm the vehicle.
 
-.. note:: for a NAV_LAND, the :ref:`LAND_SPEED<LAND_SPEED>` and the :ref:`LAND_SPEED_HIGH<LAND_SPEED_HIGH>` parameters affect descent speed just like in the :ref:`land-mode`. Unlike the LAND mode, the switch point altitude is set by the mission altitude parameter, will be 10m above that altitude in whatever reference frame being used for the altitude parameter. The :ref:`PILOT_THR_BHV<PILOT_THR_BHV>` option bit 1, when set, allows high throttle stick position to cancel the landing, and the mission will move to the next mission item, or just hover in place until the mode is changed or mission restarted. During landing the pilot can re-position the vehicle using the pitch and roll sticks to avoid obstacles.
+.. note:: for a NAV_LAND, the :ref:`LAND_SPD_MS<LAND_SPD_MS>` and the :ref:`LAND_SPD_HIGH_MS<LAND_SPD_HIGH_MS>` parameters affect descent speed just like in the :ref:`land-mode`. Unlike the LAND mode, the switch point altitude is set by the mission altitude parameter, will be 10m above that altitude in whatever reference frame being used for the altitude parameter. The :ref:`PILOT_THR_BHV<PILOT_THR_BHV>` option bit 1, when set, allows high throttle stick position to cancel the landing, and the mission will move to the next mission item, or just hover in place until the mode is changed or mission restarted. During landing the pilot can re-position the vehicle using the pitch and roll sticks to avoid obstacles.
 
 Tuning
 ======
diff --git a/copter/source/docs/ekf-inav-failsafe.rst b/copter/source/docs/ekf-inav-failsafe.rst
@@ -27,7 +27,7 @@ What will happen when the failsafe triggers?
 - The autopilot's `LED will flash red-yellow or blue-yellow and the tone-alarm will sound <https://www.youtube.com/watch?v=j-CMLrAwlco&feature=player_detailpage&t=60s>`__
 - "EKF variance" will appear on the ground station's HUD if telemetry is connected
 - In manual flight modes that do not require GPS (i.e. Stabilize, Acro, AltHold) nothing further will happen but the pilot will be unable to switch into autonomous flight modes (Loiter, PosHold, RTL, Guided, Auto) until the failure clears
-- In autonomous modes that require GPS (i.e. Loiter, PosHold, RTL, Guided, Auto, etc) the :ref:`FS_EKF_ACTION <FS_EKF_ACTION>` controls the behaviour.  By default this is "1" meaning the vehicle will switch to :ref:`Land <land-mode>` mode.  This is a "pilot controlled" land meaning the pilot will have control of the roll and pitch angle but the vehicle will descend at the :ref:`LAND_SPEED <LAND_SPEED>`.  It will land and finally disarm its motors. Other options are to report only ("0"), hover (ALTHOLD) ("2") or LAND ("3") even if in STABILIZE mode if the EKF failsafe occurs.
+- In autonomous modes that require GPS (i.e. Loiter, PosHold, RTL, Guided, Auto, etc) the :ref:`FS_EKF_ACTION <FS_EKF_ACTION>` controls the behaviour.  By default this is "1" meaning the vehicle will switch to :ref:`Land <land-mode>` mode.  This is a "pilot controlled" land meaning the pilot will have control of the roll and pitch angle but the vehicle will descend at the :ref:`LAND_SPD_MS <LAND_SPD_MS>`.  It will land and finally disarm its motors. Other options are to report only ("0"), hover (ALTHOLD) ("2") or LAND ("3") even if in STABILIZE mode if the EKF failsafe occurs.
 - An EKF failsafe error will be written to the dataflash logs
 
 After an EKF failsafe occurs, the pilot can re-take control (using the flight mode switch) in a manual flight mode such as :ref:`AltHold <altholdmode>` to bring the vehicle home.
diff --git a/plane/source/docs/automatic-flaps.rst b/plane/source/docs/automatic-flaps.rst
@@ -9,8 +9,8 @@ schedule and/or during autotakeoffs and landings. Simply put you can specify two
 
 Two modes of operation are available depending on whether bit 15 of the :ref:`FLIGHT_OPTIONS<FLIGHT_OPTIONS>` bit is set:
 
-:ref:`FLIGHT_OPTIONS<HT_OPTIONS>` bit "15" clear
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:ref:`FLIGHT_OPTIONS<FLIGHT_OPTIONS>` bit "15" clear
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 If your target speed (not your actual speed) is above the specified
 speeds then your flaps are set to the default (trim) position. If your
 target speed is lowered below the first flap speed, then flaps are
@@ -22,8 +22,8 @@ The target speed can be commanded by changing the value of cruise_speed
 in the parameter interface, by using the Do_Set_Speed command in a
 mission, or by the throttle stick position in FBW-B.
 
-:ref:`FLIGHT_OPTIONS<HT_OPTIONS>` bit 15 set
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:ref:`FLIGHT_OPTIONS<FLIGHT_OPTIONS>` bit 15 set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - In manual throttle modes actual airspeed (or estimate) is used for flaps activation
 - In auto-throttle modes the minimum of target airspeed and actual airspeed is used
 
diff --git a/plane/source/docs/flight-options.rst b/plane/source/docs/flight-options.rst
@@ -4,10 +4,8 @@
 Flight Options
 ==============
 
-
 :ref:`FLIGHT_OPTIONS<FLIGHT_OPTIONS>` is a bitmask that allows configuring several alterations to Plane's behavior.
 
-
 =====================================   ======================
 :ref:`FLIGHT_OPTIONS<FLIGHT_OPTIONS>`   Function
 =====================================   ======================
@@ -27,6 +25,7 @@ Flight Options
 14                                      In AUTO, climb to next waypoint altitude immediately instead of linear climb.
 15                                      Allows auto flap operation in manual modes as well as auto-throttle modes.
 16                                      Enable full aerodynamic load factor-based roll limits. This should be enabled when an accurate and well calibrated airspeed sensor is used to impose the correct FBW roll limits when the aircraft is turning. Requires an enabled airspeed sensor and AIRSPEED_STALL set. WARNING: If your airspeed sensor is very inaccurate or fails, having this enabled may result in almost no roll maneuverability in FBW modes.
+=====================================   ======================
 
 Default is no options enabled ("0"). Setting the bit will enable that function. For example, if forcing target airspeed in FBWB and CRUISE modes is desired, a value of "8" (bit 3 = 1) would be set.
 
diff --git a/rover/source/docs/rover-failsafes.rst b/rover/source/docs/rover-failsafes.rst
@@ -21,11 +21,8 @@ This failsafe is triggered if the connection between the user's transmitter and
   - RC_OVERRIDES are lost if :ref:`using a GCS only <common-gcs-only-operation>` is being used,
 
 - set :ref:`FS_THR_ENABLE <FS_THR_ENABLE>` to "1" to enable this failsafe
-<<<<<<< HEAD
 - if :ref:`FS_ACTION <FS_ACTION>` is "1", the vehicle will :ref:`RTL <rtl-mode>` to home, if "2" the vehicle will :ref:`Hold <hold-mode>`, if "3" or "4" the vehicle will attempt to use :ref:`SmartRTL <smartrtl-mode>` but if this mode cannot be engaged the vehicle will :ref:`RTL <rtl-mode>` or :ref:`Hold <hold-mode>` respectively. If "5", it will Disarm.
-=======
 - if :ref:`FS_ACTION <FS_ACTION>` is "1", the vehicle will :ref:`RTL <rtl-mode>` to home, if "2" the vehicle will :ref:`Hold <hold-mode>`, if "3" or "4" the vehicle will attempt to use :ref:`SmartRTL <smartrtl-mode>` but if this mode cannot be engaged the vehicle will :ref:`RTL <rtl-mode>` or :ref:`Hold <hold-mode>` respectively. If "5", it will Disarm. "6" will switch to :ref:`Loiter mode <loiter-mode>` if possible, else to :ref:`Hold mode <hold-mode>`. switch 
->>>>>>> 758a4d604 (4.7:Rover failsafe actions)
 - once the transmitter/receiver connection is restored, the user must use the transmitter's mode switch to re-take control of the vehicle in :ref:`Manual <manual-mode>` (or any other mode)
 
 Battery Failsafe
