aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-03-03 14:23:49 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-03-03 14:23:49 +0100
commita16742f2eb740adef925cc0d1c90faceaceb97b9 (patch)
treeba1d0a7289269e8e87cc75eb5c797e1bd2f0c14d /src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp
parent862ad8fc5801658a847291352190e95996f08f78 (diff)
downloadpx4-firmware-a16742f2eb740adef925cc0d1c90faceaceb97b9.tar.gz
px4-firmware-a16742f2eb740adef925cc0d1c90faceaceb97b9.tar.bz2
px4-firmware-a16742f2eb740adef925cc0d1c90faceaceb97b9.zip
Fixes to altitude units
Diffstat (limited to 'src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp')
-rw-r--r--src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp b/src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp
index d59805222..082c695dc 100644
--- a/src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp
+++ b/src/modules/fw_att_pos_estimator/fw_att_pos_estimator_main.cpp
@@ -701,23 +701,24 @@ FixedwingEstimator::task_main()
velNED[0] = _gps.vel_n_m_s;
velNED[1] = _gps.vel_e_m_s;
velNED[2] = _gps.vel_d_m_s;
+
+ double lat = _gps.lat * 1e-7;
+ double lon = _gps.lon * 1e-7;
+ float alt = _gps.alt * 1e-3;
+
InitialiseFilter(velNED);
// Initialize projection
_local_pos.ref_lat = _gps.lat;
_local_pos.ref_lon = _gps.lon;
- _local_pos.ref_alt = _gps.alt;
+ _local_pos.ref_alt = alt;
_local_pos.ref_timestamp = _gps.timestamp_position;
// Store
_baro_ref = baroHgt;
- _baro_gps_offset = baroHgt - _gps.alt;
+ _baro_gps_offset = baroHgt - alt;
// XXX this is not multithreading safe
- double lat = _gps.lat * 1e-7;
- double lon = _gps.lon * 1e-7;
- float alt = _gps.alt * 1e-3;
-
map_projection_init(lat, lon);
mavlink_log_info(_mavlink_fd, "[position estimator] init ref: lat=%.7f, lon=%.7f, alt=%.2f", lat, lon, alt);