fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-29 11:34:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

UAVCAN: Incorporate manual loackdown

Browse Source 
This flag is triggered when the manual kill switch is activated. The motors
did not stop when the kill switch was engaged before adding this check.
This commit is contained in:
Michael Schaeuble 2017-02-27 11:44:40 +01:00 committed by Lorenz Meier
parent 12c7421be9
commit 3961c46d68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/uavcan/uavcan_main.cpp
View File

@ -991,7 +991,7 @@ int UavcanNode::run()
// Update the armed status and check that we're not locked down and motor
// test is not running
bool set_armed = _armed.armed && !_armed.lockdown && !_test_in_progress;
bool set_armed = _armed.armed && !_armed.lockdown && !_armed.manual_lockdown && !_test_in_progress;
arm_actuators(set_armed);
}