fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 13:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

navigator: rename update and reset calls to on_active and on_inactive

Browse Source
This commit is contained in:
Julian Oes
2014-06-12 19:37:25 +02:00
parent 59ae8cc054
commit 3b39a8a789
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+6 -6
View File
@@ -365,21 +365,21 @@ Navigator::task_main()
/* TODO: make list of modes and loop through it */
if (_navigation_mode == &_mission) {
_update_triplet = _mission.update(&_pos_sp_triplet);
_update_triplet = _mission.on_active(&_pos_sp_triplet);
} else {
_mission.reset();
_mission.on_inactive();
}
if (_navigation_mode == &_rtl) {
_update_triplet = _rtl.update(&_pos_sp_triplet);
_update_triplet = _rtl.on_active(&_pos_sp_triplet);
} else {
_rtl.reset();
_rtl.on_inactive();
}
if (_navigation_mode == &_loiter) {
_update_triplet = _loiter.update(&_pos_sp_triplet);
_update_triplet = _loiter.on_active(&_pos_sp_triplet);
} else {
_loiter.reset();
_loiter.on_inactive();
}
/* if nothing is running, set position setpoint triplet invalid */