diff --git a/src/drivers/drv_gyro.h b/src/drivers/drv_gyro.h index b82ece54497e83398bb2c33b279ed344deef3098..0502c65534cceaf660a42cb9bbb5916802dc70e2 100644 --- a/src/drivers/drv_gyro.h +++ b/src/drivers/drv_gyro.h @@ -71,8 +71,6 @@ struct gyro_calibration_s { #define _GYROIOCBASE (0x2300) #define _GYROIOC(_n) (_PX4_IOC(_GYROIOCBASE, _n)) -#define GYRO_SAMPLERATE_DEFAULT 1000003 /**< default sample rate */ - /** set the gyro scaling constants to (arg) */ #define GYROIOCSSCALE _GYROIOC(4) diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp index caa02e57b83dc9ba6226c52f6e4ce6a72b209fa8..b7cafd4e6ba6808df7993b7e6727d10ffa933727 100644 --- a/src/drivers/imu/fxas21002c/fxas21002c.cpp +++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp @@ -874,7 +874,7 @@ FXAS21002C::set_samplerate(unsigned frequency) unsigned last_rate = _current_rate; - if (frequency == 0 || frequency == GYRO_SAMPLERATE_DEFAULT) { + if (frequency == 0) { frequency = FXAS21002C_DEFAULT_RATE; } diff --git a/src/drivers/imu/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp index 6d2e3626c7cddf9665193f67206e87766e9b68f5..c6cef2ead21a02d4b35a7efa5213060524097858 100644 --- a/src/drivers/imu/l3gd20/l3gd20.cpp +++ b/src/drivers/imu/l3gd20/l3gd20.cpp @@ -759,7 +759,7 @@ L3GD20::set_samplerate(unsigned frequency) { uint8_t bits = REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE; - if (frequency == 0 || frequency == GYRO_SAMPLERATE_DEFAULT) { + if (frequency == 0) { frequency = _is_l3g4200d ? 800 : 760; } diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp index a350f6d7edeb06bcbc5e80776e8253ce5b58b706..5f63a20a1d938e8478e49c6373b902267659b1e2 100644 --- a/src/drivers/imu/mpu6000/mpu6000.cpp +++ b/src/drivers/imu/mpu6000/mpu6000.cpp @@ -904,8 +904,7 @@ MPU6000::probe() void MPU6000::_set_sample_rate(unsigned desired_sample_rate_hz) { - if (desired_sample_rate_hz == 0 || - desired_sample_rate_hz == GYRO_SAMPLERATE_DEFAULT) { + if (desired_sample_rate_hz == 0) { desired_sample_rate_hz = MPU6000_GYRO_DEFAULT_RATE; } diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp index f678b7a45004b8544d964b1f4e139183bac614fc..6173c1f7b2c160946ebde2caccb2672d65e7b72a 100644 --- a/src/drivers/imu/mpu9250/mpu9250.cpp +++ b/src/drivers/imu/mpu9250/mpu9250.cpp @@ -552,8 +552,7 @@ MPU9250::probe() void MPU9250::_set_sample_rate(unsigned desired_sample_rate_hz) { - if (desired_sample_rate_hz == 0 || - desired_sample_rate_hz == GYRO_SAMPLERATE_DEFAULT) { + if (desired_sample_rate_hz == 0) { desired_sample_rate_hz = MPU9250_GYRO_DEFAULT_RATE; } diff --git a/src/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp index a33a112dbd4522641d735b30caa4740e8a1bdac2..9577c84166d5a84749b883e2c2a302d6d569b455 100644 --- a/src/modules/simulator/gyrosim/gyrosim.cpp +++ b/src/modules/simulator/gyrosim/gyrosim.cpp @@ -510,8 +510,7 @@ GYROSIM::_set_sample_rate(unsigned desired_sample_rate_hz) { PX4_DEBUG("_set_sample_rate %u Hz", desired_sample_rate_hz); - if (desired_sample_rate_hz == 0 || - desired_sample_rate_hz == GYRO_SAMPLERATE_DEFAULT) { + if (desired_sample_rate_hz == 0) { desired_sample_rate_hz = GYROSIM_GYRO_DEFAULT_RATE; }