aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware/controls.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-05-16 09:12:13 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-05-21 09:14:22 +0200
commit0165034e496d0652f9dbb7d122d808cd6b483e60 (patch)
treea51ba225eee249ffbed4bdba8cc02587314c3512 /src/modules/px4iofirmware/controls.c
parentbc3eca5df3a980cfcc0cc6f03926e1c9f9c24a39 (diff)
downloadpx4-firmware-0165034e496d0652f9dbb7d122d808cd6b483e60.tar.gz
px4-firmware-0165034e496d0652f9dbb7d122d808cd6b483e60.tar.bz2
px4-firmware-0165034e496d0652f9dbb7d122d808cd6b483e60.zip
Hotfix: Changed alarms back to what they originally were designed for: Traps to later see if condition was once violated. Currente status can be read through the status flags
Diffstat (limited to 'src/modules/px4iofirmware/controls.c')
-rw-r--r--src/modules/px4iofirmware/controls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c
index dc36f6c93..3cf9ca149 100644
--- a/src/modules/px4iofirmware/controls.c
+++ b/src/modules/px4iofirmware/controls.c
@@ -217,9 +217,8 @@ controls_tick() {
if (assigned_channels == 0) {
rc_input_lost = true;
} else {
- /* set RC OK flag and clear RC lost alarm */
+ /* set RC OK flag */
r_status_flags |= PX4IO_P_STATUS_FLAGS_RC_OK;
- r_status_alarms &= ~PX4IO_P_STATUS_ALARMS_RC_LOST;
}
/*