mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
ArduCopter: move estop pre-arm to AP_Arming and add exception
This commit is contained in:
parent
c36c042e71
commit
1f94fd69f9
@ -33,12 +33,6 @@ bool AP_Arming_Copter::run_pre_arm_checks(bool display_failure)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we are using motor Estop switch, it must not be in Estop position
|
|
||||||
if (SRV_Channels::get_emergency_stop()){
|
|
||||||
check_failed(display_failure, "Motor Emergency Stopped");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!disarm_switch_checks(display_failure)) {
|
if (!disarm_switch_checks(display_failure)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user