diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-26 17:43:07 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-26 17:43:07 +0100 |
| commit | 4298f68fcd39aa9820f9b522c38869ff0eb8bb0a (patch) | |
| tree | e731190cee18e76563ca90f88540b84d62543164 /apps/drivers | |
| parent | dc72d467d4abe3d18bbf02091eb4eaddb4f491d2 (diff) | |
| download | px4-firmware-4298f68fcd39aa9820f9b522c38869ff0eb8bb0a.tar.gz px4-firmware-4298f68fcd39aa9820f9b522c38869ff0eb8bb0a.tar.bz2 px4-firmware-4298f68fcd39aa9820f9b522c38869ff0eb8bb0a.zip | |
IO does not arm in HIL mode
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index f2c87473c..bf23c3937 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -500,7 +500,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) |