diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-30 12:31:06 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-30 12:31:06 +0200 |
commit | 1a6b2b9c1ebd127a662051393d266e2815d09524 (patch) | |
tree | ce18d2597a2e61d56247360b20ee8e05942fade3 /src/drivers/gps/gps.cpp | |
parent | 72071cdcd39cae6be8533e67d01cbc7533ca6cb1 (diff) | |
parent | 857b843d445f59f2dc393e4d5f879fc56f77a0e0 (diff) | |
download | px4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.tar.gz px4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.tar.bz2 px4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.zip |
Merge branch 'master' into dataman_state_nav_rewrite
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 8560716e9..dd505abdb 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -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,7 +449,7 @@ 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, (double)_report.epv); warnx("rate position: \t%6.2f Hz", (double)_Helper->get_position_update_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; /* |