From 3961c46d6834f2ccac29c52d5bff78de3fced8aa Mon Sep 17 00:00:00 2001 From: Michael Schaeuble Date: Mon, 27 Feb 2017 11:44:40 +0100 Subject: [PATCH] UAVCAN: Incorporate manual loackdown 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. --- src/modules/uavcan/uavcan_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp index 8c2eb81eee..204d8c79a3 100644 --- a/src/modules/uavcan/uavcan_main.cpp +++ b/src/modules/uavcan/uavcan_main.cpp @@ -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); }