diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 15:11:06 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-13 15:11:06 +0200 |
commit | d84cbd008c80aab8057fbdef94f57073e437ec56 (patch) | |
tree | 770235aa6a24568d3261e4e74f1c26ccda5ed6b7 /src/modules/navigator/rtl.h | |
parent | 842e7c3df92f5004578f4ae5a7a26300d8a1a419 (diff) | |
parent | e14d4751423e21a9ce052e1f6760f929d3694515 (diff) | |
download | px4-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/rtl.h')
-rw-r--r-- | src/modules/navigator/rtl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/navigator/rtl.h b/src/modules/navigator/rtl.h index 9836f5064..bcccf7454 100644 --- a/src/modules/navigator/rtl.h +++ b/src/modules/navigator/rtl.h @@ -70,7 +70,7 @@ public: /** * This function is called while the mode is inactive */ - void reset(); + void on_inactive(); /** * This function is called while the mode is active @@ -78,7 +78,7 @@ public: * @param position setpoint triplet that needs to be set * @return true if updated */ - bool update(position_setpoint_triplet_s *pos_sp_triplet); + bool on_active(position_setpoint_triplet_s *pos_sp_triplet); private: |