diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-28 00:54:27 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-28 00:54:27 +0200 |
commit | 456e628e129b446d18246ab8ad312a15beea5996 (patch) | |
tree | aad2681e14611e69dbbd5ffcfa3580f22fd441fb /src/modules/navigator/mission_block.h | |
parent | affc312411b7634fa13bab6da8889de90f964ce8 (diff) | |
download | px4-firmware-456e628e129b446d18246ab8ad312a15beea5996.tar.gz px4-firmware-456e628e129b446d18246ab8ad312a15beea5996.tar.bz2 px4-firmware-456e628e129b446d18246ab8ad312a15beea5996.zip |
navigator: NavigatorMode and MissionBlock API cleanup
Diffstat (limited to 'src/modules/navigator/mission_block.h')
-rw-r--r-- | src/modules/navigator/mission_block.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/modules/navigator/mission_block.h b/src/modules/navigator/mission_block.h index f99002752..4f79238f4 100644 --- a/src/modules/navigator/mission_block.h +++ b/src/modules/navigator/mission_block.h @@ -64,6 +64,7 @@ public: */ virtual ~MissionBlock(); +protected: /** * Check if mission item has been reached * @return true if successfully reached @@ -88,19 +89,16 @@ public: void set_previous_pos_setpoint(struct position_setpoint_triplet_s *pos_sp_triplet); /** - * Set a loiter item, if possible reuse the position setpoint, otherwise take the current position - * - * @param the position setpoint triplet to set - * @return true if setpoint has changed + * Set a loiter mission item, if possible reuse the position setpoint, otherwise take the current position */ - bool set_loiter_item(position_setpoint_triplet_s *pos_sp_triplet); + // TODO remove argument, get position setpoint from navigator, add to arguments pointer to mission item instead + void set_loiter_item(struct position_setpoint_triplet_s *pos_sp_triplet); + mission_item_s _mission_item; + bool _mission_item_valid; bool _waypoint_position_reached; bool _waypoint_yaw_reached; hrt_abstime _time_first_inside_orbit; - - mission_item_s _mission_item; - bool _mission_item_valid; }; #endif |