diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 09:05:16 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 09:05:16 +0200 |
| commit | 28bf8e238e35a7bbba81f86e63cd0a49226673a4 (patch) | |
| tree | 89ff4ed112569dc440d2ce4df477d371ddeb4776 /src/modules/px4iofirmware/controls.c | |
| parent | 1a4bf307cdc4157736d827046fe2164782609311 (diff) | |
| parent | d90345a16619a6a056ca9158961db36787d97678 (diff) | |
| download | px4-firmware-28bf8e238e35a7bbba81f86e63cd0a49226673a4.tar.gz px4-firmware-28bf8e238e35a7bbba81f86e63cd0a49226673a4.tar.bz2 px4-firmware-28bf8e238e35a7bbba81f86e63cd0a49226673a4.zip | |
Merge branch 'master' of github.com:PX4/Firmware into vector_control
Diffstat (limited to 'src/modules/px4iofirmware/controls.c')
| -rw-r--r-- | src/modules/px4iofirmware/controls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c index 43d96fb06..fbd82a4c6 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; } } |