diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-22 12:05:12 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-22 12:05:12 +0200 |
commit | c38e692ebb41cc96aec4113a9036e266d91922dc (patch) | |
tree | b255cccdc015ff20207c2926f6ae21f5cc5a6ee1 /src | |
parent | 5a543540444630ceb348eee463c9bda60fc9ff1b (diff) | |
parent | 9eb4e05c9dd1c9116fbe58da76fa5f750cc8911a (diff) | |
download | px4-firmware-c38e692ebb41cc96aec4113a9036e266d91922dc.tar.gz px4-firmware-c38e692ebb41cc96aec4113a9036e266d91922dc.tar.bz2 px4-firmware-c38e692ebb41cc96aec4113a9036e266d91922dc.zip |
Merge branch 'master' into mixer_fix
Diffstat (limited to 'src')
-rw-r--r-- | src/drivers/drv_gps.h | 3 | ||||
-rw-r--r-- | src/drivers/gps/gps.cpp | 15 | ||||
-rw-r--r-- | src/drivers/gps/ubx.cpp | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/drivers/drv_gps.h b/src/drivers/drv_gps.h index 1dda8ef0b..398cf4870 100644 --- a/src/drivers/drv_gps.h +++ b/src/drivers/drv_gps.h @@ -51,8 +51,7 @@ typedef enum { GPS_DRIVER_MODE_NONE = 0, GPS_DRIVER_MODE_UBX, - GPS_DRIVER_MODE_MTK, - GPS_DRIVER_MODE_NMEA, + GPS_DRIVER_MODE_MTK } gps_driver_mode_t; diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp index a84cb8e59..fc500a9ec 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -279,10 +279,6 @@ GPS::task_main() _Helper = new MTK(_serial_fd, &_report); break; - case GPS_DRIVER_MODE_NMEA: - //_Helper = new NMEA(); //TODO: add NMEA - break; - default: break; } @@ -328,10 +324,6 @@ GPS::task_main() mode_str = "MTK"; break; - case GPS_DRIVER_MODE_NMEA: - mode_str = "NMEA"; - break; - default: break; } @@ -362,9 +354,6 @@ GPS::task_main() _mode = GPS_DRIVER_MODE_UBX; break; - // case GPS_DRIVER_MODE_NMEA: - // _mode = GPS_DRIVER_MODE_UBX; - // break; default: break; } @@ -400,10 +389,6 @@ GPS::print_info() warnx("protocol: MTK"); break; - case GPS_DRIVER_MODE_NMEA: - warnx("protocol: NMEA"); - break; - default: break; } diff --git a/src/drivers/gps/ubx.cpp b/src/drivers/gps/ubx.cpp index 0b25b379f..86291901c 100644 --- a/src/drivers/gps/ubx.cpp +++ b/src/drivers/gps/ubx.cpp @@ -281,7 +281,6 @@ UBX::receive(unsigned timeout) return 1; } else { - warnx("ubx: timeout - no messages"); return -1; } |