aboutsummaryrefslogtreecommitdiff
path: root/apps/px4io
diff options
context:
space:
mode:
authorJulian Oes <joes@student.ethz.ch>2012-11-08 09:26:37 -0800
committerJulian Oes <joes@student.ethz.ch>2012-11-08 09:26:37 -0800
commit52143d6a687ee5238a27d9afcba0a8d9703bac21 (patch)
tree1115e392877930a701963fecbb8a470e6f61fb06 /apps/px4io
parent6c3a340d6eb3c8cc450e27899309ee79dc1ee504 (diff)
downloadpx4-firmware-52143d6a687ee5238a27d9afcba0a8d9703bac21.tar.gz
px4-firmware-52143d6a687ee5238a27d9afcba0a8d9703bac21.tar.bz2
px4-firmware-52143d6a687ee5238a27d9afcba0a8d9703bac21.zip
Reverting commenting, that happened by accident
Diffstat (limited to 'apps/px4io')
-rw-r--r--apps/px4io/mixer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/px4io/mixer.c b/apps/px4io/mixer.c
index fa4b3eb25..6cf499c39 100644
--- a/apps/px4io/mixer.c
+++ b/apps/px4io/mixer.c
@@ -139,10 +139,10 @@ mixer_tick(void *arg)
system_state.fmu_data_received = false;
}
-// } else if (system_state.rc_channels > 0) {
-// /* we have control data from an R/C input */
-// control_count = system_state.rc_channels;
-// control_values = &system_state.rc_channel_data[0];
+ } else if (system_state.rc_channels > 0) {
+ /* we have control data from an R/C input */
+ control_count = system_state.rc_channels;
+ control_values = &system_state.rc_channel_data[0];
} else {
/* we have no control input */