fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-29 00:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,070 Commits 852 Branches 161 Tags
dfd4dc3e6a8dfea24b2ab42b18741b71eb025596
Commit Graph

1317 Commits

Author SHA1 Message Date
Anton Babushkin 2dc2c2d28f Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 21:57:33 +04:00
Anton Babushkin 220011914c navigator: AUTO_READY nav state added, RTL implemented properly 2014-01-02 21:57:01 +04:00
Thomas Gubler 429a11a21d navigator/geofence: move more functions to geofence class (WIP) 2014-01-02 15:01:08 +01:00
Thomas Gubler dca6d97a52 create geofence class and start moving fence functionality to this class 2014-01-02 14:18:02 +01:00
Anton Babushkin c0bdaf4a40 Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 16:44:54 +04:00
Anton Babushkin 911c2bdeee navigator: takeoff fixes 2014-01-02 16:44:31 +04:00
Anton Babushkin fe43a900c7 mc_pos_control: takeoff hack removed 2014-01-02 14:52:49 +04:00
Anton Babushkin 5bedd8c714 Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 14:52:00 +04:00
Anton Babushkin 6a5d5f7136 Merge master into navigator_new 2014-01-02 14:51:48 +04:00
Anton Babushkin 74e2542c07 navigator: takeoff and mission fixes 2014-01-02 14:49:34 +04:00
Lorenz Meier a60fcc2535 Fixed pwm limit command to behave as originally designed. The initial hold time produced random values (e.g. 40000 instead of 1500) during the INIT_TIME (0.5s) phase 2014-01-02 09:18:04 +01:00
Lorenz Meier e35598eb6b Merge branch 'master' of github.com:PX4/Firmware into unit_tests 2014-01-01 23:44:06 +01:00
Thomas Gubler 4191ae33c2 navigator/mission feasibility: prepare for pre-mission fence checking 2014-01-01 21:54:33 +01:00
Anton Babushkin 61ef2e00a9 Merge branch 'navigator_new' into navigator_new_vector 2014-01-01 23:21:45 +04:00
Anton Babushkin 3c72c9bf7f navigator: force takeoff if first mission item is not takeoff and vehicle landed 2014-01-01 23:21:29 +04:00
Anton Babushkin 352a1ef095 mc_pos_control: minor fixes 2014-01-01 23:20:36 +04:00
Thomas Gubler 09f29d0972 Merge remote-tracking branch 'upstream/navigator_new' into navigator_new_fw 2014-01-01 16:43:54 +01:00
Thomas Gubler ec8bc6c020 fw pos ctrl: remove a wrong transpose 2014-01-01 16:33:50 +01:00
Thomas Gubler 3000d08b05 Merge remote-tracking branch 'upstream/master' into navigator_new_fw 
Conflicts:
	makefiles/config_px4fmu-v2_logging.mk
 2014-01-01 12:36:42 +01:00
Anton Babushkin b7f2c89a16 Merge branch 'master' into navigator_new_vector 2014-01-01 14:14:35 +04:00
Anton Babushkin 6827e45aee mc_pos_control, mc_att_control_vector: code style fixed 2014-01-01 14:03:42 +04:00
Anton Babushkin 8c1c7bca18 mc_pos_control: takeoff fixes, ignore position and yaw, takeoff vertically 2014-01-01 14:02:24 +04:00
Anton Babushkin 40d03666fd mc_pos_control: yaw in AUTO fixed 2014-01-01 13:40:32 +04:00
Anton Babushkin 0f6dcf9e5e Merge branch 'navigator_new' into navigator_new_vector 2014-01-01 13:31:59 +04:00
Anton Babushkin 3bc94f1fe6 navigator: takeoff fix 2014-01-01 13:31:27 +04:00
Anton Babushkin 7eee6ce1b2 mc_pos_control: takeoff / landing implemented 2014-01-01 13:30:26 +04:00
Anton Babushkin 549fd4f0e8 Merge branch 'navigator_new' into navigator_new_vector 2013-12-31 19:31:16 +04:00
Anton Babushkin 7f9a7ffe82 navigator: MISSION_LOITER and RTL_LOITER modes removed 2013-12-31 19:30:41 +04:00
Lorenz Meier 5b302fef59 HOTFIX: Increased attitude control updates to 50 Hz - was less than 10 Hz and unintended slow 2013-12-31 14:47:01 +01:00
Lorenz Meier 7f14f1f7de Add conversions and mixer tests. Work in progress 2013-12-31 14:45:38 +01:00
Anton Babushkin 5c84479ce9 Merge branch 'navigator_new' into navigator_new_vector 2013-12-31 15:45:04 +04:00
Anton Babushkin f6ee354c10 navigator: mode switching fixes 2013-12-31 15:44:52 +04:00
Anton Babushkin 2e6cd18615 navigator: mavlink reopening fixed 2013-12-31 13:10:35 +04:00
Anton Babushkin ba7cbe48f2 Merge branch 'navigator_new' into navigator_new_vector 2013-12-31 12:50:11 +04:00
Anton Babushkin d35a169907 navigator: NAV_STATE_INIT removed, minor fixes 2013-12-31 12:46:35 +04:00
Thomas Gubler 080ecf56ca launchdetection: add mavlink text output 2013-12-30 22:21:53 +01:00
Thomas Gubler 9cc1fc1cb5 fixed launchdetection logic, catapult tested in HIL 2013-12-30 19:08:09 +01:00
Thomas Gubler bd88209f5c Merge remote-tracking branch 'upstream/navigator_new' into navigator_new_fw 2013-12-30 13:51:58 +01:00
Anton Babushkin 6c30eebeb8 Merge branch 'navigator_new' into navigator_new_vector 2013-12-30 14:42:00 +04:00
Anton Babushkin c35c0a90d3 navigator: use switches to select nav state 2013-12-30 14:04:55 +04:00
Anton Babushkin 33385a783c Added NONE = not mapped state for mission and return switches 2013-12-30 14:04:24 +04:00
Anton Babushkin 3a4a36c736 mc_att_control_vector fix, multirotor_attitude_control and multirotor_pos_control removed 2013-12-30 09:00:23 +04:00
Anton Babushkin 174fd21c6f Merge fix 2013-12-30 08:55:46 +04:00
Anton Babushkin a71b04775c Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector 2013-12-30 08:55:26 +04:00
Thomas Gubler cf33f2a627 Merge branch 'launchdetection' into navigator_new_fw 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2013-12-29 19:50:30 +01:00
Anton Babushkin fa20fae6fb Some mavlink fixes to use vehicle_control_mode, WIP 2013-12-29 22:38:41 +04:00
Thomas Gubler 52960e06c6 add fw autoland documentation 2013-12-29 17:15:38 +01:00
Thomas Gubler 95bdc1a9bd fw att ctrl: removed unused parameter 2013-12-29 16:42:39 +01:00
Thomas Gubler 6a9423b428 fw att ctrl: remove renamed parameters 2013-12-29 16:35:52 +01:00
Thomas Gubler 70cc5413b4 fw att controller: update parameter descriptions and default values 2013-12-29 16:17:09 +01:00