diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-12 19:37:25 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-12 19:37:25 +0200 |
| commit | 3b39a8a789e347e318375ebe18c583eabec0501c (patch) | |
| tree | 233588bb3218cc3d3a1f0497c25784385bb45bd6 /src/modules/navigator/navigator_main.cpp | |
| parent | 59ae8cc054e941aa28edb2b668732ff4024e1cd5 (diff) | |
| download | px4-firmware-3b39a8a789e347e318375ebe18c583eabec0501c.tar.gz px4-firmware-3b39a8a789e347e318375ebe18c583eabec0501c.tar.bz2 px4-firmware-3b39a8a789e347e318375ebe18c583eabec0501c.zip | |
navigator: rename update and reset calls to on_active and on_inactive
Diffstat (limited to 'src/modules/navigator/navigator_main.cpp')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 20cff5c28..a3c190c7f 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -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 */ |