fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 19:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean up other build targets

Browse Source
This commit is contained in:
Mark Whitehorn
2016-12-10 12:56:39 +01:00
committed by Lorenz Meier
parent f0b41a0e52
commit 86252e19e6
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp
-1
View File
@@ -370,7 +370,6 @@ void task_main(int argc, char *argv[])
disarmed_pwm,
min_pwm,
max_pwm,
trim_pwm,
_outputs.output,
pwm,
&_pwm_limit);
src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
+1 -1
View File
@@ -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);
src/systemcmds/tests/test_mixer.cpp
+5 -8
View File
@@ -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++) {