diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-06 17:17:41 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-06 17:17:41 +0200 |
| commit | d78c3a224267f4dbd1fac72e893c81b83b43df9b (patch) | |
| tree | 017bbbaf5f885fcf375f221127d45123cf0fba3b /src/modules/navigator/loiter.h | |
| parent | 9bfae10b73406ca4f6600a0441c6edf5077f1446 (diff) | |
| download | px4-firmware-d78c3a224267f4dbd1fac72e893c81b83b43df9b.tar.gz px4-firmware-d78c3a224267f4dbd1fac72e893c81b83b43df9b.tar.bz2 px4-firmware-d78c3a224267f4dbd1fac72e893c81b83b43df9b.zip | |
navigator: new class structure, loiter and mission working
Diffstat (limited to 'src/modules/navigator/loiter.h')
| -rw-r--r-- | src/modules/navigator/loiter.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/modules/navigator/loiter.h b/src/modules/navigator/loiter.h index 4ae265e44..a83b53f43 100644 --- a/src/modules/navigator/loiter.h +++ b/src/modules/navigator/loiter.h @@ -44,11 +44,10 @@ #include <controllib/blocks.hpp> #include <controllib/block/BlockParam.hpp> -#include "mission.h" +#include "navigator_mode.h" +#include "mission_block.h" -class Navigator; - -class Loiter : public Mission +class Loiter : public NavigatorMode, MissionBlock { public: /** @@ -59,11 +58,17 @@ public: /** * Destructor */ - virtual ~Loiter(); + ~Loiter(); - virtual bool update(struct position_setpoint_triplet_s *pos_sp_triplet); + /** + * This function is called while the mode is inactive + */ + bool update(struct position_setpoint_triplet_s *pos_sp_triplet); - virtual void reset(); + /** + * This function is called while the mode is active + */ + void reset(); }; #endif |