Commit Graph
236 Commits
Author SHA1 Message Date
Thomas Gubler 0d7ae9276e Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/navigator/offboard.cpp
2014-07-08 11:06:47 +02:00
Lorenz Meier 512584ed75 Merge pull request #1145 from DonLakeFlyer/MoreWarnings
Fix compiler warnings
2014-07-08 07:32:36 +02:00
Don Gagne 680ebf29c3 Fix compiler warnings 2014-07-07 15:11:46 -07:00
Julian Oes 3b06a74074 navigator: adapt offboard class to new NavigatorMode API 2014-07-07 18:18:13 +02:00
Julian Oes 530e70bc46 navigator: forgot to fix conflicts 2014-07-07 15:13:27 +02:00
Julian Oes 407eafbdbb Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
2014-07-07 15:11:12 +02:00
Thomas Gubler 2d26e91392 WIP, change uorb offboard control sp topic 2014-07-07 13:00:45 +02:00
Anton Babushkin 829a317d23 navigator: takeoff altitude fixed 2014-07-04 15:49:02 +02:00
Anton Babushkin 904cfd7c49 Merge branch 'master' into navigator_rewrite_drton 2014-07-04 15:28:02 +02:00
Thomas Gubler 839710daf8 Update offboard control uorb topic
Work towards supporting the new external setpoint mavlink messages
2014-07-03 14:46:25 +02:00
Julian Oes 73d6121a9d Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/uORB/topics/rc_channels.h
2014-07-02 15:15:26 +02:00
Lorenz Meier 20de2da032 Navigator: Warning fixes 2014-06-30 12:20:23 +02:00
Anton Babushkin 59775efaad navigator: takeoff on start of mission implemented 2014-06-30 12:02:29 +02:00
Anton Babushkin a4315aee2e navigator: mission mode fixed 2014-06-30 10:47:08 +02:00
Anton Babushkin adf230ce4e navigator: more API changes, duplicate code removed 2014-06-29 15:35:34 +02:00
Anton Babushkin 0bf9c2a9b2 navigator: API changes, reparing to move manual modes to navigator, WIP 2014-06-29 14:09:22 +02:00
Anton Babushkin 12be974bd6 navigator: whitespace fix 2014-06-29 13:07:38 +02:00
Anton Babushkin 456e628e12 navigator: NavigatorMode and MissionBlock API cleanup 2014-06-28 00:54:27 +02:00
Julian Oes 93887f9f28 navigator: remove hacked scale factor for offboard control 2014-06-27 14:04:50 +02:00
Julian Oes 332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +02:00
Julian Oes 7992a063c9 navigator: added offboard mode 2014-06-27 12:54:29 +02:00
Julian Oes c99683752c navigator: added missing offboard state 2014-06-27 12:53:24 +02:00
Anton Babushkin affc312411 navigator: make MissionBlock subclass of NavigatorMode 2014-06-27 11:34:19 +02:00
Anton Babushkin 52eb49ba0b navigator: use common "acceptance radius" parameter for all modes 2014-06-27 11:09:49 +02:00
Anton Babushkin 1bae18377a navigator: is_mission_item_reached() for LOITER items fixed 2014-06-27 00:29:00 +02:00
Anton Babushkin 9ae44291b1 navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED instead of FINISHED 2014-06-27 00:27:08 +02:00
Anton Babushkin 8e8798a522 navigator: spaces/tabs fixed, old commented code removed 2014-06-26 23:39:17 +02:00
Anton Babushkin 6e5aafb3a7 navigator: minor formatting fix 2014-06-26 13:44:41 +02:00
Anton Babushkin 63e14c73ba navigator: don't reset RTL state on loiter 2014-06-26 12:18:19 +02:00
Anton Babushkin c5a5604ae9 navigator: loiter fixes 2014-06-26 00:17:25 +02:00
Anton Babushkin 39454ca99d navigator: RTL return altitude fixed 2014-06-25 17:56:30 +02:00
Anton Babushkin 9d3d5a30af navigator: move set_previous_pos_sp to MissionBlock class 2014-06-25 17:31:12 +02:00
Julian Oes 5bab3b1bac Merge pull request #1057 from achambers16/navigator_rewrite_modes_list
Navigator rewrite: create list of navigation modes
2014-06-19 10:36:32 +02:00
Julian Oes 62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
Anton Babushkin e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Anton Babushkin e14d475142 navigator: update Loiter navigator mode to use new method names 2014-06-13 14:31:19 +02:00
Andrew Chambers 51f05612eb Added some comments 2014-06-12 16:33:15 -07:00
Andrew Chambers e53c2ab985 Switched to using c-type arrays 2014-06-12 16:22:04 -07:00
Andrew Chambers 9bb8b12f43 Using a vector to store navigation modes 2014-06-12 15:50:06 -07:00
Julian Oes 3b39a8a789 navigator: rename update and reset calls to on_active and on_inactive 2014-06-12 19:37:25 +02:00
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Julian Oes d9a64bb587 navigator: don't give up after DO_JUMPS 2014-06-11 23:16:22 +02:00
Julian Oes 6f24afd68a navigator: always listen to new current mission index and to new missions 2014-06-10 17:33:12 +02:00
Julian Oes fd1f1c81ef navigator: added parameter for acceptance radius for take-off mission items 2014-06-10 17:24:04 +02:00
Julian Oes fab1b4e366 navigator: don't say triplet is valid in ALTCTL 2014-06-10 14:25:23 +02:00
Julian Oes d3f182d433 navigator: don't check reached for land waypoints 2014-06-09 11:37:33 +02:00
Julian Oes 13b6dffb2e navigator: don't reset descend WP in RTL 2014-06-07 17:18:58 +02:00
Julian Oes 94c4fc56aa navigator: audio messages about what is happening, RTL during mission not triggered but after mission 2014-06-06 23:08:11 +02:00
Julian Oes 1bec9dfe2b navigator: RTL working again 2014-06-06 20:02:38 +02:00