dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

delete unused IOCTL MAGIOCGRANGE

This commit is contained in:
Daniel Agar 2018-11-03 15:42:19 -04:00 committed by Lorenz Meier
parent 0ea18b2b73
commit d76155107c
8 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/drv_mag.h
View File

@ -78,9 +78,6 @@ struct mag_calibration_s {
/** set the measurement range to handle (at least) arg Gauss */ /** set the measurement range to handle (at least) arg Gauss */
#define MAGIOCSRANGE _MAGIOC(6) #define MAGIOCSRANGE _MAGIOC(6)
/** return the current mag measurement range in Gauss */
#define MAGIOCGRANGE _MAGIOC(7)
/** perform self-calibration, update scale factors to canonical units */ /** perform self-calibration, update scale factors to canonical units */
#define MAGIOCCALIBRATE _MAGIOC(8) #define MAGIOCCALIBRATE _MAGIOC(8)

3
src/drivers/imu/adis16448/adis16448.cpp
View File

@ -1167,9 +1167,6 @@ ADIS16448::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
memcpy((struct mag_calibration_s *) arg, &_mag_scale, sizeof(_mag_scale)); memcpy((struct mag_calibration_s *) arg, &_mag_scale, sizeof(_mag_scale));
return OK; return OK;
case MAGIOCGRANGE:
return (unsigned long)(_mag_range_mgauss);
default: default:
/* give it to the superclass */ /* give it to the superclass */
return SPI::ioctl(filp, cmd, arg); return SPI::ioctl(filp, cmd, arg);

3
src/drivers/magnetometer/hmc5883/hmc5883.cpp
View File

@ -700,9 +700,6 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
case MAGIOCSRANGE: case MAGIOCSRANGE:
return set_range(arg); return set_range(arg);
case MAGIOCGRANGE:
return _range_ga;
case MAGIOCSSCALE: case MAGIOCSSCALE:
/* set new scale factors */ /* set new scale factors */
memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale)); memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale));

3
src/drivers/magnetometer/lis3mdl/lis3mdl.cpp
View File

@ -587,9 +587,6 @@ LIS3MDL::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
case MAGIOCSRANGE: case MAGIOCSRANGE:
return set_range(arg); return set_range(arg);
case MAGIOCGRANGE:
return _range_ga;
case MAGIOCSSCALE: case MAGIOCSSCALE:
/* set new scale factors */ /* set new scale factors */
memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale)); memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale));

4
src/drivers/magnetometer/rm3100/rm3100.cpp
View File

@ -449,10 +449,6 @@ RM3100::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
/* field measurement range cannot be configured for this sensor (8 Gauss) */ /* field measurement range cannot be configured for this sensor (8 Gauss) */
return OK; return OK;
case MAGIOCGRANGE:
/* field measurement range cannot be configured for this sensor (8 Gauss) */
return 8;
case MAGIOCSSCALE: case MAGIOCSSCALE:
/* set new scale factors */ /* set new scale factors */
memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale)); memcpy(&_scale, (struct mag_calibration_s *)arg, sizeof(_scale));

3
src/modules/simulator/accelsim/accelsim.cpp
View File

@ -672,9 +672,6 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
case MAGIOCSRANGE: case MAGIOCSRANGE:
return mag_set_range(arg); return mag_set_range(arg);
case MAGIOCGRANGE:
return _mag_range_ga;
case MAGIOCGEXTERNAL: case MAGIOCGEXTERNAL:
/* Even if this sensor is on the "external" SPI bus /* Even if this sensor is on the "external" SPI bus
* it is still fixed to the autopilot assembly, * it is still fixed to the autopilot assembly,

1
src/modules/uavcan/sensors/mag.cpp
View File

@ -120,7 +120,6 @@ int UavcanMagnetometerBridge::ioctl(struct file *filp, int cmd, unsigned long ar
case MAGIOCCALIBRATE: case MAGIOCCALIBRATE:
case MAGIOCSRANGE: case MAGIOCSRANGE:
case MAGIOCGRANGE:
case MAGIOCEXSTRAP: { case MAGIOCEXSTRAP: {
return -EINVAL; return -EINVAL;
} }

5
src/systemcmds/config/config.c
View File

@ -249,14 +249,13 @@ do_mag(int argc, char *argv[])
} }
int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0); int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int range = ioctl(fd, MAGIOCGRANGE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0); int id = ioctl(fd, DEVIOCGDEVICEID, 0);
int32_t calibration_id = 0; int32_t calibration_id = 0;
param_get(param_find("CAL_MAG0_ID"), &(calibration_id)); 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\tread rate:\t%d Hz\n\trange:\t%d Ga", PX4_INFO("mag: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz",
id, calibration_id, prate, range); id, calibration_id, prate);
close(fd); close(fd);
} }