diff --git a/src/drivers/drv_mag.h b/src/drivers/drv_mag.h index 0ada4e4c6a..fb589bc345 100644 --- a/src/drivers/drv_mag.h +++ b/src/drivers/drv_mag.h @@ -69,9 +69,6 @@ struct mag_calibration_s { #define _MAGIOCBASE (0x2400) #define _MAGIOC(_n) (_PX4_IOC(_MAGIOCBASE, _n)) -/** return the mag internal sample rate in Hz */ -#define MAGIOCGSAMPLERATE _MAGIOC(1) - /** set the mag scaling constants to the structure pointed to by (arg) */ #define MAGIOCSSCALE _MAGIOC(4) diff --git a/src/drivers/imu/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp index eb2d4909da..f0e3eadf3e 100644 --- a/src/drivers/imu/adis16448/adis16448.cpp +++ b/src/drivers/imu/adis16448/adis16448.cpp @@ -1157,9 +1157,6 @@ ADIS16448::mag_ioctl(struct file *filp, int cmd, unsigned long arg) return OK; } - case MAGIOCGSAMPLERATE: - return _sample_rate; - case MAGIOCSSCALE: /* copy scale in */ memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale)); diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp index d76a04209a..b9091c8de5 100644 --- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp +++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp @@ -983,9 +983,6 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg) reset(); return OK; - case MAGIOCGSAMPLERATE: - return _mag_samplerate; - case MAGIOCSSCALE: /* copy scale in */ memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale)); diff --git a/src/drivers/imu/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp index 1f113418a4..18f8425076 100644 --- a/src/drivers/imu/lsm303d/lsm303d.cpp +++ b/src/drivers/imu/lsm303d/lsm303d.cpp @@ -994,9 +994,6 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg) reset(); return OK; - case MAGIOCGSAMPLERATE: - return _mag_samplerate; - case MAGIOCSSCALE: /* copy scale in */ memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale)); diff --git a/src/drivers/imu/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp index 34d83bc4fd..0be1739830 100644 --- a/src/drivers/imu/mpu9250/mag.cpp +++ b/src/drivers/imu/mpu9250/mag.cpp @@ -350,9 +350,6 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg) return OK; } - case MAGIOCGSAMPLERATE: - return MPU9250_AK8963_SAMPLE_RATE; - case MAGIOCSSCALE: /* copy scale in */ memcpy(&_mag_scale, (struct mag_scale *) arg, sizeof(_mag_scale)); diff --git a/src/drivers/magnetometer/bmm150/bmm150.cpp b/src/drivers/magnetometer/bmm150/bmm150.cpp index 54438b4b1e..a58c1f4049 100644 --- a/src/drivers/magnetometer/bmm150/bmm150.cpp +++ b/src/drivers/magnetometer/bmm150/bmm150.cpp @@ -807,9 +807,6 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg) case MAGIOCEXSTRAP: return OK; - case MAGIOCGSAMPLERATE: - return 1000000 / _call_interval; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg); diff --git a/src/drivers/magnetometer/hmc5883/hmc5883.cpp b/src/drivers/magnetometer/hmc5883/hmc5883.cpp index 7c5ffcac46..49c262618c 100644 --- a/src/drivers/magnetometer/hmc5883/hmc5883.cpp +++ b/src/drivers/magnetometer/hmc5883/hmc5883.cpp @@ -697,10 +697,6 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg) case SENSORIOCRESET: return reset(); - case MAGIOCGSAMPLERATE: - /* same as pollrate because device is in single measurement mode*/ - return 1000000 / TICK2USEC(_measure_ticks); - case MAGIOCSRANGE: return set_range(arg); diff --git a/src/drivers/magnetometer/ist8310/ist8310.cpp b/src/drivers/magnetometer/ist8310/ist8310.cpp index eec1b70a1a..117df69351 100644 --- a/src/drivers/magnetometer/ist8310/ist8310.cpp +++ b/src/drivers/magnetometer/ist8310/ist8310.cpp @@ -677,10 +677,6 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg) case SENSORIOCRESET: return reset(); - case MAGIOCGSAMPLERATE: - /* same as pollrate because device is in single measurement mode*/ - return 1000000 / TICK2USEC(_measure_ticks); - case MAGIOCEXSTRAP: return set_selftest(arg); diff --git a/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp b/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp index a4172868c3..203e76726b 100644 --- a/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp +++ b/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp @@ -584,10 +584,6 @@ LIS3MDL::ioctl(struct file *file_pointer, int cmd, unsigned long arg) case SENSORIOCRESET: return reset(); - case MAGIOCGSAMPLERATE: - /* same as pollrate because device is in single measurement mode*/ - return 1000000 / TICK2USEC(_measure_ticks); - case MAGIOCSRANGE: return set_range(arg); diff --git a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp index 8a6f168e34..33eff5c662 100644 --- a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp +++ b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp @@ -308,10 +308,6 @@ LSM303AGR::ioctl(struct file *filp, int cmd, unsigned long arg) case SENSORIOCRESET: return reset(); - case MAGIOCGSAMPLERATE: - /* same as pollrate because device is in single measurement mode*/ - return 1000000 / TICK2USEC(_measure_ticks); - case MAGIOCSSCALE: /* set new scale factors */ memcpy(&_mag_scale, (struct mag_calibration_s *)arg, sizeof(_mag_scale)); diff --git a/src/drivers/magnetometer/rm3100/rm3100.cpp b/src/drivers/magnetometer/rm3100/rm3100.cpp index 3d8562b0b1..5cf93a9f0d 100644 --- a/src/drivers/magnetometer/rm3100/rm3100.cpp +++ b/src/drivers/magnetometer/rm3100/rm3100.cpp @@ -445,10 +445,6 @@ RM3100::ioctl(struct file *file_pointer, int cmd, unsigned long arg) case SENSORIOCRESET: return reset(); - case MAGIOCGSAMPLERATE: - /* same as pollrate because device is in single measurement mode*/ - return 1000000 / TICK2USEC(_measure_ticks); - case MAGIOCSRANGE: /* field measurement range cannot be configured for this sensor (8 Gauss) */ return OK; diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp index 7619440163..df39a7dd57 100644 --- a/src/modules/simulator/accelsim/accelsim.cpp +++ b/src/modules/simulator/accelsim/accelsim.cpp @@ -659,9 +659,6 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg) // Nothing to do for simulator return OK; - case MAGIOCGSAMPLERATE: - return _mag_samplerate; - case MAGIOCSSCALE: /* copy scale in */ memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale)); diff --git a/src/modules/uavcan/sensors/mag.cpp b/src/modules/uavcan/sensors/mag.cpp index 9a5b1321aa..430a4af44c 100644 --- a/src/modules/uavcan/sensors/mag.cpp +++ b/src/modules/uavcan/sensors/mag.cpp @@ -119,7 +119,6 @@ int UavcanMagnetometerBridge::ioctl(struct file *filp, int cmd, unsigned long ar } case MAGIOCCALIBRATE: - case MAGIOCGSAMPLERATE: case MAGIOCSRANGE: case MAGIOCGRANGE: case MAGIOCEXSTRAP: { diff --git a/src/systemcmds/config/config.c b/src/systemcmds/config/config.c index 3661cca74a..5d4c2064e5 100644 --- a/src/systemcmds/config/config.c +++ b/src/systemcmds/config/config.c @@ -248,7 +248,6 @@ do_mag(int argc, char *argv[]) return 1; } - int srate = ioctl(fd, MAGIOCGSAMPLERATE, 0); int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0); int range = ioctl(fd, MAGIOCGRANGE, 0); int id = ioctl(fd, DEVIOCGDEVICEID, 0); @@ -256,8 +255,8 @@ do_mag(int argc, char *argv[]) param_get(param_find("CAL_MAG0_ID"), &(calibration_id)); - PX4_INFO("mag: \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 Ga", - id, calibration_id, srate, prate, range); + PX4_INFO("mag: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz\n\trange:\t%d Ga", + id, calibration_id, prate, range); close(fd); }