aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware/controls.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-04-28 14:59:42 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-04-28 14:59:42 +0200
commitdc2c3cad3e8897d7ae299d41d16845000efe3c69 (patch)
tree0696c76a8a9f9f38feb2140f6c46a61a66bd7829 /src/modules/px4iofirmware/controls.c
parent0eafc2ade1dce974d5f7bdf05ca7678fa0b59ab0 (diff)
downloadpx4-firmware-dc2c3cad3e8897d7ae299d41d16845000efe3c69.tar.gz
px4-firmware-dc2c3cad3e8897d7ae299d41d16845000efe3c69.tar.bz2
px4-firmware-dc2c3cad3e8897d7ae299d41d16845000efe3c69.zip
Re-enabled mixer
Diffstat (limited to 'src/modules/px4iofirmware/controls.c')
-rw-r--r--src/modules/px4iofirmware/controls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c
index 25eeca3be..dc36f6c93 100644
--- a/src/modules/px4iofirmware/controls.c
+++ b/src/modules/px4iofirmware/controls.c
@@ -288,8 +288,8 @@ controls_tick() {
r_status_flags |= PX4IO_P_STATUS_FLAGS_OVERRIDE;
/* mix new RC input control values to servos */
- //if (dsm_updated || sbus_updated || ppm_updated)
- // mixer_tick();
+ if (dsm_updated || sbus_updated || ppm_updated)
+ mixer_tick();
} else {
r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE;