Skip to content

Commit 8f5ce11

Browse files
committed
treewide: fix up for ARMING_CHECK -> ARMING_SKIPCHK
Some non-obvious changes: * Remove picture of ARMING_CHECK Mission Planner editor, this could be replaced once the editor is fixed for the new parameter. * Remove dubious instructions and picture of disabling arming checks through a Raspberry Pi. The page is so old it may be time to remove it entirely.
1 parent 53b790b commit 8f5ce11

14 files changed

+22
-41
lines changed

common/source/docs/common-compassless.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ For configure EKF3 to always use GSF set :ref:`EK3_SRC1_YAW <EK3_SRC1_YAW>` = 8
3636
Operation
3737
---------
3838

39-
Currently, only Plane will arm if the :ref:`ARMING_CHECK<ARMING_CHECK>` for compass (or ALL) is enabled, when no compasses are enabled. Copter and QuadPlane will give an pre-arming failure. Three possible methods to arm Copter and QuadPlane are:
39+
Currently, only Plane will arm if the :ref:`ARMING_SKIPCHK<ARMING_SKIPCHK>` for compass isn't skipped, when no compasses are enabled. Copter and QuadPlane will give an pre-arming failure. Three possible methods to arm Copter and QuadPlane are:
4040

41-
#. Disable :ref:`ARMING_CHECK<ARMING_CHECK>` for Compass (keep the others!).
41+
#. Enable :ref:`ARMING_SKIPCHK<ARMING_SKIPCHK>` for Compass (don't skip any others!).
4242
#. Force arming from ground station.
4343
#. Before arming, but after GPS lock has been obtained and EKF origin has been set and is "using GPS", pick up the vehicle and walk around in a circle a few meters in diameter. This should allow the GSF to acquire yaw alignment and the message "EKF yaw alignment complete" would be sent to the ground station.
4444

common/source/docs/common-gcs-only-operation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Copter
4343
Copter has a few additional safety checks that must be accommodated in order to arm with no RC input.
4444

4545
- :ref:`FS_THR_ENABLE<FS_THR_ENABLE>` must be set to zero if no joystick is being used or you do not want a failsafe if the joystick fails or is disabled.
46-
- :ref:`ARMING_CHECK<ARMING_CHECK>` should not include bit 6 (RC check). A value of 65470 will include all other checks. It is not recommended that :ref:`ARMING_CHECK<ARMING_CHECK>` set for 0 (ARM immediately), since important system checks would be bypassed.
46+
- :ref:`ARMING_SKIPCHK<ARMING_SKIPCHK>` should include bit 6 (RC check). It is not recommended to turn on other bits since important system checks may be bypassed.
4747
- assuming that the :ref:`RCMAP_ROLL <RCMAP_ROLL>`, :ref:`RCMAP_PITCH <RCMAP_PITCH>`, :ref:`RCMAP_THROTTLE <RCMAP_THROTTLE>` and :ref:`RCMAP_YAW <RCMAP_YAW>` parameters are default, then the RC 1 thru 4 channels' maximum and minimum parameters must be changed slightly. This is because Copter checks to see that the RC calibration has been done. But since no RC is used in the system, this step will not have occurred. Therefore, to emulate that this has happened, the min and max values need to be changed from their defaults of 1100 and 1900, respectively. Values of 1101 and 1901, will do for the ``RCx_MIN`` and ``RCx_MAX`` for the roll,pitch, throttle, and yaw RC channels.
4848

4949
The vehicle can then be armed after the GPS has obtained lock and internal initializations have completed, either by joystick rudder arming (if enabled, see :ref:`ARMING_RUDDER<ARMING_RUDDER>` ) or arming command from the GCS.

