yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete IOCTL SENSOR_POLLRATE_MAX

Browse Source 
- only SENSOR_POLLRATE_DEFAULT is needed
This commit is contained in:
Daniel Agar
2018-11-03 16:18:13 -04:00
committed by Lorenz Meier
parent 556a9422b5
commit d2ed091a1d
36 changed files with 41 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/barometer/bmp280/bmp280.cpp
View File

@@ -342,9 +342,6 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
case SENSOR_POLLRATE_MAX:
/* FALLTHROUGH */
case SENSOR_POLLRATE_DEFAULT:
ticks = _max_mesure_ticks;

3
src/drivers/barometer/lps22hb/LPS22HB.cpp
View File

@@ -110,8 +110,7 @@ LPS22HB::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/barometer/lps25h/lps25h.cpp
View File

@@ -445,8 +445,7 @@ LPS25H::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
View File

@@ -396,8 +396,7 @@ MPL3115A2::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/barometer/ms5611/ms5611.cpp
View File

@@ -471,8 +471,7 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
View File

@@ -352,8 +352,7 @@ HC_SR04::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/ll40ls/LidarLite.cpp
View File

@@ -84,8 +84,7 @@ int LidarLite::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/mb12xx/mb12xx.cpp
View File

@@ -348,8 +348,7 @@ MB12XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/sf0x/sf0x.cpp
View File

@@ -329,8 +329,7 @@ SF0X::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/sf1xx/sf1xx.cpp
View File

@@ -348,8 +348,7 @@ SF1XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/srf02/srf02.cpp
View File

@@ -348,8 +348,7 @@ SRF02::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/teraranger/teraranger.cpp
View File

@@ -427,8 +427,7 @@ TERARANGER::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/distance_sensor/tfmini/tfmini.cpp
View File

@@ -366,8 +366,7 @@ TFMINI::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

1
src/drivers/drv_sensor.h
View File

@@ -126,7 +126,6 @@
*/
#define SENSORIOCSPOLLRATE _SENSORIOC(0)
#define SENSOR_POLLRATE_MAX 1000002 /**< poll at device maximum rate */
#define SENSOR_POLLRATE_DEFAULT 1000003 /**< poll at driver normal rate */
/**

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

@@ -984,10 +984,7 @@ ADIS16448::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, ADIS16448_ACCEL_DEFAULT_RATE);

5
src/drivers/imu/adis16477/ADIS16477.cpp
View File

@@ -348,10 +348,7 @@ ADIS16477::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, ADIS16477_ACCEL_DEFAULT_RATE);

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

@@ -405,8 +405,7 @@ BMA180::ioctl(struct file *filp, int cmd, unsigned long arg)
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* With internal low pass filters enabled, 250 Hz is sufficient */
return ioctl(filp, SENSORIOCSPOLLRATE, 250);

5
src/drivers/imu/bmi055/BMI055_accel.cpp
View File

@@ -334,10 +334,7 @@ BMI055_accel::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_ACCEL_MAX_RATE);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
// Polling at the highest frequency. We may get duplicate values on the sensors
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_ACCEL_DEFAULT_RATE);

5
src/drivers/imu/bmi055/BMI055_gyro.cpp
View File

@@ -320,10 +320,7 @@ BMI055_gyro::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_GYRO_MAX_RATE);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_GYRO_DEFAULT_RATE);

5
src/drivers/imu/bmi160/bmi160.cpp
View File

@@ -559,10 +559,7 @@ BMI160::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, BMI160_GYRO_MAX_RATE);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
if (BMI160_GYRO_DEFAULT_RATE > BMI160_ACCEL_DEFAULT_RATE) {
return ioctl(filp, SENSORIOCSPOLLRATE, BMI160_GYRO_DEFAULT_RATE);

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

@@ -660,8 +660,7 @@ FXAS21002C::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, FXAS21002C_DEFAULT_RATE);

8
src/drivers/imu/fxos8701cq/fxos8701cq.cpp
View File

@@ -808,10 +808,7 @@ FXOS8701CQ::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1600);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, FXOS8701C_ACCEL_DEFAULT_RATE);
@@ -902,8 +899,7 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(filp, SENSORIOCSPOLLRATE, 100);

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

@@ -580,8 +580,7 @@ L3GD20::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
if (_is_l3g4200d) {
return ioctl(filp, SENSORIOCSPOLLRATE, L3G4200D_DEFAULT_RATE);

8
src/drivers/imu/lsm303d/lsm303d.cpp
View File

@@ -820,10 +820,7 @@ LSM303D::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1600);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, LSM303D_ACCEL_DEFAULT_RATE);
@@ -913,8 +910,7 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(filp, SENSORIOCSPOLLRATE, 100);

5
src/drivers/imu/mpu6000/mpu6000.cpp
View File

@@ -1270,10 +1270,7 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU6000_ACCEL_DEFAULT_RATE);

5
src/drivers/imu/mpu9250/mag.cpp
View File

@@ -302,10 +302,7 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 100);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU9250_AK8963_SAMPLE_RATE);

5
src/drivers/imu/mpu9250/mpu9250.cpp
View File

@@ -739,10 +739,7 @@ MPU9250::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU9250_ACCEL_DEFAULT_RATE);

10
src/drivers/magnetometer/bmm150/bmm150.cpp
View File

@@ -139,13 +139,12 @@ void test(bool external_bus)
fd = open(path, O_RDONLY);
if (fd < 0) {
PX4_ERR("%s open failed (try 'bmm150 start' if the driver is not running)",
path);
PX4_ERR("%s open failed (try 'bmm150 start' if the driver is not running)", path);
exit(1);
}
/* reset to Max polling rate*/
if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MAX) < 0) {
/* reset to default polling rate*/
if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("reset to Max polling rate");
exit(1);
}
@@ -730,8 +729,7 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, BMM150_MAX_DATA_RATE);

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

@@ -620,8 +620,7 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

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

@@ -600,8 +600,7 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

3
src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
View File

@@ -249,8 +249,7 @@ LSM303AGR::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

5
src/drivers/px4flow/px4flow.cpp
View File

@@ -339,8 +339,7 @@ PX4FLOW::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
@@ -811,7 +810,7 @@ start(int argc, char *argv[])
break;
}
if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MAX) < 0) {
if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
break;
}

3
src/lib/drivers/airspeed/airspeed.cpp
View File

@@ -145,8 +145,7 @@ Airspeed::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

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

@@ -501,10 +501,7 @@ ACCELSIM::devIOCTL(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return devIOCTL(SENSORIOCSPOLLRATE, 1600);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return devIOCTL(SENSORIOCSPOLLRATE, ACCELSIM_ACCEL_DEFAULT_RATE);
@@ -586,8 +583,7 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(SENSORIOCSPOLLRATE, 100);

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

@@ -174,8 +174,7 @@ AirspeedSim::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);

5
src/modules/simulator/gyrosim/gyrosim.cpp
View File

@@ -637,10 +637,7 @@ GYROSIM::devIOCTL(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
/* set default/max polling rate */
case SENSOR_POLLRATE_MAX:
return devIOCTL(SENSORIOCSPOLLRATE, 1000);
/* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return devIOCTL(SENSORIOCSPOLLRATE, GYROSIM_ACCEL_DEFAULT_RATE);