aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-28 12:12:08 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-28 12:12:08 +0200
commit196edd8a4faa36f837ff440ed41fc9656f96e20f (patch)
tree1eba4e76e99ed07a256ee5b019e09b0f051d4d77 /src
parent12c2802fa396d40fe9fc45f384352d9eff23ced0 (diff)
downloadpx4-firmware-196edd8a4faa36f837ff440ed41fc9656f96e20f.tar.gz
px4-firmware-196edd8a4faa36f837ff440ed41fc9656f96e20f.tar.bz2
px4-firmware-196edd8a4faa36f837ff440ed41fc9656f96e20f.zip
estimator: Fix minor reporting issues
Diffstat (limited to 'src')
-rw-r--r--src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp12
1 files changed, 6 insertions, 6 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 f1ae3f5e5..334177ad8 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
@@ -644,7 +644,7 @@ FixedwingEstimator::check_filter_state()
rep.health_flags |= (((uint8_t)ekf_report.velHealth) << 0);
rep.health_flags |= (((uint8_t)ekf_report.posHealth) << 1);
rep.health_flags |= (((uint8_t)ekf_report.hgtHealth) << 2);
- rep.health_flags |= (((uint8_t)ekf_report.gyroOffsetsExcessive) << 3);
+ rep.health_flags |= (((uint8_t)!ekf_report.gyroOffsetsExcessive) << 3);
rep.timeout_flags |= (((uint8_t)ekf_report.velTimeout) << 0);
rep.timeout_flags |= (((uint8_t)ekf_report.posTimeout) << 1);
@@ -655,14 +655,14 @@ FixedwingEstimator::check_filter_state()
if (rep.health_flags < ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))) {
warnx("health: VEL:%s POS:%s HGT:%s OFFS:%s",
- ((rep.timeout_flags & (1 << 0)) ? "OK" : "ERR"),
- ((rep.timeout_flags & (1 << 1)) ? "OK" : "ERR"),
- ((rep.timeout_flags & (1 << 2)) ? "OK" : "ERR"),
- ((rep.timeout_flags & (1 << 3)) ? "OK" : "ERR"));
+ ((rep.health_flags & (1 << 0)) ? "OK" : "ERR"),
+ ((rep.health_flags & (1 << 1)) ? "OK" : "ERR"),
+ ((rep.health_flags & (1 << 2)) ? "OK" : "ERR"),
+ ((rep.health_flags & (1 << 3)) ? "OK" : "ERR"));
}
if (rep.timeout_flags) {
- warnx("timeout: %s%s%s",
+ warnx("timeout: %s%s%s%s",
((rep.timeout_flags & (1 << 0)) ? "VEL " : ""),
((rep.timeout_flags & (1 << 1)) ? "POS " : ""),
((rep.timeout_flags & (1 << 2)) ? "HGT " : ""),