diff options
author | Roman Bapst <romanbapst@yahoo.de> | 2015-04-10 17:34:38 +0200 |
---|---|---|
committer | tumbili <bapstr@ethz.ch> | 2015-04-10 20:26:38 +0200 |
commit | 555e96a37a79a381dd6aeacf0e99cf6621df1018 (patch) | |
tree | 8e94e8d1e309254301f2a374ce4af48422105e68 /src/systemcmds | |
parent | 2d985dbed315ad621f5c586adca47a4c6f19d016 (diff) | |
download | px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.tar.gz px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.tar.bz2 px4-firmware-555e96a37a79a381dd6aeacf0e99cf6621df1018.zip |
fixed publication of mixer limit flags
Diffstat (limited to 'src/systemcmds')
-rw-r--r-- | src/systemcmds/tests/test_mixer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index 64e734b00..19aa05970 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -202,7 +202,7 @@ int test_mixer(int argc, char *argv[]) while (hrt_elapsed_time(&starttime) < INIT_TIME_US + RAMP_TIME_US) { /* mix */ - mixed = mixer_group.mix(&outputs[0], output_max); + mixed = mixer_group.mix(&outputs[0], output_max, NULL); 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); @@ -248,7 +248,7 @@ int test_mixer(int argc, char *argv[]) } /* mix */ - mixed = mixer_group.mix(&outputs[0], output_max); + mixed = mixer_group.mix(&outputs[0], output_max, NULL); 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); @@ -275,7 +275,7 @@ int test_mixer(int argc, char *argv[]) while (hrt_elapsed_time(&starttime) < 600000) { /* mix */ - mixed = mixer_group.mix(&outputs[0], output_max); + mixed = mixer_group.mix(&outputs[0], output_max, NULL); 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); @@ -311,7 +311,7 @@ int test_mixer(int argc, char *argv[]) while (hrt_elapsed_time(&starttime) < 600000 + RAMP_TIME_US) { /* mix */ - mixed = mixer_group.mix(&outputs[0], output_max); + mixed = mixer_group.mix(&outputs[0], output_max, NULL); 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); |