fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 06:50:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,928 Commits 852 Branches 161 Tags
e634c9fa99916f795773b60b8884f479fb4e3d36
Commit Graph

160 Commits

Author SHA1 Message Date
Thomas Gubler e634c9fa99 Merge remote-tracking branch 'origin/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/mavlink/mavlink_receiver.cpp
 2014-08-13 15:07:09 +02:00
Lorenz Meier 3f63b67eb6 Merged master into vision_estimate 2014-08-13 09:08:16 +02:00
Thomas Gubler 85eed22150 offboard sp: correctly map acceleration/force in combined setpoint to setpoint triple 
Conflicts:
	src/modules/uORB/topics/position_setpoint_triplet.h
 2014-08-12 16:46:12 +02:00
Thomas Gubler a04d70ed5a offboard setpoints: correctly check for force setpoint 2014-08-12 14:57:14 +02:00
Thomas Gubler 8bbaacb1e9 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_main.h
	src/modules/mavlink/mavlink_receiver.cpp
 2014-08-11 10:33:11 +02:00
Lorenz Meier 5225d87854 Updated MAVLink to latest revision 2014-08-10 01:24:04 +02:00
Lorenz Meier 93a822fee4 Merged master 2014-07-31 11:37:32 +02:00
Julian Oes 58aa9f28f0 mavlink: when detecting spoof, be more verbose 2014-07-24 17:59:02 +02:00
Thomas Gubler 7bc0e26734 mavlink external sp: support for local pos and vel 2014-07-23 11:37:27 +02:00
Thomas Gubler 825b84fa3b Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/mavlink/mavlink_main.cpp
 2014-07-23 09:31:28 +02:00
Anton Babushkin ef363edfcd mavlink: TX/RX rate counters added 2014-07-23 08:19:24 +02:00
Lorenz Meier 91becef344 Cleanup of heartbeat handling and status printing. Ready to go mainline 2014-07-23 08:18:55 +02:00
Lorenz Meier 0c0b1a4c66 Print mavlink radio module rates 2014-07-23 08:18:45 +02:00
Thomas Gubler 8bb1f9a4bf Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-07-17 09:13:00 +02:00
Thomas Gubler f460870738 support force setpoints 2014-07-17 09:12:45 +02:00
Lorenz Meier 11eeb7466d Merge branch 'ext_mag_param' into logging 2014-07-16 15:00:58 +02:00
Thomas Gubler 9527cc8293 att external sp: also write quaternion 2014-07-16 14:05:15 +02:00
Thomas Gubler a63f3a1731 external attitude sp: set timestamp 2014-07-16 10:36:44 +02:00
Lorenz Meier e696ed5509 Merged master 2014-07-15 22:07:03 +02:00
Lorenz Meier 1ac2b307e4 Enable stricter compile mode and ensure the most relevant bits are initialized. Needs more work to avoid the remaining warnings 2014-07-15 18:23:17 +02:00
Thomas Gubler 35a9dad998 mavlink receiver: fix copy paste error 2014-07-15 14:42:53 +02:00
Thomas Gubler 596850e9f5 mavlink external sp: accept 0 sysid and compid 2014-07-15 14:19:13 +02:00
Thomas Gubler d0cca02e97 add parsing of external attitude message 2014-07-15 10:34:56 +02:00
Lorenz Meier d9f3352d72 Merge branch 'master' of github.com:PX4/Firmware into vision_estimate 2014-07-14 13:48:03 +02:00
Thomas Gubler 7a06417411 mavlink: external setpoint feed trough functionality 2014-07-14 13:34:06 +02:00
Thomas Gubler 574b7fc854 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-07-14 09:56:14 +02:00
Anton Babushkin fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +02:00
Lorenz Meier 629e73bcf4 Merged master into vision_estimate 2014-07-09 11:21:39 +02:00
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 9f1661f1f8 Silence FTP transactions, be vocal about errors 2014-07-08 09:58:08 +02:00
Anton Babushkin 9a69c7ba0e Merge branch 'master' into dataman_nav_drton 2014-07-07 15:09:16 +02:00
Julian Oes 79cbf15d26 Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/commander/commander.cpp
 2014-07-07 14:49:58 +02:00
Thomas Gubler 2d26e91392 WIP, change uorb offboard control sp topic 2014-07-07 13:00:45 +02:00
Thomas Gubler 58adea9469 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/commander/commander.cpp
 2014-07-07 08:51:52 +02:00
Anton Babushkin bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Anton Babushkin 39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +02:00
Thomas Gubler 31474a75fd parsing of MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL 2014-07-03 16:22:58 +02:00
Thomas Gubler cbd602c27c check sysid and compid for external setpoint 2014-07-03 15:00:32 +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
Kynos 1cca3ca8a5 Use NAV-PVT with ubx7 and ubx8 modules 
This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC.
 2014-07-03 13:33:29 +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
Julian Oes fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
 2014-07-02 14:59:43 +02:00
Lorenz Meier 4b9f9281f5 Merged master into vision_estimate 2014-07-01 14:00:54 +02:00
Anton Babushkin 1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Kynos 503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
Lorenz Meier ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier 5db51bd704 Merged master into navigator_rewrite 2014-06-29 13:11:29 +02:00
Lorenz Meier e00d9407b9 Merged master 2014-06-29 13:03:53 +02:00
Julian Oes faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +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