diff options
| author | Julian Oes <julian@oes.ch> | 2014-05-07 23:53:27 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-05-07 23:53:27 +0200 |
| commit | 68352cb923d366b66bb68c8d946c4960b6f7ff1a (patch) | |
| tree | ec00d113af0bb40271c28a7001bf42e970e7b460 /src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp | |
| parent | 26f5e550c492fc00341d5a0ae445710325269813 (diff) | |
| download | px4-firmware-68352cb923d366b66bb68c8d946c4960b6f7ff1a.tar.gz px4-firmware-68352cb923d366b66bb68c8d946c4960b6f7ff1a.tar.bz2 px4-firmware-68352cb923d366b66bb68c8d946c4960b6f7ff1a.zip | |
merge fixes
Diffstat (limited to 'src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp')
| -rw-r--r-- | src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp b/src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp index 35ba96f59..dadcc1dce 100644 --- a/src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp +++ b/src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp @@ -1029,7 +1029,7 @@ FixedwingEstimator::task_main() float initVelNED[3]; - if (!_gps_initialized && _gps.fix_type > 2 && _gps.eph_m < _parameters.pos_stddev_threshold && _gps.epv_m < _parameters.pos_stddev_threshold) { + if (!_gps_initialized && _gps.fix_type > 2 && _gps.eph < _parameters.pos_stddev_threshold && _gps.epv < _parameters.pos_stddev_threshold) { initVelNED[0] = _gps.vel_n_m_s; initVelNED[1] = _gps.vel_e_m_s; |