Skip to content

Commit 1a0e24a

Browse files
IamPete1peterbarker
authored andcommitted
AP_Arming: arm_check: always check for estop
1 parent 4368788 commit 1a0e24a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

libraries/AP_Arming/AP_Arming.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,6 +1777,13 @@ bool AP_Arming::arm_checks(AP_Arming::Method method)
17771777
}
17781778
#endif
17791779

1780+
// Run estop check again, here in the arm checks there is no need
1781+
// bypass the check if arm emergency stop aux function is setup
1782+
if (SRV_Channels::get_emergency_stop()) {
1783+
check_failed(true, "Motors Emergency Stopped");
1784+
return false;
1785+
}
1786+
17801787
// ensure the GPS drivers are ready on any final changes
17811788
if (check_enabled(Check::GPS_CONFIG)) {
17821789
if (!AP::gps().prepare_for_arming()) {

0 commit comments

Comments
 (0)