AP_NavEKF2: avoid use of undefined #defines

Ensure EKF_DISABLE_INTERRUPTS is defined

Do not define MATH_CHECK_INDEXES, assume it is defined
This commit is contained in:
Peter Barker 2016-01-21 11:45:56 +11:00 committed by Lucas De Marchi
parent 11760c33f6
commit 475a2040a1
1 changed files with 2 additions and 3 deletions

View File

@ -23,8 +23,7 @@
#pragma GCC optimize("O3") #pragma GCC optimize("O3")
// #define MATH_CHECK_INDEXES 1 #define EK2_DISABLE_INTERRUPTS 0
// #define EK2_DISABLE_INTERRUPTS 1
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
@ -269,7 +268,7 @@ private:
uint8_t imu_buffer_length; uint8_t imu_buffer_length;
typedef float ftype; typedef float ftype;
#if defined(MATH_CHECK_INDEXES) && (MATH_CHECK_INDEXES == 1) #if MATH_CHECK_INDEXES
typedef VectorN<ftype,2> Vector2; typedef VectorN<ftype,2> Vector2;
typedef VectorN<ftype,3> Vector3; typedef VectorN<ftype,3> Vector3;
typedef VectorN<ftype,4> Vector4; typedef VectorN<ftype,4> Vector4;