Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: allow forcing disarm via mavlink using magic number

Browse Source 
Based on change by Jon Challinger but using new is_equal function
This commit is contained in:
Randy Mackay 2015-05-22 16:46:16 +09:00
parent 4486ddc53e
commit 15fe925974
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/GCS_Mavlink.pde
View File

@ -1223,7 +1223,7 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
if (init_arm_motors(true)) { if (init_arm_motors(true)) {
result = MAV_RESULT_ACCEPTED; result = MAV_RESULT_ACCEPTED;
} }
} else if (is_zero(packet.param1) && (mode_has_manual_throttle(control_mode) || ap.land_complete)) { } else if (is_zero(packet.param1) && (mode_has_manual_throttle(control_mode) || ap.land_complete || is_equal(packet.param2,21196.0f))) {
init_disarm_motors(); init_disarm_motors();
result = MAV_RESULT_ACCEPTED; result = MAV_RESULT_ACCEPTED;
} else { } else {