Browse Source

Merge pull request #115 from PX4/fix_isfinite_again

ekf: another stab at fixing isfinite for all
master
Paul Riseborough 9 years ago
parent
commit
4c9c102597
  1. 17
      EKF/ekf.cpp

17
EKF/ekf.cpp

@ -42,6 +42,21 @@ @@ -42,6 +42,21 @@
#include "ekf.h"
#include "mathlib.h"
#ifndef __PX4_QURT
#if defined(__cplusplus) && !defined(__PX4_NUTTX)
#include <cmath>
#define ISFINITE(x) std::isfinite(x)
#else
#define ISFINITE(x) isfinite(x)
#endif
#endif
#if defined(__PX4_QURT)
// Missing math.h defines
#define ISFINITE(x) __builtin_isfinite(x)
#endif
Ekf::Ekf():
_filter_initialised(false),
_earth_rate_initialised(false),
@ -343,7 +358,7 @@ bool Ekf::update() @@ -343,7 +358,7 @@ bool Ekf::update()
calculateOutputStates();
// check for NaN or inf on attitude states
if (!std::isfinite(_state.quat_nominal(0)) || !std::isfinite(_output_new.quat_nominal(0))) {
if (!ISFINITE(_state.quat_nominal(0)) || !ISFINITE(_output_new.quat_nominal(0))) {
return false;
}

Loading…
Cancel
Save