common/source/docs/common-nooploop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Ensure that Copter is loaded onto the autopilot and connect with a Ground Statio
6565
- set :ref:`EK3_SRC1_VELZ <EK3_SRC1_VELZ>` to 0 ("None")
6666
- set :ref:`EK3_SRC1_YAW<EK3_SRC1_YAW>` to 1 ("Compass") since a compass must be used in conjunction with this device.
6767
- set :ref:`GPS1_TYPE <GPS1_TYPE>` to 0 to disable the GPS
68-
- set :ref:`ARMING_CHECK <ARMING_CHECK>` to -9 to disable the GPS arming check
68+
- set :ref:`ARMING_SKIPCHK <ARMING_SKIPCHK>` to 8 to disable the GPS arming check
6969
- set :ref:`SERIAL1_BAUD <SERIAL1_BAUD>` to 921 to set SERIAL1's baud rate to 921600
7070
- set :ref:`SERIAL1_PROTOCOL <SERIAL1_PROTOCOL>` to 13 to enable reading the IndoorLoiter2 protocol
7171
- set :ref:`BRD_SER1_RTSCTS <BRD_SER1_RTSCTS>` to 0 to ensure SERIAL1 does not use flow control, assuming it has this capability.

common/source/docs/common-pozyx.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Connect with a Ground Station and set the following parameters:
6262
- set :ref:`EK3_SRC1_VELZ <EK3_SRC1_VELZ>` to 0 (None)
6363
- set :ref:`EK3_SRC1_POSZ<EK3_SRC1_POSZ>` to 4 (Beacon)
6464
- set :ref:`EK3_SRC1_YAW<EK3_SRC1_YAW>` to 1 (Compass) since a compass is required for use with this device.
65-
- set :ref:`ARMING_CHECK <ARMING_CHECK>` to -9 to disable the GPS arming check
65+
- set :ref:`ARMING_SKIPCHK <ARMING_SKIPCHK>` to 8 to disable the GPS arming check
6666
- set :ref:`SERIAL1_BAUD <SERIAL1_BAUD>` to 115 to set SERIAL1 port's baud rate to 115200 (if using a different SERIAL port set its baud rate to 115, instead)
6767
- set :ref:`SERIAL1_PROTOCOL <SERIAL1_PROTOCOL>` to 13 (Beacon) to enable reading the IndoorLoiter2 protocol (If using a different port, set its protocol to 13 instead)
6868
- set :ref:`BRD_SER1_RTSCTS <BRD_SER1_RTSCTS>` to 0 to ensure telem1 does not use flow control (If using Telem2 set :ref:`BRD_SER2_RTSCTS <BRD_SER2_RTSCTS>` instead, not required if using a SERIAL port without flow control)

common/source/docs/common-prearm-safety-checks.rst

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ some can also be disabled if necessary.
1313
.. youtube:: gZ3H2eLmStI
1414
:width: 100%
1515

