dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
8,267 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

8267 Commits

Author SHA1 Message Date
Julian Oes faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +02:00
Julian Oes b8d07532a7 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 14:41:19 +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
Thomas Gubler 038f4f6203 Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpoints 2014-06-27 14:16:51 +02:00
Julian Oes ee6e000098 mavlink: fix comment in swarm message receiver 2014-06-27 14:08:13 +02:00
Julian Oes 93887f9f28 navigator: remove hacked scale factor for offboard control 2014-06-27 14:04:50 +02:00
Lorenz Meier dbd99b6494 Merge branch 'navigator_rewrite_estimator' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-27 13:37:15 +02:00
Julian Oes 049e448abf Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 13:36:33 +02:00
Lorenz Meier 3195eb1005 estimator: Remove bogus timeout flag, do not reset states not in need of a reset. Do not alter baro offset or GPS positions. 2014-06-27 13:35:23 +02:00
Lorenz Meier 615277d346 Better comments in estimator 2014-06-27 13:29:04 +02:00
Julian Oes 3aab37e0e0 Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-27 13:07:20 +02:00
Julian Oes 332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +02:00
Julian Oes ee872d91b0 mc_pos_control: read velocity setpoints form offboard control and do position offset control 2014-06-27 12:55:27 +02:00
Julian Oes 0b172d662a position_setpoint_triplet: add local position and velocity setpoints 2014-06-27 12:55:11 +02:00
Julian Oes df9381636a offboard_control_setpoint: armed does not make sense there 2014-06-27 12:55:03 +02:00
Julian Oes 4c4d14347e mavlink: only save a offboard_control, don't publish to setpoint topics (let the navigator do this) 2014-06-27 12:54:52 +02:00
Julian Oes a122e88893 commander: hack to get velocity offboard control working 2014-06-27 12:54:39 +02:00
Julian Oes 7992a063c9 navigator: added offboard mode 2014-06-27 12:54:29 +02:00
Julian Oes 98fffe6107 mc_pos_control: added missing subscribe 2014-06-27 12:54:00 +02:00
Julian Oes 993e4d41d8 sensors: missing param for offboard switch 2014-06-27 12:53:52 +02:00
Julian Oes f5699e6490 mavlink: always copy offboard setpoints, not just when control mode changed, also bugfixes in orb calls 2014-06-27 12:53:44 +02:00
Julian Oes c99683752c navigator: added missing offboard state 2014-06-27 12:53:24 +02:00
Julian Oes 5330ffe458 commander: detect if offboard control is lost and missing offboard states 2014-06-27 12:53:07 +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
Julian Oes 19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +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
Lorenz Meier 0fe8ed509a Merge branch 'master' into power_enforce 2014-06-26 17:28:01 +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 b20d0c0f01 commander: Remove prearm test print statements 2014-06-26 12:36:43 +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 690edbd672 Remove duplicate code in the arming check 2014-06-26 12:14:49 +02:00
Lorenz Meier a1132580c5 commander: Add pre-arm check for main sensors. 2014-06-26 12:11:39 +02:00
Lorenz Meier 54f3029ac4 Merge branch 'arming_feedback_fix' into prearm_checks 2014-06-26 12:10:25 +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
Lorenz Meier 435cacb0a0 commander: Make mavlink_fd in arming command non-optional 2014-06-26 12:08:25 +02:00
Lorenz Meier 1cd82fc89c Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:07:28 +02:00