diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-27 11:41:34 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-27 11:41:34 +0200 |
| commit | 03d87c2660202ca0980157cd2b4e8cd2312caf57 (patch) | |
| tree | 2ef2a6785da63742f457f71ef7a8a94cd0f79e28 /src/drivers/gps | |
| parent | 721c90291c12405b4f4a6cf5ddc9ca8cec9f0077 (diff) | |
| parent | 6ab878c0218f26e5fa71053b75d7075b594b937e (diff) | |
| download | px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.tar.gz px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.tar.bz2 px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.zip | |
Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init
Conflicts:
src/drivers/gps/gps.cpp
Diffstat (limited to 'src/drivers/gps')
| -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 f05f4a409..7f65e37b1 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -276,14 +276,14 @@ GPS::task_main() _report.timestamp_position = hrt_absolute_time(); _report.lat = (int32_t)47.378301e7f; _report.lon = (int32_t)8.538777e7f; - _report.alt = (int32_t)400e3f; + _report.alt = (int32_t)1200e3f; _report.timestamp_variance = hrt_absolute_time(); _report.s_variance_m_s = 10.0f; _report.p_variance_m = 10.0f; _report.c_variance_rad = 0.1f; _report.fix_type = 3; - _report.eph = 3.0f; - _report.epv = 7.0f; + _report.eph = 0.9f; + _report.epv = 1.8f; _report.timestamp_velocity = hrt_absolute_time(); _report.vel_n_m_s = 0.0f; _report.vel_e_m_s = 0.0f; |