aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/gps/mtk.cpp
diff options
context:
space:
mode:
authorKynos <mail01@delago.net>2014-06-30 01:34:12 +0200
committerKynos <mail01@delago.net>2014-06-30 01:34:12 +0200
commit503ebddc1b0300f4666b1cd72100a6472709daaf (patch)
treeafa624230cc3726b2527ac3d1f646b3afe66aaa2 /src/drivers/gps/mtk.cpp
parentf1a5be1f57d9a15f29a428e962c3ed7f75777d22 (diff)
parent28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff)
downloadpx4-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/mtk.cpp')
-rw-r--r--src/drivers/gps/mtk.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/gps/mtk.cpp b/src/drivers/gps/mtk.cpp
index 7b957e55d..c4f4f7bec 100644
--- a/src/drivers/gps/mtk.cpp
+++ b/src/drivers/gps/mtk.cpp
@@ -251,16 +251,16 @@ MTK::handle_message(gps_mtk_packet_t &packet)
_gps_position->lon = 0;
// Indicate this data is not usable and bail out
- _gps_position->eph_m = 1000.0f;
- _gps_position->epv_m = 1000.0f;
+ _gps_position->eph = 1000.0f;
+ _gps_position->epv = 1000.0f;
_gps_position->fix_type = 0;
return;
}
_gps_position->alt = (int32_t)(packet.msl_altitude * 10); // from cm to mm
_gps_position->fix_type = packet.fix_type;
- _gps_position->eph_m = packet.hdop / 100.0f; // from cm to m
- _gps_position->epv_m = _gps_position->eph_m; // unknown in mtk custom mode, so we cheat with eph
+ _gps_position->eph = packet.hdop / 100.0f; // from cm to m
+ _gps_position->epv = _gps_position->eph; // unknown in mtk custom mode, so we cheat with eph
_gps_position->vel_m_s = ((float)packet.ground_speed) * 1e-2f; // from cm/s to m/s
_gps_position->cog_rad = ((float)packet.heading) * M_DEG_TO_RAD_F * 1e-2f; //from deg *100 to rad
_gps_position->satellites_used = packet.satellites;