diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index 5ff7b954d8bbdc2f8c74436afc981d17b43c5634..94e627de87eaae20ba66381e1f10d587b541704b 100644
--- a/src/drivers/barometer/bmp280/bmp280.cpp
+++ b/src/drivers/barometer/bmp280/bmp280.cpp
@@ -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;
diff --git a/src/drivers/barometer/lps22hb/LPS22HB.cpp b/src/drivers/barometer/lps22hb/LPS22HB.cpp
index 10d191629fa1aeee83bb3f8add61c594b00fdabd..d87b1d4eb0f2c391b8d4d235b5d4ebb789f75f3d 100644
--- a/src/drivers/barometer/lps22hb/LPS22HB.cpp
+++ b/src/drivers/barometer/lps22hb/LPS22HB.cpp
@@ -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);
diff --git a/src/drivers/barometer/lps25h/lps25h.cpp b/src/drivers/barometer/lps25h/lps25h.cpp
index b624d3b6319c5b309b59cf27936fe9b6e7785e61..e51a361945983c360cb0caebc79144639ac00b08 100644
--- a/src/drivers/barometer/lps25h/lps25h.cpp
+++ b/src/drivers/barometer/lps25h/lps25h.cpp
@@ -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);
diff --git a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
index 94574a3f929c1dd26ae54d87acc6ec45c2125485..635c68f2c47a5092cfb488c2751e8be434f350b5 100644
--- a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
+++ b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
@@ -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);
diff --git a/src/drivers/barometer/ms5611/ms5611.cpp b/src/drivers/barometer/ms5611/ms5611.cpp
index 89a35f8ae21f6f3a3feb2fab0c55ec82c44e27ee..1995d5a0276a75059af1db2b6c4f179797ec991b 100644
--- a/src/drivers/barometer/ms5611/ms5611.cpp
+++ b/src/drivers/barometer/ms5611/ms5611.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
index 3d6a6832117eb996e5a66adab0a027f98fffe1c1..8bcb06a4d139be720e7126d01963d1bef87802c2 100644
--- a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
+++ b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
index 8dfaf47ec7a3f802d1e7801d5e5f499360a60821..d9e002283227171a668b9749b77de21c48084c3e 100644
--- a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
+++ b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
index 91a0475dcdbc536bc9ebed13f6339a24d1589903..bfbc435db259d8ee8c51639e7d955213f8e9b2a6 100644
--- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
+++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/sf0x/sf0x.cpp b/src/drivers/distance_sensor/sf0x/sf0x.cpp
index 67ee21f30d930898e5a0a4bc28fddfc738ce801d..a821f2e1ad90957bc792c00d38103d8915101c1c 100644
--- a/src/drivers/distance_sensor/sf0x/sf0x.cpp
+++ b/src/drivers/distance_sensor/sf0x/sf0x.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
index aa052f4b8907335b4513416276580fbdec7906aa..f376514353fcfa00309403bc9aebc139bcbccbbe 100644
--- a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
+++ b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
index 625386715a49143dd4e47a3219a141fbe3f28003..e484094170c270a224fa77c6729b57f6463fa775 100644
--- a/src/drivers/distance_sensor/srf02/srf02.cpp
+++ b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/teraranger/teraranger.cpp b/src/drivers/distance_sensor/teraranger/teraranger.cpp
index 6dd209bba2a267ba59493ca7d67f11c67ac126c1..6851cc9e367b80efbc0f3125a7154ebdfa427391 100644
--- a/src/drivers/distance_sensor/teraranger/teraranger.cpp
+++ b/src/drivers/distance_sensor/teraranger/teraranger.cpp
@@ -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);
diff --git a/src/drivers/distance_sensor/tfmini/tfmini.cpp b/src/drivers/distance_sensor/tfmini/tfmini.cpp
index 8a58912ba41e0c66a022706eec18d4332ec8919f..e16318bfd646d2a4139a3c44b78de1f7c1fa0a28 100644
--- a/src/drivers/distance_sensor/tfmini/tfmini.cpp
+++ b/src/drivers/distance_sensor/tfmini/tfmini.cpp
@@ -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);
diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h
index 30246cf0210039dae8306655888326758788c134..29b315bc0a6373caeaaf5c3338564687c2fe4c60 100644
--- a/src/drivers/drv_sensor.h
+++ b/src/drivers/drv_sensor.h
@@ -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 */
/**
diff --git a/src/drivers/imu/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp
index bef711671e1e56fb9a5c5cdaf66d4fdddbeb6fa5..a6275ffc6592d3e9f2586d0ddf9e0393d00a20b6 100644
--- a/src/drivers/imu/adis16448/adis16448.cpp
+++ b/src/drivers/imu/adis16448/adis16448.cpp
@@ -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);
diff --git a/src/drivers/imu/adis16477/ADIS16477.cpp b/src/drivers/imu/adis16477/ADIS16477.cpp
index ab3b78389588c82569b531a5468c3255e62b32ca..7f5e7b997ae778ac75671a67e79c12a9c600a082 100644
--- a/src/drivers/imu/adis16477/ADIS16477.cpp
+++ b/src/drivers/imu/adis16477/ADIS16477.cpp
@@ -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);
diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
index 3f05754c079d99c199f9ec6a1bd4c8fb99134d0f..6c2815eb80617f4aad1576fd308c1e99c82faa5e 100644
--- a/src/drivers/imu/bma180/bma180.cpp
+++ b/src/drivers/imu/bma180/bma180.cpp
@@ -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);
diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp
index dafffc5b619a11dbf0864d0a51038ed14bd31c75..c1427d7cf2755c0bd51d15b352b96b10bcbef912 100644
--- a/src/drivers/imu/bmi055/BMI055_accel.cpp
+++ b/src/drivers/imu/bmi055/BMI055_accel.cpp
@@ -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);
diff --git a/src/drivers/imu/bmi055/BMI055_gyro.cpp b/src/drivers/imu/bmi055/BMI055_gyro.cpp
index 0d7c3663686683bfe7e92b46d0fd8b726618259a..5c0e2ade84efe626da7448c55ad014c6bad3c9b6 100644
--- a/src/drivers/imu/bmi055/BMI055_gyro.cpp
+++ b/src/drivers/imu/bmi055/BMI055_gyro.cpp
@@ -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);
diff --git a/src/drivers/imu/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp
index a875571c4def4259c8b6b61b6834f0bc4e81e9f0..785071813d6dc8308fad65c0b198470db748d0db 100644
--- a/src/drivers/imu/bmi160/bmi160.cpp
+++ b/src/drivers/imu/bmi160/bmi160.cpp
@@ -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);
diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp
index 842756bae28043c9d8120adf1b4e5dedd9b155c4..4c2f6d76d83e0fc01e3c9f1d9be43574af95f82a 100644
--- a/src/drivers/imu/fxas21002c/fxas21002c.cpp
+++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp
@@ -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);
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index bd855609209d7ca602adf9e7989b0453b7dc1b31..664569832ebc803cb5b9c83668d990903291c288 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -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);
diff --git a/src/drivers/imu/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp
index d608b1ba95240af3480942c6803ab743ff06631f..163a15528dbab8783c2f1e8fc432bd1561032022 100644
--- a/src/drivers/imu/l3gd20/l3gd20.cpp
+++ b/src/drivers/imu/l3gd20/l3gd20.cpp
@@ -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);
diff --git a/src/drivers/imu/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp
index 70a21da2dbbdcb47967adbd08593498e8ea1124e..411fc3ba15d896b1de2142a8fda0601ecf8140bf 100644
--- a/src/drivers/imu/lsm303d/lsm303d.cpp
+++ b/src/drivers/imu/lsm303d/lsm303d.cpp
@@ -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);
diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp
index 64b5a52f068c868bfb29445d967463d3ef9e52cc..265592ccf8fb54727a43fff2db02e8dd02c44456 100644
--- a/src/drivers/imu/mpu6000/mpu6000.cpp
+++ b/src/drivers/imu/mpu6000/mpu6000.cpp
@@ -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);
diff --git a/src/drivers/imu/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp
index 70a4ee3867f3fa29751780c518948bd0b1df62f8..31aac0a7f19eab50f900d0453770ebeffe7fefbf 100644
--- a/src/drivers/imu/mpu9250/mag.cpp
+++ b/src/drivers/imu/mpu9250/mag.cpp
@@ -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);
diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp
index f73793c0e92fdcb8f3f931ee386cfd6049d10355..f93d37c3f3c850f7bb52da2ae109c4a37b041041 100644
--- a/src/drivers/imu/mpu9250/mpu9250.cpp
+++ b/src/drivers/imu/mpu9250/mpu9250.cpp
@@ -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);
diff --git a/src/drivers/magnetometer/bmm150/bmm150.cpp b/src/drivers/magnetometer/bmm150/bmm150.cpp
index 4b727c26084450e9d4b49f951f26162ef560c026..464f28749f31be6f1ef875816a2192ab14889607 100644
--- a/src/drivers/magnetometer/bmm150/bmm150.cpp
+++ b/src/drivers/magnetometer/bmm150/bmm150.cpp
@@ -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);
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883.cpp b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
index 1c4e73d5916f4fee68a033ed84c5241b23c367c5..7e226f0793750707434f3153f64b844ea62721f6 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
@@ -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);
diff --git a/src/drivers/magnetometer/ist8310/ist8310.cpp b/src/drivers/magnetometer/ist8310/ist8310.cpp
index df7e04f4c54b4b0977a3124f93895e6ac54690cc..b055c27b33a5af4fd08f7b98984b555886e94598 100644
--- a/src/drivers/magnetometer/ist8310/ist8310.cpp
+++ b/src/drivers/magnetometer/ist8310/ist8310.cpp
@@ -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);
diff --git a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
index 6bf15864b5d716b16398b74875d7a6be23f50ddd..1da84874bbc6eaa50a1f22497e07a5e2abc5e308 100644
--- a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
+++ b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
@@ -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);
diff --git a/src/drivers/px4flow/px4flow.cpp b/src/drivers/px4flow/px4flow.cpp
index 1fe5c2265af1a9947bf7cb5a58c0a3ddff934f4d..1a2a5295d65fb41e222426b5f2abfe09db0a14d3 100644
--- a/src/drivers/px4flow/px4flow.cpp
+++ b/src/drivers/px4flow/px4flow.cpp
@@ -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;
}
diff --git a/src/lib/drivers/airspeed/airspeed.cpp b/src/lib/drivers/airspeed/airspeed.cpp
index 45ea0c03f2c0360f5c4cbfd21e375749409fa163..37e090f5e76ea8264223008152677e84f4e13456 100644
--- a/src/lib/drivers/airspeed/airspeed.cpp
+++ b/src/lib/drivers/airspeed/airspeed.cpp
@@ -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);
diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp
index bd879b8e83b0bf0754a72e3be6e7120682ff8709..a036594c2a60b6a8cc7fc393566cadadcf651768 100644
--- a/src/modules/simulator/accelsim/accelsim.cpp
+++ b/src/modules/simulator/accelsim/accelsim.cpp
@@ -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);
diff --git a/src/modules/simulator/airspeedsim/airspeedsim.cpp b/src/modules/simulator/airspeedsim/airspeedsim.cpp
index 23c50fe444740a07725251c4853719cc25084836..3c191d0a7350bc1a2071eecf0c353476ac84db0a 100644
--- a/src/modules/simulator/airspeedsim/airspeedsim.cpp
+++ b/src/modules/simulator/airspeedsim/airspeedsim.cpp
@@ -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);
diff --git a/src/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp
index 29d89c5f1b2adf1473eebe129931fd71f83cba74..922e607bb3114c1e6f691917b0f24cc7fca75b4a 100644
--- a/src/modules/simulator/gyrosim/gyrosim.cpp
+++ b/src/modules/simulator/gyrosim/gyrosim.cpp
@@ -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);