delete unused IOCTL GYROIOCGRANGE

This commit is contained in:
Daniel Agar
2018-11-03 15:05:50 -04:00
committed by Lorenz Meier
parent 068dcb37df
commit ef65e5267a
11 changed files with 2 additions and 37 deletions

View File

@@ -82,9 +82,6 @@ struct gyro_calibration_s {
/** set the gyro scaling constants to (arg) */
#define GYROIOCSSCALE _GYROIOC(4)
/** get the current gyro measurement range in degrees per second */
#define GYROIOCGRANGE _GYROIOC(7)
/** get the current gyro type */
#define GYROIOCTYPE _GYROIOC(13)

View File

@@ -1129,9 +1129,6 @@ ADIS16448::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
case GYROIOCTYPE:
return (ADIS16448_Product);

View File

@@ -450,9 +450,6 @@ ADIS16477::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return SPI::ioctl(filp, cmd, arg);

View File

@@ -410,9 +410,6 @@ BMI055_gyro::ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return SPI::ioctl(filp, cmd, arg);

View File

@@ -711,9 +711,6 @@ BMI160::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return SPI::ioctl(filp, cmd, arg);

View File

@@ -745,10 +745,6 @@ FXAS21002C::ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
/* convert to dps and round */
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return SPI::ioctl(filp, cmd, arg);

View File

@@ -669,10 +669,6 @@ L3GD20::ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
/* convert to dps and round */
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return SPI::ioctl(filp, cmd, arg);

View File

@@ -1421,9 +1421,6 @@ MPU6000::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return CDev::ioctl(filp, cmd, arg);

View File

@@ -887,9 +887,6 @@ MPU9250::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return CDev::ioctl(filp, cmd, arg);

View File

@@ -160,7 +160,6 @@ private:
struct gyro_calibration_s _gyro_scale;
float _gyro_range_scale;
float _gyro_range_rad_s;
perf_counter_t _accel_reads;
perf_counter_t _gyro_reads;
@@ -298,7 +297,6 @@ GYROSIM::GYROSIM(const char *path_accel, const char *path_gyro, enum Rotation ro
_gyro_reports(nullptr),
_gyro_scale{},
_gyro_range_scale(0.0f),
_gyro_range_rad_s(0.0f),
_accel_reads(perf_alloc(PC_COUNT, "gyrosim_accel_read")),
_gyro_reads(perf_alloc(PC_COUNT, "gyrosim_gyro_read")),
_sample_perf(perf_alloc(PC_ELAPSED, "gyrosim_read")),
@@ -755,9 +753,6 @@ GYROSIM::gyro_ioctl(unsigned long cmd, unsigned long arg)
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
return OK;
case GYROIOCGRANGE:
return (unsigned long)(_gyro_range_rad_s * 180.0f / M_PI_F + 0.5f);
default:
/* give it to the superclass */
return VirtDevObj::devIOCTL(cmd, arg);

View File

@@ -205,14 +205,13 @@ do_gyro(int argc, char *argv[])
int srate = ioctl(fd, GYROIOCGSAMPLERATE, 0);
int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int range = ioctl(fd, GYROIOCGRANGE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0);
int32_t calibration_id = 0;
param_get(param_find("CAL_GYRO0_ID"), &(calibration_id));
PX4_INFO("gyro: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tsample rate:\t%d Hz\n\tread rate:\t%d Hz\n\trange:\t%d dps",
id, calibration_id, srate, prate, range);
PX4_INFO("gyro: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tsample rate:\t%d Hz\n\tread rate:\t%d Hz",
id, calibration_id, srate, prate);
close(fd);
}