Browse Source

delete unused GYRO_SAMPLERATE_DEFAULT

sbg
Daniel Agar 6 years ago committed by Lorenz Meier
parent
commit
aaf1667b09
  1. 2
      src/drivers/drv_gyro.h
  2. 2
      src/drivers/imu/fxas21002c/fxas21002c.cpp
  3. 2
      src/drivers/imu/l3gd20/l3gd20.cpp
  4. 3
      src/drivers/imu/mpu6000/mpu6000.cpp
  5. 3
      src/drivers/imu/mpu9250/mpu9250.cpp
  6. 3
      src/modules/simulator/gyrosim/gyrosim.cpp

2
src/drivers/drv_gyro.h

@ -71,8 +71,6 @@ struct gyro_calibration_s { @@ -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)

2
src/drivers/imu/fxas21002c/fxas21002c.cpp

@ -874,7 +874,7 @@ FXAS21002C::set_samplerate(unsigned frequency) @@ -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;
}

2
src/drivers/imu/l3gd20/l3gd20.cpp

@ -759,7 +759,7 @@ L3GD20::set_samplerate(unsigned frequency) @@ -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;
}

3
src/drivers/imu/mpu6000/mpu6000.cpp

@ -904,8 +904,7 @@ MPU6000::probe() @@ -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;
}

3
src/drivers/imu/mpu9250/mpu9250.cpp

@ -552,8 +552,7 @@ MPU9250::probe() @@ -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;
}

3
src/modules/simulator/gyrosim/gyrosim.cpp

@ -510,8 +510,7 @@ GYROSIM::_set_sample_rate(unsigned desired_sample_rate_hz) @@ -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;
}

Loading…
Cancel
Save