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

7854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenz Meier 72071cdcd3 Fix failed merge 2014-06-29 19:22:22 +02:00
Lorenz Meier ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier 94c69e11ae Merge pull request #1089 from PX4/navigator_rewrite 
Navigator rewrite
 2014-06-29 19:10:42 +02:00
Lorenz Meier 9388b04557 Merge pull request #1090 from PX4/mtecsfpafilter 
mtecs: add flightpathangle filter
 2014-06-29 15:19:00 +02:00
Thomas Gubler 263a2fa9b2 mtecs: add flightpathangle filter 2014-06-29 14:52:09 +02:00
Lorenz Meier 5db51bd704 Merged master into navigator_rewrite 2014-06-29 13:11:29 +02:00
Lorenz Meier 7f0b35a1b4 Merge pull request #1088 from PX4/fwattwarnings 
fw att ctrl: resolve warnings
 2014-06-29 12:55:30 +02:00
Thomas Gubler 8d1ed164cb fw att ctrl: resolve warnings 2014-06-29 12:51:40 +02:00
Lorenz Meier e84cab86ab Merge pull request #923 from PX4/mavlink-ftp 
Mavlink File Transfer Protocol (FTP)
 2014-06-29 12:45:41 +02:00
Lorenz Meier e5bd00e628 Merge pull request #1037 from PX4/mtecs 
mTECS
 2014-06-29 12:39:04 +02:00
Lorenz Meier 852d973e74 Merge pull request #1063 from pigeonhunter/offset_tuning 
Offset tuning implemented in sensors app
 2014-06-29 12:17:41 +02:00
Lorenz Meier aa7781d09b Merge pull request #1081 from PX4/hb_fix2 
mavlink: init structs for HEARTBEAT if uORB topic copy failed
 2014-06-29 11:48:44 +02:00
Thomas Gubler 045ee8c7c7 Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-28 17:20:44 +02:00
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Thomas Gubler 09fd154723 Merge pull request #1084 from PX4/mtecs_pure 
Remove old TECS implementation - we can really only decently flight-test...
 2014-06-28 16:51:58 +02:00
Thomas Gubler cd28679257 Merge pull request #1085 from PX4/geo_flashefficiency 
geo lookup lib: Moved to separate module and compiling with -Os to save ...
 2014-06-28 16:49:40 +02:00
Lorenz Meier e78d496e92 Enable new lookup lib 2014-06-28 12:51:22 +02:00
Lorenz Meier 13f9ce9ddd Comment fix in perf counter header, no code changes. 2014-06-28 12:38:31 +02:00
Lorenz Meier 2bd5511d09 geo lookup lib: Moved to separate module and compiling with -Os to save some precious flash 2014-06-28 12:37:26 +02:00
Lorenz Meier 503ded0539 Remove old TECS implementation - we can really only decently flight-test and support one. 2014-06-28 12:35:04 +02:00
Lorenz Meier 5192a5eea9 Merge pull request #1083 from DonLakeFlyer/mavlink-ftp 
FTP List, Open, Read, Terminate commands working end to end with QGC
 2014-06-28 11:13:33 +02:00
Don Gagne a398d5cbcc Support for List, Open, Read, Terminate commands 
Fixed various bugs. Flattened Mavlink::Session class while fixing bugs
in this area.
 2014-06-27 20:33:39 -07:00
Thomas Gubler d45cc69d1d mtecs/wind: store wind variance 2014-06-27 21:44:56 +02:00
Julian Oes cc8f7f4c97 Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp
 2014-06-27 14:39:36 +02:00
Julian Oes 3aab37e0e0 Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-27 13:07:20 +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 9e5c94b41e mavlink: spaces replaced with tabs 2014-06-26 22:41:35 +02:00
Anton Babushkin 62156e78ae mavlink: init structs for HEARTBEAT if uORB topic copy failed 2014-06-26 22:37:11 +02:00
Thomas Gubler f3a77705a7 Merge pull request #1080 from PX4/hb_fix 
mavlink: Always send heartbeat and do not require both topics to update
 2014-06-26 16:37:49 +02:00
Lorenz Meier f76040e554 mavlink: Always send heartbeat and do not require both topics to update 2014-06-26 16:18:46 +02:00
Lorenz Meier 7546b99a24 mavlink-ftp: Add extra padding because the ringbuffer implementation relies on its use 2014-06-26 14:26:35 +02:00
Lorenz Meier f9db1723e3 mavlink-ftp: Remove commented out code 2014-06-26 14:20:29 +02:00
Lorenz Meier 1a0f53ec3a mavlink-ftp: Remove two extra bytes we don not need 2014-06-26 13:50:46 +02:00
Anton Babushkin 6e5aafb3a7 navigator: minor formatting fix 2014-06-26 13:44:41 +02:00
Lorenz Meier 6e597a66de merged master 2014-06-26 13:31:33 +02:00
Thomas Gubler 3e76be0d69 Merge pull request #1077 from PX4/arming_feedback_fix 
Arming feedback fix
 2014-06-26 12:40:49 +02:00
Lorenz Meier 2eb3077f46 Merge pull request #1073 from PX4/launchdetectorreset 
FW: reset attitude control integrals in launchdetection mode (when waiting for takeoff)
 2014-06-26 12:21:20 +02:00
Anton Babushkin 63e14c73ba navigator: don't reset RTL state on loiter 2014-06-26 12:18:19 +02:00
Lorenz Meier 547f71d791 Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:09:54 +02:00
Lorenz Meier 43c3559763 commander: Make mavlink_fd in arming command non-optional 2014-06-26 12:09:43 +02:00
Thomas Gubler 831a3d4ed1 mtecs: improve logic readability 2014-06-26 07:47:46 +02:00
Anton Babushkin c5a5604ae9 navigator: loiter fixes 2014-06-26 00:17:25 +02:00
Lorenz Meier 3e0c318311 Merge pull request #1076 from PX4/mavlinkrevert 
Revert "Hotfix: Only orb_copy items in mavlink app if the timestamp changed"
 2014-06-25 22:37:19 +02:00
Anton Babushkin 39454ca99d navigator: RTL return altitude fixed 2014-06-25 17:56:30 +02:00
Anton Babushkin bdf1b9274c commander: modes fallback and reject messages fixed 2014-06-25 17:56:11 +02:00
Anton Babushkin 9d3d5a30af navigator: move set_previous_pos_sp to MissionBlock class 2014-06-25 17:31:12 +02:00