aboutsummaryrefslogtreecommitdiff
path: root/src/modules/navigator/mission.cpp
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-06-13 15:11:06 +0200
committerAnton Babushkin <anton.babushkin@me.com>2014-06-13 15:11:06 +0200
commitd84cbd008c80aab8057fbdef94f57073e437ec56 (patch)
tree770235aa6a24568d3261e4e74f1c26ccda5ed6b7 /src/modules/navigator/mission.cpp
parent842e7c3df92f5004578f4ae5a7a26300d8a1a419 (diff)
parente14d4751423e21a9ce052e1f6760f929d3694515 (diff)
downloadpx4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.tar.gz
px4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.tar.bz2
px4-firmware-d84cbd008c80aab8057fbdef94f57073e437ec56.zip
Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/navigator/mission.cpp')
-rw-r--r--src/modules/navigator/mission.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp
index a551df9a2..9244063b1 100644
--- a/src/modules/navigator/mission.cpp
+++ b/src/modules/navigator/mission.cpp
@@ -72,7 +72,7 @@ Mission::Mission(Navigator *navigator, const char *name) :
/* load initial params */
updateParams();
/* set initial mission items */
- reset();
+ on_inactive();
}
@@ -81,7 +81,7 @@ Mission::~Mission()
}
void
-Mission::reset()
+Mission::on_inactive()
{
_first_run = true;
@@ -100,7 +100,7 @@ Mission::reset()
}
bool
-Mission::update(struct position_setpoint_triplet_s *pos_sp_triplet)
+Mission::on_active(struct position_setpoint_triplet_s *pos_sp_triplet)
{
bool updated = false;