Browse Source

Copter: removed check on target component in arm

Thanks to DonLakeFlyer for finding this, see
https://github.com/diydrones/ardupilot/pull/909
mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
a345a9d993
  1. 22
      ArduCopter/GCS_Mavlink.pde

22
ArduCopter/GCS_Mavlink.pde

@ -1240,22 +1240,18 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
break; break;
case MAV_CMD_COMPONENT_ARM_DISARM: case MAV_CMD_COMPONENT_ARM_DISARM:
if (packet.target_component == MAV_COMP_ID_SYSTEM_CONTROL) { if (packet.param1 == 1.0f) {
if (packet.param1 == 1.0f) { // run pre_arm_checks and arm_checks and display failures
// run pre_arm_checks and arm_checks and display failures pre_arm_checks(true);
pre_arm_checks(true); if(ap.pre_arm_check && arm_checks(true)) {
if(ap.pre_arm_check && arm_checks(true)) { init_arm_motors();
init_arm_motors();
result = MAV_RESULT_ACCEPTED;
}else{
result = MAV_RESULT_UNSUPPORTED;
}
} else if (packet.param1 == 0.0f) {
init_disarm_motors();
result = MAV_RESULT_ACCEPTED; result = MAV_RESULT_ACCEPTED;
} else { }else{
result = MAV_RESULT_UNSUPPORTED; result = MAV_RESULT_UNSUPPORTED;
} }
} else if (packet.param1 == 0.0f) {
init_disarm_motors();
result = MAV_RESULT_ACCEPTED;
} else { } else {
result = MAV_RESULT_UNSUPPORTED; result = MAV_RESULT_UNSUPPORTED;
} }

Loading…
Cancel
Save