Browse Source

Merge pull request #330 from CarlOlsson/pr-add_get_wind_vel_var

EKF: added get_wind_velocity_var function
master
Paul Riseborough 7 years ago committed by GitHub
parent
commit
68bad48598
  1. 6
      EKF/airspeed_fusion.cpp
  2. 3
      EKF/ekf.h
  3. 2
      EKF/estimator_interface.h

6
EKF/airspeed_fusion.cpp

@ -224,6 +224,12 @@ void Ekf::get_wind_velocity(float *wind) @@ -224,6 +224,12 @@ void Ekf::get_wind_velocity(float *wind)
wind[1] = _state.wind_vel(1);
}
void Ekf::get_wind_velocity_var(float *wind_var)
{
wind_var[0] = P[22][22];
wind_var[1] = P[23][23];
}
void Ekf::get_true_airspeed(float *tas)
{
float tempvar = sqrtf(sq(_state.vel(0) - _state.wind_vel(0)) + sq(_state.vel(1) - _state.wind_vel(1)) + sq(_state.vel(2)));

3
EKF/ekf.h

@ -112,6 +112,9 @@ public: @@ -112,6 +112,9 @@ public:
// get the wind velocity in m/s
void get_wind_velocity(float *wind);
// get the wind velocity var
void get_wind_velocity_var(float *wind_var);
// get the true airspeed in m/s
void get_true_airspeed(float *tas);

2
EKF/estimator_interface.h

@ -93,6 +93,8 @@ public: @@ -93,6 +93,8 @@ public:
virtual void get_wind_velocity(float *wind) = 0;
virtual void get_wind_velocity_var(float *wind_var) = 0;
virtual void get_true_airspeed(float *tas) = 0;
virtual void get_covariances(float *covariances) = 0;

Loading…
Cancel
Save