diff options
author | Julian Oes <julian@oes.ch> | 2014-04-26 23:31:15 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-04-26 23:31:15 +0200 |
commit | e882824ee15e0c5fff58c7f223ec7be181c7af8f (patch) | |
tree | 4822b8c3dd2bdd73b993b9c2be4953c6f2af72bb /src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp | |
parent | e8531e8360e4f061f3cd69db90365f64837a7c76 (diff) | |
download | px4-firmware-e882824ee15e0c5fff58c7f223ec7be181c7af8f.tar.gz px4-firmware-e882824ee15e0c5fff58c7f223ec7be181c7af8f.tar.bz2 px4-firmware-e882824ee15e0c5fff58c7f223ec7be181c7af8f.zip |
eph and epv renaming, make this compile again
Diffstat (limited to 'src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp')
-rwxr-xr-x | src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp index c61b6ff3f..ec679f1ae 100755 --- a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp +++ b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp @@ -398,7 +398,7 @@ const unsigned int loop_interval_alarm = 6500; // loop interval in microseconds hrt_abstime vel_t = 0; bool vel_valid = false; - if (ekf_params.acc_comp == 1 && gps.fix_type >= 3 && gps.eph_m < 10.0f && gps.vel_ned_valid && hrt_absolute_time() < gps.timestamp_velocity + 500000) { + if (ekf_params.acc_comp == 1 && gps.fix_type >= 3 && gps.eph < 10.0f && gps.vel_ned_valid && hrt_absolute_time() < gps.timestamp_velocity + 500000) { vel_valid = true; if (gps_updated) { vel_t = gps.timestamp_velocity; @@ -407,7 +407,7 @@ const unsigned int loop_interval_alarm = 6500; // loop interval in microseconds vel(2) = gps.vel_d_m_s; } - } else if (ekf_params.acc_comp == 2 && gps.eph_m < 5.0f && global_pos.timestamp != 0 && hrt_absolute_time() < global_pos.timestamp + 20000) { + } else if (ekf_params.acc_comp == 2 && gps.eph < 5.0f && global_pos.timestamp != 0 && hrt_absolute_time() < global_pos.timestamp + 20000) { vel_valid = true; if (global_pos_updated) { vel_t = global_pos.timestamp; |