diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 16:51:37 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 16:51:37 +0200 |
commit | 842e7c3df92f5004578f4ae5a7a26300d8a1a419 (patch) | |
tree | 744c60b19f1900f3dad86295cfd6341efa5e8af2 /src/modules/uORB/topics/mission.h | |
parent | 2951962c2104a0b2a284a7c5208171b257ed9734 (diff) | |
parent | f4898b94c6fd86d9087ee98634cf543fc1fdcbeb (diff) | |
download | px4-firmware-842e7c3df92f5004578f4ae5a7a26300d8a1a419.tar.gz px4-firmware-842e7c3df92f5004578f4ae5a7a26300d8a1a419.tar.bz2 px4-firmware-842e7c3df92f5004578f4ae5a7a26300d8a1a419.zip |
Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/uORB/topics/mission.h')
-rw-r--r-- | src/modules/uORB/topics/mission.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h index 5f3cbcb1d..4bcaaaa5a 100644 --- a/src/modules/uORB/topics/mission.h +++ b/src/modules/uORB/topics/mission.h @@ -1,9 +1,6 @@ /**************************************************************************** * * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * Author: @author Thomas Gubler <thomasgubler@student.ethz.ch> - * @author Julian Oes <joes@student.ethz.ch> - * @author Lorenz Meier <lm@inf.ethz.ch> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +34,9 @@ /** * @file mission.h * Definition of a mission consisting of mission items. + * @author Thomas Gubler <thomasgubler@student.ethz.ch> + * @author Julian Oes <joes@student.ethz.ch> + * @author Lorenz Meier <lm@inf.ethz.ch> */ #ifndef TOPIC_MISSION_H_ @@ -58,7 +58,8 @@ enum NAV_CMD { NAV_CMD_LAND=21, NAV_CMD_TAKEOFF=22, NAV_CMD_ROI=80, - NAV_CMD_PATHPLANNING=81 + NAV_CMD_PATHPLANNING=81, + NAV_CMD_DO_JUMP=177 }; enum ORIGIN { @@ -91,6 +92,9 @@ struct mission_item_s { float pitch_min; /**< minimal pitch angle for fixed wing takeoff waypoints */ bool autocontinue; /**< true if next waypoint should follow after this one */ enum ORIGIN origin; /**< where the waypoint has been generated */ + int do_jump_mission_index; /**< index where the do jump will go to */ + unsigned do_jump_repeat_count; /**< how many times do jump needs to be done */ + unsigned do_jump_current_count; /**< count how many times the jump has been done */ }; struct mission_s |