diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-03 16:04:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-03 16:04:39 +0200 |
| commit | d1d03c34b9c649cdf382a6b2d5985260c3688ec5 (patch) | |
| tree | 5661a36a8921147f8b90baa9488d173c2ed07148 /src/drivers/gps | |
| parent | 854bb7fe089daf8bf3d4e9f2cac1cb2b99a67ac7 (diff) | |
| parent | da5b60adab798710f8f61940edfee73a1c46542a (diff) | |
| download | px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.tar.gz px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.tar.bz2 px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.zip | |
Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/drivers/gps')
| -rw-r--r-- | src/drivers/gps/ubx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/gps/ubx.cpp b/src/drivers/gps/ubx.cpp index 183b81ea9..6820fb73d 100644 --- a/src/drivers/gps/ubx.cpp +++ b/src/drivers/gps/ubx.cpp @@ -447,8 +447,8 @@ UBX::handle_message() gps_bin_nav_sol_packet_t *packet = (gps_bin_nav_sol_packet_t *) _rx_buffer; _gps_position->fix_type = packet->gpsFix; - _gps_position->s_variance_m_s = packet->sAcc; - _gps_position->p_variance_m = packet->pAcc; + _gps_position->s_variance_m_s = (float)packet->sAcc * 1e-2f; // from cm/s to m/s + _gps_position->p_variance_m = (float)packet->pAcc * 1e-2f; // from cm to m _gps_position->timestamp_variance = hrt_absolute_time(); ret = 1; |