Merge pull request #73 from PX4/io_arming

Made sure IO and FMU obey the lockdown flag when arming motors
This commit is contained in:
px4dev
2012-12-01 22:55:33 -08:00
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -499,7 +499,8 @@ PX4IO::io_send()
// XXX relays
cmd.arm_ok = _armed.armed;
/* armed and not locked down */
cmd.arm_ok = (_armed.armed && !_armed.lockdown);
ret = hx_stream_send(_io_stream, &cmd, sizeof(cmd));
if (ret)