diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 22:53:42 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 22:53:42 +0200 |
commit | aebdd6e05969e415db2f7f939229163dddc35f23 (patch) | |
tree | 874008b07d83ed81acb09cfa1015d8a60e87a821 /src/modules/px4iofirmware/controls.c | |
parent | 27d0885453711a3d3ab6abf3cf227afc837e14bd (diff) | |
parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
download | px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.gz px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.bz2 px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.zip |
Merged master
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; } } |