aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2013-01-27 10:58:30 +1100
committerpx4dev <px4@purgatory.org>2013-01-26 16:20:34 -0800
commitc0a46c4b93d29a438a6207ce49589bddc026c900 (patch)
tree585793ff8447c412a68103cac2e4ea6e3496dc22
parent5ee52138c4ac5c807888e3973099fd0f9a29aa59 (diff)
downloadpx4-firmware-c0a46c4b93d29a438a6207ce49589bddc026c900.tar.gz
px4-firmware-c0a46c4b93d29a438a6207ce49589bddc026c900.tar.bz2
px4-firmware-c0a46c4b93d29a438a6207ce49589bddc026c900.zip
px4io: fixed logical vs bitwise typo
-rw-r--r--apps/px4io/controls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/px4io/controls.c b/apps/px4io/controls.c
index 4782dc742..8cd5235b7 100644
--- a/apps/px4io/controls.c
+++ b/apps/px4io/controls.c
@@ -275,7 +275,7 @@ controls_main(void)
r_status_flags |= PX4IO_P_STATUS_FLAGS_OVERRIDE;
/* mix new RC input control values to servos */
- if (dsm_updated | sbus_updated | ppm_updated)
+ if (dsm_updated || sbus_updated || ppm_updated)
mixer_tick();
} else {