diff options
author | Kynos <mail01@delago.net> | 2014-06-30 01:34:12 +0200 |
---|---|---|
committer | Kynos <mail01@delago.net> | 2014-06-30 01:34:12 +0200 |
commit | 503ebddc1b0300f4666b1cd72100a6472709daaf (patch) | |
tree | afa624230cc3726b2527ac3d1f646b3afe66aaa2 /src/drivers/gps/gps.cpp | |
parent | f1a5be1f57d9a15f29a428e962c3ed7f75777d22 (diff) | |
parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
download | px4-firmware-503ebddc1b0300f4666b1cd72100a6472709daaf.tar.gz px4-firmware-503ebddc1b0300f4666b1cd72100a6472709daaf.tar.bz2 px4-firmware-503ebddc1b0300f4666b1cd72100a6472709daaf.zip |
Merged upstream master into gnss_rework branch
Diffstat (limited to 'src/drivers/gps/gps.cpp')
-rw-r--r-- | src/drivers/gps/gps.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp index 6ae325297..1d8ef1b99 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -302,8 +302,8 @@ GPS::task_main() _report_gps_pos.p_variance_m = 10.0f; _report_gps_pos.c_variance_rad = 0.1f; _report_gps_pos.fix_type = 3; - _report_gps_pos.eph_m = 0.9f; - _report_gps_pos.epv_m = 1.8f; + _report_gps_pos.eph = 0.9f; + _report_gps_pos.epv = 1.8f; _report_gps_pos.timestamp_velocity = hrt_absolute_time(); _report_gps_pos.vel_n_m_s = 0.0f; _report_gps_pos.vel_e_m_s = 0.0f; @@ -487,7 +487,7 @@ GPS::print_info() warnx("position lock: %dD, satellites: %d, last update: %8.4fms ago", (int)_report_gps_pos.fix_type, _report_gps_pos.satellites_used, (double)(hrt_absolute_time() - _report_gps_pos.timestamp_position) / 1000.0); warnx("lat: %d, lon: %d, alt: %d", _report_gps_pos.lat, _report_gps_pos.lon, _report_gps_pos.alt); - warnx("eph: %.2fm, epv: %.2fm", (double)_report_gps_pos.eph_m, (double)_report_gps_pos.epv_m); + warnx("eph: %.2fm, epv: %.2fm", (double)_report_gps_pos.eph, (double)_report_gps_pos.epv); warnx("rate position: \t%6.2f Hz", (double)_Helper->get_position_update_rate()); warnx("rate velocity: \t%6.2f Hz", (double)_Helper->get_velocity_update_rate()); warnx("rate publication:\t%6.2f Hz", (double)_rate); |