Commit Graph

5150 Commits

Author SHA1 Message Date
Thomas Gubler a635010117 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator 2013-11-28 09:15:07 +01:00
Julian Oes de36ccfff5 Navigator: report the current waypoint back 2013-11-27 17:00:27 +01:00
Julian Oes 81023fe5aa Navigator and mavlink: more mavlink cleanup and set current waypoint option support added 2013-11-27 16:17:44 +01:00
Julian Oes 3f25298798 Mavlink and navigator: Disable some functions in mavlink that are taken over by navigator, introduce topic to report mission status from commander back to mavlink 2013-11-27 09:27:08 +01:00
Thomas Gubler b2ee78c218 fw_pos_ctrl: landing: audio output 2013-11-26 17:02:52 +01:00
Julian Oes 9c1a5be8e1 Navigator: Gotten rid of some warnings 2013-11-26 16:43:51 +01:00
Julian Oes 972ca7db8a Merge branch 'fw_autoland_att_tecs_navigator' of https://github.com/thomasgubler/Firmware_Private into fw_autoland_att_tecs_navigator 2013-11-26 15:55:09 +01:00
Julian Oes 8e1af68bfd Navigator: Added parameter for loiter radius 2013-11-26 15:54:19 +01:00
Thomas Gubler 254777d38a more fixes for the mavlink_fd in fw pos ctrl, this now enables mavlink output for landing 2013-11-26 15:49:59 +01:00
Thomas Gubler b66730b5a9 making sure the mavlink fd is open in fw pos ctrl 2013-11-26 15:38:53 +01:00
Julian Oes a989e79663 Navigator: Don't try to go to next WP or loiter after landing, just stay in landing mode 2013-11-26 15:25:27 +01:00
Thomas Gubler d294953be7 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator 2013-11-26 15:25:22 +01:00
Thomas Gubler 126b0567fe add safety check for orbit in navigator. Prevents issues with old qgc versions 2013-11-26 15:24:16 +01:00
Julian Oes 9a79ad4cdb Navigator: Use parameter for minium altitude when starting loiter 2013-11-26 15:08:43 +01:00
Julian Oes 92f7fb2732 Navigator: Added some mavlink debug output 2013-11-26 14:17:41 +01:00
Thomas Gubler a94ed67b3f update the commander to only use local pos for landing detection when on rotary wing 2013-11-26 13:47:37 +01:00
Thomas Gubler 5428eab23b navigator: do not restart mission (continue with changed second part of mission) if no items prior to the current item have been changed 2013-11-26 01:19:37 +01:00
Thomas Gubler 8fb22a1df7 navigator: remove redudant line 2013-11-25 22:15:34 +01:00
Thomas Gubler b305f45f5a Merge remote-tracking branch 'private_julian/navigator_wip_merge_test' into fw_autoland_att_tecs_navigator 2013-11-25 21:22:14 +01:00
Thomas Gubler 5447ecf67d Merge branch 'fw_autoland_att_tecs' into fw_autoland_att_tecs_navigator
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2013-11-25 21:22:00 +01:00
Julian Oes 036d1a4017 Navigator: Yet another rewrite of the logic 2013-11-25 19:04:22 +01:00
Thomas Gubler 3c6f01bea8 tecs: speedrate: use p loop instead of pre calculated speed rate for now 2013-11-24 12:48:44 +01:00
Thomas Gubler 85a76a32c5 tecs: roll2thr: fix to be consistent with comment 2013-11-24 12:29:48 +01:00
Thomas Gubler f267fcf4ff disable a printf 2013-11-24 11:11:06 +01:00
Thomas Gubler b6f2c286e9 disabling bad descent detection because of to many false positives 2013-11-24 11:09:14 +01:00
Thomas Gubler 881c89dd1b increase safety margin for takeoff speed 2013-11-24 11:02:41 +01:00
Thomas Gubler 0611b26eea fw autoland: move constrain of roll to horizontal landing navigation
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2013-11-24 10:29:10 +01:00
Thomas Gubler 94745fa0af fw autoland: move constrain of roll to horizontal landing navigation 2013-11-24 08:32:53 +01:00
Julian Oes 6b53c7e841 Navigator: Missions (including RTL), Loiter and RTL working 2013-11-22 21:26:52 +01:00
Julian Oes ae5b20eb7f FW_pos_control_l1: Remove RTL logic which will be in navigator 2013-11-22 21:26:17 +01:00
Julian Oes 01df715f94 Mission topic: make nav_cmd compatible to the mavlink command 2013-11-22 21:21:30 +01:00
Julian Oes 1da7599541 Navigator: Energy control doesn't belong in navigator 2013-11-22 14:10:09 +01:00
Julian Oes 5748a9c964 Navigator: Publish mission triplet only when actually updated 2013-11-22 14:07:21 +01:00
Julian Oes 7892a72f90 Navigator, waypoints: save index in mission item and use this in navigator 2013-11-22 14:03:09 +01:00
Julian Oes 42aefe838c Navigator: More improvements, loiter at the end works 2013-11-21 17:01:54 +01:00
Julian Oes 8535d12e60 Navigator: Switch to loiter after mission works 2013-11-21 10:48:26 +01:00
Julian Oes dca72ba6ee L1_pos_controller: Fixed strange bitwise or 2013-11-21 10:47:02 +01:00
Julian Oes 18941155b2 Navigator: Checking if a waypoint was reached and switching to next one works rudimentary 2013-11-20 22:37:49 +01:00
Julian Oes 31f0edd663 Mission topic: the autocontinue option was missing 2013-11-20 22:36:53 +01:00
Julian Oes b3c6574500 Waypoints: Get time inside WP radius right 2013-11-20 22:34:15 +01:00
Julian Oes f351afe3f6 Geo: Copy distance function over from mavlink 2013-11-20 22:28:05 +01:00
Julian Oes 344705396d TECS: I don't need this debug output 2013-11-20 22:27:28 +01:00
Julian Oes 7c741073fe Navigator: Only support 10WPs for now 2013-11-20 17:05:17 +01:00
Julian Oes c33d616935 Merge remote-tracking branch 'thomasgubler_private/fw_autoland_att_tecs' into navigator_wip_merge_test
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2013-11-20 13:17:49 +01:00
Julian Oes a27c7e8319 Navigator: Added simple mission triplet publication on waypoint change 2013-11-20 12:53:05 +01:00
Julian Oes a6c5a19206 Mission topic: Use mission topic instead of global position for triplet 2013-11-20 12:46:25 +01:00
Thomas Gubler 37ef10ceea groundspeed undershoot: take into account altitude difference 2013-11-20 12:17:42 +01:00
Thomas Gubler cc96edfe01 tecs: fix wrong != 0 check 2013-11-19 16:37:48 +01:00
Thomas Gubler 324d60f927 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-19 16:20:15 +01:00
Julian Oes a9e51105c8 Missionlib: Don't let the missionlib publish the triplet, moving forward this should be done by the navigator 2013-11-19 16:15:16 +01:00