dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

navigator: update Loiter navigator mode to use new method names

This commit is contained in:
Anton Babushkin 2014-06-13 14:31:19 +02:00
parent 3b39a8a789
commit e14d475142
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/navigator/loiter.cpp
View File

@ -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()
{
}

4
src/modules/navigator/loiter.h
View File

@ -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