diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 14:31:19 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 14:31:19 +0200 |
commit | e14d4751423e21a9ce052e1f6760f929d3694515 (patch) | |
tree | 6e6ad9afbf8859c09660a569b41a8433ce97e35b /src/modules | |
parent | 3b39a8a789e347e318375ebe18c583eabec0501c (diff) | |
download | px4-firmware-e14d4751423e21a9ce052e1f6760f929d3694515.tar.gz px4-firmware-e14d4751423e21a9ce052e1f6760f929d3694515.tar.bz2 px4-firmware-e14d4751423e21a9ce052e1f6760f929d3694515.zip |
navigator: update Loiter navigator mode to use new method names
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/navigator/loiter.cpp | 6 | ||||
-rw-r--r-- | src/modules/navigator/loiter.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/navigator/loiter.cpp b/src/modules/navigator/loiter.cpp index 035d035e1..8bbb79d5e 100644 --- a/src/modules/navigator/loiter.cpp +++ b/src/modules/navigator/loiter.cpp @@ -59,7 +59,7 @@ Loiter::Loiter(Navigator *navigator, const char *name) : /* load initial params */ updateParams(); /* initial reset */ - reset(); + on_inactive(); } Loiter::~Loiter() @@ -67,14 +67,14 @@ Loiter::~Loiter() } bool -Loiter::update(struct position_setpoint_triplet_s *pos_sp_triplet) +Loiter::on_active(struct position_setpoint_triplet_s *pos_sp_triplet) { /* set loiter item, don't reuse an existing position setpoint */ return set_loiter_item(false, pos_sp_triplet);; } void -Loiter::reset() +Loiter::on_inactive() { } diff --git a/src/modules/navigator/loiter.h b/src/modules/navigator/loiter.h index a83b53f43..685ae6141 100644 --- a/src/modules/navigator/loiter.h +++ b/src/modules/navigator/loiter.h @@ -63,12 +63,12 @@ public: /** * This function is called while the mode is inactive */ - bool update(struct position_setpoint_triplet_s *pos_sp_triplet); + virtual void on_inactive(); /** * This function is called while the mode is active */ - void reset(); + virtual bool on_active(struct position_setpoint_triplet_s *pos_sp_triplet); }; #endif |