aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_NavEKF: avoid use of undefined #defines

Browse Source 
Ensure EKF_DISABLE_INTERRUPTS is defined

Do not define MATH_CHECK_INDEXES, assume it is defined
This commit is contained in:
Peter Barker 2016-02-15 09:35:25 +11:00 committed by Lucas De Marchi
parent 80bc7a50d7
commit 11760c33f6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_NavEKF/AP_NavEKF.h
View File

@ -31,8 +31,6 @@
#include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_RangeFinder/AP_RangeFinder.h>
// #define MATH_CHECK_INDEXES 1
#include <AP_Math/vectorN.h>
// GPS pre-flight check bit locations

5
libraries/AP_NavEKF/AP_NavEKF_core.h
View File

@ -35,8 +35,7 @@
#define OPT_MATHS
#endif
// #define MATH_CHECK_INDEXES 1
// #define EKF_DISABLE_INTERRUPTS 1
#define EKF_DISABLE_INTERRUPTS 0
#include <AP_Math/vectorN.h>
@ -58,7 +57,7 @@ public:
friend class NavEKF;
typedef float ftype;
#if defined(MATH_CHECK_INDEXES) && (MATH_CHECK_INDEXES == 1)
#if MATH_CHECK_INDEXES
typedef VectorN<ftype,2> Vector2;
typedef VectorN<ftype,3> Vector3;
typedef VectorN<ftype,4> Vector4;