aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-10-11 10:19:50 +0200
committerJulian Oes <julian@oes.ch>2013-10-11 10:19:50 +0200
commit3dc2bdfa22f0ac152392299628e037e3a6120c2e (patch)
tree485da7855cc87bb73b355503053c131734d98b95 /src/modules/px4iofirmware
parente2fef6b374e14f8c0f383557cf3569f8265ba034 (diff)
downloadpx4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.tar.gz
px4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.tar.bz2
px4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.zip
Changed pwm_limit interface a bit
Diffstat (limited to 'src/modules/px4iofirmware')
-rw-r--r--src/modules/px4iofirmware/mixer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp
index 5232f9b96..05897b4ce 100644
--- a/src/modules/px4iofirmware/mixer.cpp
+++ b/src/modules/px4iofirmware/mixer.cpp
@@ -197,9 +197,7 @@ mixer_tick(void)
/* mix */
mixed = mixer_group.mix(&outputs[0], PX4IO_SERVO_COUNT);
- pwm_limit.nchannels = mixed;
-
- pwm_limit_calc(should_arm, r_page_servo_disarmed, r_page_servo_control_min, r_page_servo_control_max, outputs, r_page_servos, &pwm_limit);
+ pwm_limit_calc(should_arm, mixed, r_page_servo_disarmed, r_page_servo_control_min, r_page_servo_control_max, outputs, r_page_servos, &pwm_limit);
for (unsigned i = mixed; i < PX4IO_SERVO_COUNT; i++)
r_page_servos[i] = 0;