diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-09 16:09:33 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-09 16:09:33 +0200 |
commit | 5886e93a33329d39dc2ea535d224fcd60ab7afd7 (patch) | |
tree | c762d2f0cedae6608dde7935b23a65188548055f /src/drivers/gps/mtk.h | |
parent | 614bbb15109236c353c02b1d2c2494bc442a699f (diff) | |
parent | 27a25b5e172c972e4f9f31c2a30114498346bb08 (diff) | |
download | px4-firmware-5886e93a33329d39dc2ea535d224fcd60ab7afd7.tar.gz px4-firmware-5886e93a33329d39dc2ea535d224fcd60ab7afd7.tar.bz2 px4-firmware-5886e93a33329d39dc2ea535d224fcd60ab7afd7.zip |
Merge branch 'gps_vel' of github.com:PX4/Firmware
Diffstat (limited to 'src/drivers/gps/mtk.h')
-rw-r--r-- | src/drivers/gps/mtk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/gps/mtk.h b/src/drivers/gps/mtk.h index d4e390b01..b5cfbf0a6 100644 --- a/src/drivers/gps/mtk.h +++ b/src/drivers/gps/mtk.h @@ -87,14 +87,14 @@ class MTK : public GPS_Helper public: MTK(const int &fd, struct vehicle_gps_position_s *gps_position); ~MTK(); - int receive(unsigned timeout); - int configure(unsigned &baudrate); + int receive(unsigned timeout); + int configure(unsigned &baudrate); private: /** * Parse the binary MTK packet */ - int parse_char(uint8_t b, gps_mtk_packet_t &packet); + int parse_char(uint8_t b, gps_mtk_packet_t &packet); /** * Handle the package once it has arrived |