Skip to content

Commit 078e4c9

Browse files
dakejahldagar
andauthored
ekf: always publish baro and gnss bias even if zero (#25385)
* ekf: always publish baro and gnss bias even if zero * [SQUASH] ekf2: simplify hgt bias publish --------- Co-authored-by: Daniel Agar <daniel@agar.ca>
1 parent eef01b1 commit 078e4c9

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/modules/ekf2/EKF/aid_sources/barometer/baro_height_control.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ void Ekf::controlBaroHeightFusion(const imuSample &imu_sample)
4545
auto &aid_src = _aid_src_baro_hgt;
4646
HeightBiasEstimator &bias_est = _baro_b_est;
4747

48+
if (_params.ekf2_baro_ctrl == 0) {
49+
stopBaroHgtFusion();
50+
return;
51+
}
52+
4853
bias_est.predict(_dt_ekf_avg);
4954

5055
baroSample baro_sample;

src/modules/ekf2/EKF2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ void EKF2::PublishBaroBias(const hrt_abstime &timestamp)
10411041
if (_ekf.aid_src_baro_hgt().timestamp_sample != 0) {
10421042
const BiasEstimator::status &status = _ekf.getBaroBiasEstimatorStatus();
10431043

1044-
if (fabsf(status.bias - _last_baro_bias_published) > 0.001f) {
1044+
if (fabsf(status.bias - _last_baro_bias_published) > 1e-6f) {
10451045
_estimator_baro_bias_pub.publish(fillEstimatorBiasMsg(status, _ekf.aid_src_baro_hgt().timestamp_sample, timestamp,
10461046
_device_id_baro));
10471047

@@ -1057,7 +1057,7 @@ void EKF2::PublishGnssHgtBias(const hrt_abstime &timestamp)
10571057
if (_ekf.get_gps_sample_delayed().time_us != 0) {
10581058
const BiasEstimator::status &status = _ekf.getGpsHgtBiasEstimatorStatus();
10591059

1060-
if (fabsf(status.bias - _last_gnss_hgt_bias_published) > 0.001f) {
1060+
if (fabsf(status.bias - _last_gnss_hgt_bias_published) > 1e-6f) {
10611061
_estimator_gnss_hgt_bias_pub.publish(fillEstimatorBiasMsg(status, _ekf.get_gps_sample_delayed().time_us, timestamp));
10621062

10631063
_last_gnss_hgt_bias_published = status.bias;

0 commit comments

Comments
 (0)