From 86252e19e668931b74067f2423452b44f9483dc2 Mon Sep 17 00:00:00 2001 From: Mark Whitehorn Date: Wed, 9 Nov 2016 20:41:20 -0700 Subject: [PATCH] clean up other build targets --- .../navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp | 1 - src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp | 2 +- src/systemcmds/tests/test_mixer.cpp | 13 +++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp b/src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp index 1c60b93e45..c77aa6670d 100644 --- a/src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp +++ b/src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp @@ -370,7 +370,6 @@ void task_main(int argc, char *argv[]) disarmed_pwm, min_pwm, max_pwm, - trim_pwm, _outputs.output, pwm, &_pwm_limit); diff --git a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp index b0e48bc451..876480a833 100644 --- a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp +++ b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp @@ -439,7 +439,7 @@ void task_main(int argc, char *argv[]) // TODO FIXME: pre-armed seems broken pwm_limit_calc(_armed.armed, false/*_armed.prearmed*/, _outputs.noutputs, reverse_mask, - disarmed_pwm, min_pwm, max_pwm, trim_pwm, _outputs.output, pwm, &_pwm_limit); + disarmed_pwm, min_pwm, max_pwm, _outputs.output, pwm, &_pwm_limit); send_outputs_mavlink(pwm, 4); diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index f04d56fafc..3b2134525e 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -87,7 +87,6 @@ int test_mixer(int argc, char *argv[]) uint16_t r_page_servo_disarmed[output_max]; uint16_t r_page_servo_control_min[output_max]; uint16_t r_page_servo_control_max[output_max]; - uint16_t r_page_servo_control_trim[output_max]; uint16_t r_page_servos[output_max]; uint16_t servo_predicted[output_max]; int16_t reverse_pwm_mask = 0; @@ -201,7 +200,6 @@ int test_mixer(int argc, char *argv[]) r_page_servo_disarmed[i] = PWM_MOTOR_OFF; r_page_servo_control_min[i] = PWM_DEFAULT_MIN; r_page_servo_control_max[i] = PWM_DEFAULT_MAX; - r_page_servo_control_trim[i] = PWM_DEFAULT_TRIM; } //PX4_INFO("PRE-ARM TEST: DISABLING SAFETY"); @@ -211,7 +209,7 @@ int test_mixer(int argc, char *argv[]) mixed = mixer_group.mix(&outputs[0], output_max, NULL); pwm_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min, - r_page_servo_control_max, r_page_servo_control_trim, outputs, r_page_servos, &pwm_limit); + r_page_servo_control_max, outputs, r_page_servos, &pwm_limit); //warnx("mixed %d outputs (max %d), values:", mixed, output_max); for (unsigned i = 0; i < mixed; i++) { @@ -252,7 +250,7 @@ int test_mixer(int argc, char *argv[]) mixed = mixer_group.mix(&outputs[0], output_max, NULL); pwm_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min, - r_page_servo_control_max, r_page_servo_control_trim, outputs, r_page_servos, &pwm_limit); + r_page_servo_control_max, outputs, r_page_servos, &pwm_limit); //warnx("mixed %d outputs (max %d), values:", mixed, output_max); for (unsigned i = 0; i < mixed; i++) { @@ -290,14 +288,13 @@ int test_mixer(int argc, char *argv[]) r_page_servo_disarmed[i] = PWM_LOWEST_MIN; r_page_servo_control_min[i] = PWM_DEFAULT_MIN; r_page_servo_control_max[i] = PWM_DEFAULT_MAX; - r_page_servo_control_trim[i] = PWM_DEFAULT_TRIM; } /* mix */ mixed = mixer_group.mix(&outputs[0], output_max, NULL); pwm_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min, - r_page_servo_control_max, r_page_servo_control_trim, outputs, r_page_servos, &pwm_limit); + r_page_servo_control_max, outputs, r_page_servos, &pwm_limit); //fprintf(stderr, "mixed %d outputs (max %d)", mixed, output_max); @@ -325,7 +322,7 @@ int test_mixer(int argc, char *argv[]) mixed = mixer_group.mix(&outputs[0], output_max, NULL); pwm_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min, - r_page_servo_control_max, r_page_servo_control_trim, outputs, r_page_servos, &pwm_limit); + r_page_servo_control_max, outputs, r_page_servos, &pwm_limit); //warnx("mixed %d outputs (max %d), values:", mixed, output_max); for (unsigned i = 0; i < mixed; i++) { @@ -362,7 +359,7 @@ int test_mixer(int argc, char *argv[]) mixed = mixer_group.mix(&outputs[0], output_max, NULL); pwm_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min, - r_page_servo_control_max, r_page_servo_control_trim, outputs, r_page_servos, &pwm_limit); + r_page_servo_control_max, outputs, r_page_servos, &pwm_limit); //warnx("mixed %d outputs (max %d), values:", mixed, output_max); for (unsigned i = 0; i < mixed; i++) {