Resolve tab/space differences with upstream master.

This commit is contained in:
mcsauder
2016-02-18 03:28:40 -07:00
parent 437f6ca5fb
commit 72243c4a84
3 changed files with 31 additions and 31 deletions
+28 -28
View File
@@ -42,21 +42,21 @@
#include "ekf.h"
Ekf::Ekf():
_filter_initialised(false),
_earth_rate_initialised(false),
_fuse_height(false),
_fuse_pos(false),
_fuse_hor_vel(false),
_fuse_vert_vel(false),
_time_last_fake_gps(0),
_time_last_pos_fuse(0),
_time_last_vel_fuse(0),
_time_last_hgt_fuse(0),
_time_last_of_fuse(0),
_last_disarmed_posD(0.0f),
_filter_initialised(false),
_earth_rate_initialised(false),
_fuse_height(false),
_fuse_pos(false),
_fuse_hor_vel(false),
_fuse_vert_vel(false),
_time_last_fake_gps(0),
_time_last_pos_fuse(0),
_time_last_vel_fuse(0),
_time_last_hgt_fuse(0),
_time_last_of_fuse(0),
_last_disarmed_posD(0.0f),
_heading_innov(0.0f),
_heading_innov_var(0.0f),
_mag_declination(0.0f),
_mag_declination(0.0f),
_gpsDriftVelN(0.0f),
_gpsDriftVelE(0.0f),
_gps_drift_velD(0.0f),
@@ -69,25 +69,25 @@ Ekf::Ekf():
_baro_counter(0),
_baro_sum(0.0f),
_mag_counter(0),
_baro_at_alignment(0.0f)
_baro_at_alignment(0.0f)
{
_control_status = {};
_control_status_prev = {};
_state = {};
_last_known_posNE.setZero();
_earth_rate_NED.setZero();
_R_prev = matrix::Dcm<float>();
_vel_pos_innov = {};
_mag_innov = {};
_vel_pos_innov_var = {};
_mag_innov_var = {};
_control_status = {};
_control_status_prev = {};
_state = {};
_last_known_posNE.setZero();
_earth_rate_NED.setZero();
_R_prev = matrix::Dcm<float>();
_vel_pos_innov = {};
_mag_innov = {};
_vel_pos_innov_var = {};
_mag_innov_var = {};
_delta_angle_corr.setZero();
_delta_vel_corr.setZero();
_vel_corr.setZero();
_imu_down_sampled = {};
_q_down_sampled.setZero();
_mag_sum = {};
_delVel_sum = {};
_imu_down_sampled = {};
_q_down_sampled.setZero();
_mag_sum = {};
_delVel_sum = {};
}
Ekf::~Ekf()