diff options
| author | Andrew Chambers <achamber@gmail.com> | 2014-06-12 16:22:04 -0700 |
|---|---|---|
| committer | Andrew Chambers <achamber@gmail.com> | 2014-06-12 16:22:04 -0700 |
| commit | e53c2ab98504cf398a48f5051383796a1ad4b85e (patch) | |
| tree | 9859a55fd931aa205bfc48b024f692d0e301713d /src/modules/navigator/navigator.h | |
| parent | 9bb8b12f43de3aa4e7f24c516e7e8e7e9e6c196d (diff) | |
| download | px4-firmware-e53c2ab98504cf398a48f5051383796a1ad4b85e.tar.gz px4-firmware-e53c2ab98504cf398a48f5051383796a1ad4b85e.tar.bz2 px4-firmware-e53c2ab98504cf398a48f5051383796a1ad4b85e.zip | |
Switched to using c-type arrays
Diffstat (limited to 'src/modules/navigator/navigator.h')
| -rw-r--r-- | src/modules/navigator/navigator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/navigator/navigator.h b/src/modules/navigator/navigator.h index dfa939c38..929de0259 100644 --- a/src/modules/navigator/navigator.h +++ b/src/modules/navigator/navigator.h @@ -40,8 +40,6 @@ #ifndef NAVIGATOR_H #define NAVIGATOR_H -#include <vector> - #include <systemlib/perf_counter.h> #include <controllib/blocks.hpp> @@ -60,6 +58,8 @@ #include "rtl.h" #include "geofence.h" +#define NAVIGATOR_MODE_ARRAY_SIZE 3 + class Navigator : public control::SuperBlock { public: @@ -155,7 +155,7 @@ private: Loiter _loiter; /**< class that handles loiter */ RTL _rtl; /**< class that handles RTL */ - std::vector<NavigatorMode*> _navigation_mode_vector; + NavigatorMode *_navigation_mode_array[NAVIGATOR_MODE_ARRAY_SIZE]; /**< array of navigation modes */ bool _is_in_loiter; /**< flags if current position SP can be used to loiter */ bool _update_triplet; /**< flags if position SP triplet needs to be published */ |