16-
.. warning:: Never disable the arming checks (ie :ref:`ARMING_CHECK<ARMING_CHECK>` not = "1", except for bench testing. Always resolve any prearm or arming failures BEFORE attempting to fly. Doing otherwise may result in the loss of the vehicle.
16+
.. warning:: Never disable arming checks (ie :ref:`ARMING_SKIPCHK<ARMING_SKIPCHK>` not = "0", except for bench testing. Always resolve any prearm or arming failures BEFORE attempting to fly. Doing otherwise may result in the loss of the vehicle.
1717

1818
Recognising which Pre-Arm Check has failed using the GCS
1919
========================================================
@@ -509,18 +509,6 @@ IF a rangefinder has been configured, a reporting error has occurred.
509509
Disabling the Pre-arm Safety Check
510510
==================================
511511

512-
.. warning:: Disabling pre-arm safety checks is not recommended. The cause of the pre-arm failure should be corrected before operation of the vehicle if at all possible. If you are confident that the pre-arm check failure is not a real problem, it is possible to disable a failing check.
512+
.. warning:: Disabling pre-arm safety checks is not recommended. The cause of the pre-arm failure should be corrected before operation of the vehicle if at all possible. If you are confident that the pre-arm check failure is not a real problem, it is possible to skip a failing check.
513513

514-
Arming checks can be individually disabled by setting the :ref:`ARMING_CHECK<ARMING_CHECK>` parameter to something other than 1. Setting to 0 completely removes all pre-arm checks. For example, setting to 4 only checks that the GPS has lock.
515-
516-
This can also be configured using Mission Planner:
517-
518-
.. image:: ../../../images/MP_PreArmCheckDisable.png
519-
:target: ../_images/MP_PreArmCheckDisable.png
520-
521-
522-
- Connecting your Autopilot to the Mission Planner
523-
- Go to Mission Planner's Config/Tuning >> Standard Params screen
524-
- set the Arming Check drop-down to "Disabled" or one of the "Skip"
525-
options which more effectively skips the item causing the failure.
526-
- Push the "Write Params" button
514+
Arming checks can be individually skipped by setting the :ref:`ARMING_SKIPCHK<ARMING_SKIPCHK>` parameter to something other than 0. For example, setting to 4 skips the checks that the GPS has lock. In extremely unusual circumstances, setting the parameter to -1 can be used to skip all current and future pre-arm checks (though mandatory checks still remain).

dev/source/docs/adding_simulated_devices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ You can test two virtual wheel encoders like this:
218218
param set WENC_POS_Y 0.075
219219
param set WENC2_TYPE 10
220220
param set WENC2_POS_Y -0.075
221-
param set ARMING_CHECK 60918 (to disable GPS checks)
221+
param set ARMING_SKIPCHK 8 (to disable GPS checks)
222222

223223
The restart SITL and right mouse button click on the map and select "Set Origin (with height)" and the vehicle should appear on the map. It may also be useful to enter "map set showsimpos 1" to make the vehicle's actual position visible.
224224

@@ -314,7 +314,7 @@ Enable EKF3, disable GPS and set Serial5 protocol to mavlink so as to accept vis
314314
param set VISO_TYPE 2
315315
param set SERIAL5_PROTOCOL 2
316316
param set GPS_TYPE 0 (optional)
317-
param set ARMING_CHECK 388598 (optional, to disable GPS checks)
317+
param set ARMING_SKIPCHK 8 (optional, to disable GPS checks)
318318
param fetch
319319

320320
Restart the simulation, attaching a simulated Vicon system to ``SERIAL5``:

dev/source/docs/raspberry-pi-via-mavlink.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,11 @@ RPi type:
130130
python3 mavproxy.py --master=/dev/serial0 --baudrate 921600 --aircraft MyCopter
131131
132132

133-
Once MAVProxy has started you should be able to type in the following
134-
command to display the ``ARMING_CHECK`` parameters value
133+
Once MAVProxy has started you should be able to use the following command to arm (ensure propellers are removed!):
135134

136135
::
137136

138-
param show ARMING_CHECK
139-
param set ARMING_CHECK 0
140-
arm throttle
141-
142-
.. figure:: ../images/RaspberryPi_ArmTestThroughPutty.png
143-
:target: ../_images/RaspberryPi_ArmTestThroughPutty.png
137+
arm throttle force
144138

145139
.. note::
146140

dev/source/docs/ros-cartographer-slam.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Connect to the flight controller with a ground station (i.e. Mission Planner) an
281281
- :ref:`EK3_SRC1_YAW <copter:EK3_SRC1_YAW>` = 6 to set yaw source to ExternalNAV
282282
- :ref:`GPS1_TYPE <GPS1_TYPE>` = 0 to disable the GPS
283283
- :ref:`VISO_TYPE <copter:VISO_TYPE>` = 1 to enable visual odometry
284-
- :ref:`ARMING_CHECK <copter:ARMING_CHECK>` = 388598 (optional, to disable GPS checks)
284+
- :ref:`ARMING_SKIPCHK <copter:ARMING_SKIPCHK>` = 8 (optional, to disable GPS checks)
285285

286286

287287
After changing any of the values above, reboot the flight controller.

dev/source/docs/ros2-cartographer-slam.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ If you'd like to get the information from Cartographer to go into ArduPilot's ex
6464
- :ref:`EK3_SRC1_VELZ <copter:EK3_SRC1_VELZ>` = 6 to set vertical velocity source to ExternalNAV
6565
- :ref:`EK3_SRC1_YAW <copter:EK3_SRC1_YAW>` = 6 to set yaw source to ExternalNAV
6666
- :ref:`VISO_TYPE <copter:VISO_TYPE>` = 1 to enable visual odometry
67-
- :ref:`ARMING_CHECK <copter:ARMING_CHECK>` = 388598 (optional, to disable GPS checks)
67+
- :ref:`ARMING_SKIPCHK <copter:ARMING_SKIPCHK>` = 8 (optional, to disable GPS checks)
6868

6969

7070
After changing the values above, reboot the flight controller.
-26.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)