Browse Source

update ecl/EKF with improved covariance prediction stability and change default IMU integration period 4000 us -> 2500 us

- bring in PX4/ecl#795 "EKF: Improve covariance prediction stability"
    - the ecl/EKF filter update period has changed from 8 ms to 10 ms
 - change default integration period 4000 us -> 2500 us (aligns with new EKF filter update period)
sbg
Daniel Agar 5 years ago committed by GitHub
parent
commit
31f3a21849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/drivers/imu/invensense/icm20602/ICM20602.cpp
  2. 2
      src/drivers/imu/invensense/icm20602/ICM20602.hpp
  3. 2
      src/drivers/imu/invensense/icm20608g/ICM20608G.cpp
  4. 2
      src/drivers/imu/invensense/icm20608g/ICM20608G.hpp
  5. 2
      src/drivers/imu/invensense/icm20649/ICM20649.cpp
  6. 2
      src/drivers/imu/invensense/icm20649/ICM20649.hpp
  7. 2
      src/drivers/imu/invensense/icm20689/ICM20689.cpp
  8. 2
      src/drivers/imu/invensense/icm20689/ICM20689.hpp
  9. 2
      src/drivers/imu/invensense/icm40609d/ICM40609D.cpp
  10. 2
      src/drivers/imu/invensense/icm40609d/ICM40609D.hpp
  11. 2
      src/drivers/imu/invensense/icm42688p/ICM42688P.cpp
  12. 2
      src/drivers/imu/invensense/icm42688p/ICM42688P.hpp
  13. 2
      src/drivers/imu/invensense/mpu6000/MPU6000.cpp
  14. 2
      src/drivers/imu/invensense/mpu6000/MPU6000.hpp
  15. 2
      src/drivers/imu/invensense/mpu6500/MPU6500.cpp
  16. 2
      src/drivers/imu/invensense/mpu6500/MPU6500.hpp
  17. 2
      src/drivers/imu/invensense/mpu9250/MPU9250.cpp
  18. 2
      src/drivers/imu/invensense/mpu9250/MPU9250.hpp
  19. 2
      src/lib/drivers/accelerometer/PX4Accelerometer.cpp
  20. 2
      src/lib/drivers/accelerometer/PX4Accelerometer.hpp
  21. 2
      src/lib/drivers/device/integrator.h
  22. 2
      src/lib/drivers/gyroscope/PX4Gyroscope.cpp
  23. 2
      src/lib/drivers/gyroscope/PX4Gyroscope.hpp
  24. 2
      src/lib/ecl
  25. 4
      src/modules/mc_pos_control/mc_pos_control_main.cpp

2
src/drivers/imu/invensense/icm20602/ICM20602.cpp

@ -302,7 +302,7 @@ void ICM20602::ConfigureGyro() @@ -302,7 +302,7 @@ void ICM20602::ConfigureGyro()
void ICM20602::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm20602/ICM20602.hpp

@ -155,7 +155,7 @@ private: @@ -155,7 +155,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/icm20608g/ICM20608G.cpp

@ -315,7 +315,7 @@ void ICM20608G::ConfigureGyro() @@ -315,7 +315,7 @@ void ICM20608G::ConfigureGyro()
void ICM20608G::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm20608g/ICM20608G.hpp

@ -158,7 +158,7 @@ private: @@ -158,7 +158,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/icm20649/ICM20649.cpp

@ -317,7 +317,7 @@ void ICM20649::ConfigureGyro() @@ -317,7 +317,7 @@ void ICM20649::ConfigureGyro()
void ICM20649::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to ~1 kHz
sample_rate = 800; // default to ~800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm20649/ICM20649.hpp

@ -169,7 +169,7 @@ private: @@ -169,7 +169,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/icm20689/ICM20689.cpp

@ -315,7 +315,7 @@ void ICM20689::ConfigureGyro() @@ -315,7 +315,7 @@ void ICM20689::ConfigureGyro()
void ICM20689::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm20689/ICM20689.hpp

@ -158,7 +158,7 @@ private: @@ -158,7 +158,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/icm40609d/ICM40609D.cpp

@ -308,7 +308,7 @@ void ICM40609D::ConfigureGyro() @@ -308,7 +308,7 @@ void ICM40609D::ConfigureGyro()
void ICM40609D::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm40609d/ICM40609D.hpp

@ -158,7 +158,7 @@ private: @@ -158,7 +158,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/icm42688p/ICM42688P.cpp

@ -310,7 +310,7 @@ void ICM42688P::ConfigureGyro() @@ -310,7 +310,7 @@ void ICM42688P::ConfigureGyro()
void ICM42688P::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/icm42688p/ICM42688P.hpp

@ -158,7 +158,7 @@ private: @@ -158,7 +158,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/mpu6000/MPU6000.cpp

