fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 05:21:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commander: remove not disarming by RC message

Browse Source 
Refactoring the condition to be more clear.
This commit is contained in:
Matthias Grob
2019-09-23 12:42:33 +02:00
parent 41516fbd55
commit 4f44fde080
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+7 -7
View File
@@ -1978,14 +1978,14 @@ Commander::run()
(status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_ROTARY_WING || land_detector.landed) && (status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_ROTARY_WING || land_detector.landed) &&
(stick_in_lower_left || arm_button_pressed || arm_switch_to_disarm_transition)) { (stick_in_lower_left || arm_button_pressed || arm_switch_to_disarm_transition)) {
if (internal_state.main_state != commander_state_s::MAIN_STATE_MANUAL && const bool manual_thrust_mode = internal_state.main_state == commander_state_s::MAIN_STATE_MANUAL
internal_state.main_state != commander_state_s::MAIN_STATE_ACRO && || internal_state.main_state == commander_state_s::MAIN_STATE_ACRO
internal_state.main_state != commander_state_s::MAIN_STATE_STAB && || internal_state.main_state == commander_state_s::MAIN_STATE_STAB
internal_state.main_state != commander_state_s::MAIN_STATE_RATTITUDE && || internal_state.main_state == commander_state_s::MAIN_STATE_RATTITUDE;
!land_detector.landed) { const bool rc_wants_disarm = (stick_off_counter == rc_arm_hyst && stick_on_counter < rc_arm_hyst)
print_reject_arm("Not disarming! Not yet in manual mode or landed"); || arm_switch_to_disarm_transition;
} else if ((stick_off_counter == rc_arm_hyst && stick_on_counter < rc_arm_hyst) || arm_switch_to_disarm_transition) { if (rc_wants_disarm && (land_detector.landed || manual_thrust_mode)) {
arming_ret = arming_state_transition(&status, safety, vehicle_status_s::ARMING_STATE_STANDBY, &armed, arming_ret = arming_state_transition(&status, safety, vehicle_status_s::ARMING_STATE_STANDBY, &armed,
true /* fRunPreArmChecks */, true /* fRunPreArmChecks */,
&mavlink_log_pub, &status_flags, arm_requirements, hrt_elapsed_time(&commander_boot_timestamp)); &mavlink_log_pub, &status_flags, arm_requirements, hrt_elapsed_time(&commander_boot_timestamp));