diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
| commit | 7476b03543f879df5ea29d44be147ff4926f8216 (patch) | |
| tree | e1c056fa3e12b2c2c3ae601ae2835ac086b60338 /src/modules/px4iofirmware/controls.c | |
| parent | 39ae01dd07d53e3509826ae3737fc6a509adec34 (diff) | |
| parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
| download | px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.gz px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.bz2 px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.zip | |
Merge branch 'master' into new_state_machine_drton
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; } } |