fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 03:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,513 Commits 852 Branches 161 Tags
79e5ec646523c8c93bc0e17c39fbe31222863d93
Commit Graph

175 Commits

Author SHA1 Message Date
Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
 2014-10-05 13:17:32 +02:00
Thomas Gubler 3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
 2014-09-28 12:36:26 +02:00
Lorenz Meier 1a89b80024 Merge pull request #1345 from DonLakeFlyer/FTP 
More FTP work
 2014-09-06 15:02:41 +02:00
Thomas Gubler 3d01da35d0 write sysid & compid to telemetry status 2014-09-03 10:34:27 +02:00
Don Gagne 37ea85968d Tweak for mavlink_ftp api change 2014-09-02 15:34:20 -07:00
Thomas Gubler 49f1637d7f comment and whitespace 2014-09-02 23:32:24 +02:00
Thomas Gubler 752b89b998 parse hil_optical_flow message 
publish to flow and range finder topic
 2014-09-02 23:29:54 +02:00
Don Gagne 0eea110f6f Modified to use new FILE_TRANSFER_PROTOCOL message 
- Also corrected system/component id transmit/check
 2014-08-27 17:14:49 -07:00
Thomas Gubler 55fde23233 support new yaw and yawrate fields in mavlnk position_target message 2014-08-25 09:19:36 +02:00
Thomas Gubler 1e7dee4391 set_attitude_target msg: convert quaternion to R 2014-08-21 16:24:00 +02:00
Thomas Gubler 3a0bb9c64b Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/navigator/navigator_main.cpp
 2014-08-21 11:05:56 +02:00
Thomas Gubler e3724e64d4 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-08-19 09:12:41 +02:00
Lorenz Meier 0d87dc9923 mavlink: Handle command int packets 2014-08-18 16:50:13 +02:00
Lorenz Meier c3522f8592 Publish telemetry status on telemetry update and on heartbeat update events to avoid inducing heartbeat update latencies resulting in spurious telemetry link dropped detections. Makes overall state handling simpler 2014-08-17 10:58:28 +02:00
Thomas Gubler 1e9d77f1d2 offboard: ignore mask cleanup 
add handling of thrust ignore bit, add defines for the bitnumbers,
improve and fix interface to ignore bitmask
 2014-08-15 12:58:06 +02:00
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