From 2ff69a445611a3c09ad82b766dda523ae1b259f9 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 21 Jan 2021 19:20:08 -0500 Subject: [PATCH] delete unused PWM_SERVO_SET_COUNT --- src/drivers/drv_pwm_output.h | 4 --- src/drivers/dshot/DShot.cpp | 54 ---------------------------------- src/drivers/pwm_out/PWMOut.cpp | 53 --------------------------------- 3 files changed, 111 deletions(-) diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index fe09d1bfe9..5dba02b79d 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -219,10 +219,6 @@ struct pwm_output_rc_config { /** get the TRIM value the output will send */ #define PWM_SERVO_GET_TRIM_PWM _PX4_IOC(_PWM_SERVO_BASE, 21) -/** set the number of servos in (unsigned)arg - allows change of - * split between servos and GPIO */ -#define PWM_SERVO_SET_COUNT _PX4_IOC(_PWM_SERVO_BASE, 22) - /** set the lockdown override flag to enable outputs in HIL */ #define PWM_SERVO_SET_DISABLE_LOCKDOWN _PX4_IOC(_PWM_SERVO_BASE, 23) diff --git a/src/drivers/dshot/DShot.cpp b/src/drivers/dshot/DShot.cpp index 62566e41c5..dde41ee043 100644 --- a/src/drivers/dshot/DShot.cpp +++ b/src/drivers/dshot/DShot.cpp @@ -726,60 +726,6 @@ int DShot::pwm_ioctl(file *filp, const int cmd, const unsigned long arg) break; - case PWM_SERVO_SET_COUNT: { - /* - * Change the number of outputs that are enabled for - * PWM. This is used to change the split between GPIO - * and PWM under control of the flight config - * parameters. - */ - switch (arg) { - case 0: - set_mode(MODE_NONE); - break; - - case 1: - set_mode(MODE_1PWM); - break; - - case 2: - set_mode(MODE_2PWM); - break; - - case 3: - set_mode(MODE_3PWM); - break; - - case 4: - set_mode(MODE_4PWM); - break; - - case 5: - set_mode(MODE_5PWM); - break; - -#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >=6 - - case 6: - set_mode(MODE_6PWM); - break; -#endif - -#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >=8 - - case 8: - set_mode(MODE_8PWM); - break; -#endif - - default: - ret = -EINVAL; - break; - } - - break; - } - case PWM_SERVO_SET_MODE: { switch (arg) { case PWM_SERVO_MODE_NONE: diff --git a/src/drivers/pwm_out/PWMOut.cpp b/src/drivers/pwm_out/PWMOut.cpp index 27df7483f1..aa37daabb0 100644 --- a/src/drivers/pwm_out/PWMOut.cpp +++ b/src/drivers/pwm_out/PWMOut.cpp @@ -1166,59 +1166,6 @@ int PWMOut::pwm_ioctl(file *filp, int cmd, unsigned long arg) break; - case PWM_SERVO_SET_COUNT: { - /* change the number of outputs that are enabled for - * PWM. This is used to change the split between GPIO - * and PWM under control of the flight config - * parameters. - */ - switch (arg) { - case 0: - set_mode(MODE_NONE); - break; - - case 1: - set_mode(MODE_1PWM); - break; - - case 2: - set_mode(MODE_2PWM); - break; - - case 3: - set_mode(MODE_3PWM); - break; - - case 4: - set_mode(MODE_4PWM); - break; - - case 5: - set_mode(MODE_5PWM); - break; - -#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >=6 - - case 6: - set_mode(MODE_6PWM); - break; -#endif - -#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >=8 - - case 8: - set_mode(MODE_8PWM); - break; -#endif - - default: - ret = -EINVAL; - break; - } - - break; - } - case PWM_SERVO_SET_MODE: { switch (arg) { case PWM_SERVO_MODE_NONE: