From be930d4372a15a6a31f771569e527c926a18ab5a Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 14 Dec 2017 12:03:00 -0500 Subject: [PATCH] delete unused PWM_SERVO_CLEAR_OVERRIDE_OK --- src/drivers/drv_pwm_output.h | 3 --- src/drivers/px4io/px4io.cpp | 6 ------ 2 files changed, 9 deletions(-) diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index cd75a8adc7..07e979e040 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -248,9 +248,6 @@ struct pwm_output_rc_config { /** force safety switch on (to enable use of safety switch) */ #define PWM_SERVO_SET_FORCE_SAFETY_ON _PX4_IOC(_PWM_SERVO_BASE, 28) -/** clear the 'OVERRIDE OK' bit, which allows for RC control on FMU loss */ -#define PWM_SERVO_CLEAR_OVERRIDE_OK _PX4_IOC(_PWM_SERVO_BASE, 31) - /** setup OVERRIDE_IMMEDIATE behaviour on FMU fail */ #define PWM_SERVO_SET_OVERRIDE_IMMEDIATE _PX4_IOC(_PWM_SERVO_BASE, 32) diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index ff7176a119..ce913cf4c3 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -2842,12 +2842,6 @@ PX4IO::ioctl(file *filep, int cmd, unsigned long arg) break; - case PWM_SERVO_CLEAR_OVERRIDE_OK: - /* clear the 'OVERRIDE OK' bit */ - ret = io_reg_modify(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ARMING, PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK, 0); - _override_available = false; - break; - default: /* see if the parent class can make any use of it */ ret = CDev::ioctl(filep, cmd, arg);