diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
| commit | 478f923331cb8c3fd0e98a99afee462e4e158d44 (patch) | |
| tree | 59242aaa2fd8df814317e96117648fc4598c50c3 /src/drivers/gps/gps.cpp | |
| parent | 8a25c48071ed794b33e23f7ff7737cded58bea11 (diff) | |
| parent | 3c5f35da73cb6c37cf45a06909631e13b762f76d (diff) | |
| download | px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.gz px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.bz2 px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.zip | |
Merged master into mpc_in_flight_lock
Diffstat (limited to 'src/drivers/gps/gps.cpp')
| -rw-r--r-- | src/drivers/gps/gps.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp index 5342ccf78..dd505abdb 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -280,8 +280,8 @@ GPS::task_main() _report.p_variance_m = 10.0f; _report.c_variance_rad = 0.1f; _report.fix_type = 3; - _report.eph_m = 0.9f; - _report.epv_m = 1.8f; + _report.eph = 0.9f; + _report.epv = 1.8f; _report.timestamp_velocity = hrt_absolute_time(); _report.vel_n_m_s = 0.0f; _report.vel_e_m_s = 0.0f; @@ -357,7 +357,7 @@ GPS::task_main() } if (!_healthy) { - char *mode_str = "unknown"; + const char *mode_str = "unknown"; switch (_mode) { case GPS_DRIVER_MODE_UBX: @@ -449,9 +449,9 @@ GPS::print_info() if (_report.timestamp_position != 0) { warnx("position lock: %dD, satellites: %d, last update: %8.4fms ago", (int)_report.fix_type, - _report.satellites_visible, (double)(hrt_absolute_time() - _report.timestamp_position) / 1000.0f); + _report.satellites_visible, (double)(hrt_absolute_time() - _report.timestamp_position) / 1000.0d); warnx("lat: %d, lon: %d, alt: %d", _report.lat, _report.lon, _report.alt); - warnx("eph: %.2fm, epv: %.2fm", (double)_report.eph_m, (double)_report.epv_m); + warnx("eph: %.2fm, epv: %.2fm", (double)_report.eph, (double)_report.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); @@ -578,7 +578,7 @@ gps_main(int argc, char *argv[]) { /* set to default */ - char *device_name = GPS_DEFAULT_UART_PORT; + const char *device_name = GPS_DEFAULT_UART_PORT; bool fake_gps = false; /* |