Skip to content

Commit acf8ac9

Browse files
Hwurzburgrmackay9
authored andcommitted
AP_Arming:expand metadata on ARMING_REQUIRE
Co-authored-by: Peter Barker <pb-gh@barker.dropbear.id.au>
1 parent 5894cb5 commit acf8ac9

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

libraries/AP_Arming/AP_Arming.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,10 @@ const AP_Param::GroupInfo AP_Arming::var_info[] = {
115115

116116
// @Param{Plane, Rover}: REQUIRE
117117
// @DisplayName: Require Arming Motors
118-
// @Description: Arming disabled until some requirements are met. If 0, there are no requirements (arm immediately). If 1, sends the minimum throttle PWM value to the throttle channel when disarmed. If 2, send 0 PWM (no signal) to throttle channel when disarmed. On planes with ICE enabled and the throttle while disarmed option set in ICE_OPTIONS, the motor will always get THR_MIN when disarmed. Arming will occur using either rudder stick arming (if enabled) or GCS command when all mandatory and ARMING_CHECK items are satisfied. Note, when setting this parameter to 0, a reboot is required to immediately arm the plane.
119-
// @Values{Plane}: 0:Disabled,1:minimum PWM when disarmed,2:0 PWM when disarmed
120-
// @Values{Rover}: 0:No,1:Yes,3:AutoArmOnce
118+
// @Description{Plane}: Arming disabled until some requirements are met. If 0, there are no requirements (arm immediately). If 1, sends the minimum throttle PWM value to the throttle channel when disarmed. If 2, send 0 PWM (no signal) to throttle channel when disarmed. On planes with ICE enabled and the throttle while disarmed option set in ICE_OPTIONS, the motor will always get THR_MIN when disarmed. Arming will be blocked until all mandatory and ARMING_CHECK items are satisfied; arming can then be accomplished via (eg.) rudder gesture or GCS command.
119+
// @Description{Rover}: Arming disabled until some requirements are met. If 0, there are no requirements (arm immediately). If 1, all checks specified by ARMING_CHECKS must pass before the vehicle can be armed (for example, via rudder stick or GCS command). If 3, Arm immediately once pre-arm/arm checks are satisfied, but only one time per boot up. Note that a reboot is NOT required when setting to 0 but IS require when setting to 3.
120+
// @Values{Plane}: 0:Disabled,1:Yes(minimum PWM when disarmed),2:Yes(0 PWM when disarmed)
121+
// @Values{Rover}: 0:No,1:Yes(minimum PWM when disarmed),3:No(AutoArmOnce after checks are passed)
121122
// @User: Advanced
122123
AP_GROUPINFO_FLAGS_FRAME("REQUIRE", 0, AP_Arming, require, float(Required::YES_MIN_PWM),
123124
AP_PARAM_FLAG_NO_SHIFT,

0 commit comments

Comments
 (0)