aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: set in_arm_motors to false on all arm failure returns

Browse Source 
otherwise if the user fails to arm due to interlock or emergency stop
then they won't be able to try to arm again until they reboot
This commit is contained in:
Andrew Tridgell 2015-09-02 09:11:59 +10:00
parent 64a8e66dd7
commit 00da3ccc49
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/motors.cpp
View File

@ -198,6 +198,7 @@ bool Copter::init_arm_motors(bool arming_from_gcs)
if (ap.using_interlock && motors.get_interlock()){
gcs_send_text_P(MAV_SEVERITY_CRITICAL,PSTR("Arm: Motor Interlock Enabled"));
AP_Notify::flags.armed = false;
in_arm_motors = false;
return false;
}
@ -209,6 +210,7 @@ bool Copter::init_arm_motors(bool arming_from_gcs)
} else if (check_if_auxsw_mode_used(AUXSW_MOTOR_ESTOP) && ap.motor_emergency_stop){
gcs_send_text_P(MAV_SEVERITY_CRITICAL,PSTR("Arm: Motor Emergency Stopped"));
AP_Notify::flags.armed = false;
in_arm_motors = false;
return false;
}