aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-01-19 20:18:44 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-01-19 20:18:44 +0100
commitfa4d09018527676d3803582a432df8e25c8e5010 (patch)
tree69c04dcbfe7451b09bb354ccc03042efdd17d77a /src
parent8c8315044c4c085a6b8f45f5375a28d19ea655ec (diff)
downloadpx4-firmware-fa4d09018527676d3803582a432df8e25c8e5010.tar.gz
px4-firmware-fa4d09018527676d3803582a432df8e25c8e5010.tar.bz2
px4-firmware-fa4d09018527676d3803582a432df8e25c8e5010.zip
Hotfix: Fix EKF estimator and remove debug output which should not have been on master anyway
Diffstat (limited to 'src')
-rw-r--r--src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp b/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
index 3237a1e20..923aa2861 100644
--- a/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
+++ b/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
*
- * Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
+ * Copyright (c) 2013-2015 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -1518,12 +1518,6 @@ FixedwingEstimator::task_main()
_global_pos.timestamp = _local_pos.timestamp;
- // FIXME: usurp terrain alt field for baro_gps_offset
- _global_pos.terrain_alt = _baro_gps_offset;
- _global_pos.terrain_alt_valid = true;
- _global_pos.eph = _baro_alt_filt;
- _global_pos.epv = _gps_alt_filt;
-
/* lazily publish the global position only once available */
if (_global_pos_pub > 0) {
/* publish the global position */