aboutsummaryrefslogtreecommitdiff
path: root/apps/px4io/controls.c
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2012-12-29 16:01:24 -0800
committerpx4dev <px4@purgatory.org>2012-12-29 16:01:24 -0800
commitd81edb09cf29dd36d50ce7a7bcf55631fecc470f (patch)
tree63cb30938794a69981782ff666b9e181c2b286da /apps/px4io/controls.c
parentf9520ee39d0e14bc67cce809375fb69de9a7f977 (diff)
downloadpx4-firmware-d81edb09cf29dd36d50ce7a7bcf55631fecc470f.tar.gz
px4-firmware-d81edb09cf29dd36d50ce7a7bcf55631fecc470f.tar.bz2
px4-firmware-d81edb09cf29dd36d50ce7a7bcf55631fecc470f.zip
whitespace/formatting
Diffstat (limited to 'apps/px4io/controls.c')
-rw-r--r--apps/px4io/controls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/px4io/controls.c b/apps/px4io/controls.c
index 3b3782918..43e811ab0 100644
--- a/apps/px4io/controls.c
+++ b/apps/px4io/controls.c
@@ -90,6 +90,7 @@ controls_main(void)
if (fds[0].revents & POLLIN)
locked |= dsm_input();
+
if (fds[1].revents & POLLIN)
locked |= sbus_input();
@@ -139,6 +140,7 @@ ppm_input(void)
/* PPM data exists, copy it */
system_state.rc_channels = ppm_decoded_channels;
+
for (unsigned i = 0; i < ppm_decoded_channels; i++)
system_state.rc_channel_data[i] = ppm_buffer[i];
@@ -150,5 +152,5 @@ ppm_input(void)
/* trigger an immediate report to the FMU */
system_state.fmu_report_due = true;
- }
+ }
}