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

Copter: using arming_failed as event

Browse Source
This commit is contained in:
Randy Mackay 2015-02-03 05:58:37 +09:00
parent 6cfd48d0c6
commit f00861d2f1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduCopter/motors.pde
View File

@ -63,7 +63,6 @@ static void arm_motors_check()
// Yaw is centered so reset arming counter // Yaw is centered so reset arming counter
}else{ }else{
AP_Notify::flags.arming_failed = false;
arming_counter = 0; arming_counter = 0;
} }
} }
@ -110,7 +109,7 @@ static bool init_arm_motors(bool arming_from_gcs)
// run pre-arm-checks and display failures // run pre-arm-checks and display failures
if(!pre_arm_checks(true) || !arm_checks(true, arming_from_gcs)) { if(!pre_arm_checks(true) || !arm_checks(true, arming_from_gcs)) {
AP_Notify::flags.arming_failed = true; AP_Notify::events.arming_failed = true;
in_arm_motors = false; in_arm_motors = false;
return false; return false;
} }