@ -310,7 +310,7 @@ void MPU6000::ConfigureGyro() @@ -310,7 +310,7 @@ void MPU6000::ConfigureGyro()
void MPU6000::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/mpu6000/MPU6000.hpp

@ -155,7 +155,7 @@ private: @@ -155,7 +155,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/mpu6500/MPU6500.cpp

@ -310,7 +310,7 @@ void MPU6500::ConfigureGyro() @@ -310,7 +310,7 @@ void MPU6500::ConfigureGyro()
void MPU6500::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/mpu6500/MPU6500.hpp

@ -155,7 +155,7 @@ private: @@ -155,7 +155,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/drivers/imu/invensense/mpu9250/MPU9250.cpp

@ -343,7 +343,7 @@ void MPU9250::ConfigureGyro() @@ -343,7 +343,7 @@ void MPU9250::ConfigureGyro()
void MPU9250::ConfigureSampleRate(int sample_rate)
{
if (sample_rate == 0) {
sample_rate = 1000; // default to 1 kHz
sample_rate = 800; // default to 800 Hz
}
// round down to nearest FIFO sample dt * SAMPLES_PER_TRANSFER

2
src/drivers/imu/invensense/mpu9250/MPU9250.hpp

@ -167,7 +167,7 @@ private: @@ -167,7 +167,7 @@ private:
STATE _state{STATE::RESET};
uint16_t _fifo_empty_interval_us{1000}; // default 1000 us / 1000 Hz transfer interval
uint16_t _fifo_empty_interval_us{1250}; // default 1250 us / 800 Hz transfer interval
uint8_t _fifo_gyro_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / GYRO_RATE))};
uint8_t _fifo_accel_samples{static_cast<uint8_t>(_fifo_empty_interval_us / (1000000 / ACCEL_RATE))};

2
src/lib/drivers/accelerometer/PX4Accelerometer.cpp

@ -124,7 +124,7 @@ void PX4Accelerometer::set_update_rate(uint16_t rate) @@ -124,7 +124,7 @@ void PX4Accelerometer::set_update_rate(uint16_t rate)
const uint32_t update_interval = 1000000 / rate;
// TODO: set this intelligently
_integrator_reset_samples = 4000 / update_interval;
_integrator_reset_samples = 2500 / update_interval;
}
void PX4Accelerometer::update(hrt_abstime timestamp_sample, float x, float y, float z)

2
src/lib/drivers/accelerometer/PX4Accelerometer.hpp

@ -98,7 +98,7 @@ private: @@ -98,7 +98,7 @@ private:
hrt_abstime _status_last_publish{0};
Integrator _integrator{4000, false};
Integrator _integrator{2500, false};
matrix::Vector3f _calibration_scale{1.f, 1.f, 1.f};
matrix::Vector3f _calibration_offset{0.f, 0.f, 0.f};

2
src/lib/drivers/device/integrator.h

@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
class Integrator
{
public:
Integrator(uint32_t auto_reset_interval = 4000 /* 250 Hz */, bool coning_compensation = false);
Integrator(uint32_t auto_reset_interval = 2500 /* 400 Hz */, bool coning_compensation = false);
~Integrator() = default;
/**

2
src/lib/drivers/gyroscope/PX4Gyroscope.cpp

@ -126,7 +126,7 @@ void PX4Gyroscope::set_update_rate(uint16_t rate) @@ -126,7 +126,7 @@ void PX4Gyroscope::set_update_rate(uint16_t rate)
const uint32_t update_interval = 1000000 / rate;
// TODO: set this intelligently
_integrator_reset_samples = 4000 / update_interval;
_integrator_reset_samples = 2500 / update_interval;
}
void PX4Gyroscope::update(hrt_abstime timestamp_sample, float x, float y, float z)

2
src/lib/drivers/gyroscope/PX4Gyroscope.hpp

@ -100,7 +100,7 @@ private: @@ -100,7 +100,7 @@ private:
hrt_abstime _status_last_publish{0};
Integrator _integrator{4000, true};
Integrator _integrator{2500, true};
matrix::Vector3f _calibration_offset{0.f, 0.f, 0.f};

2
src/lib/ecl

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 47624a0f021e2c187cc4763ad829afe2aa4fb11a
Subproject commit 8a9d961f0d7b0cf6371ab1fcd6d0d2ccb581d3d1

4
src/modules/mc_pos_control/mc_pos_control_main.cpp

@ -318,8 +318,8 @@ MulticopterPositionControl::init() @@ -318,8 +318,8 @@ MulticopterPositionControl::init()
return false;
}
// limit to every other vehicle_local_position update (~62.5 Hz)
_local_pos_sub.set_interval_us(16_ms);
// limit to every other vehicle_local_position update (50 Hz)
_local_pos_sub.set_interval_us(20_ms);
_time_stamp_last_loop = hrt_absolute_time();

Loading…
Cancel
Save