aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware/controls.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-16 16:22:38 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-16 16:22:38 +0200
commit52d15ac7b1a90ededd0079ec17f0bc709947d7de (patch)
tree0773a9a9252d810c692fc0759feb1910ac801b89 /src/modules/px4iofirmware/controls.c
parent0dc240688dcae83e34f9001072ac151f4a3df140 (diff)
parent6113be111e84a57715f3f3bfe81077bf1b267e52 (diff)
downloadpx4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.tar.gz
px4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.tar.bz2
px4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.zip
Merged public master
Diffstat (limited to 'src/modules/px4iofirmware/controls.c')
-rw-r--r--src/modules/px4iofirmware/controls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c
index 74037d1c2..796c6cd9f 100644
--- a/src/modules/px4iofirmware/controls.c
+++ b/src/modules/px4iofirmware/controls.c
@@ -300,6 +300,8 @@ controls_tick() {
} else {
r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE;
}
+ } else {
+ r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE;
}
}