fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 17:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,650 Commits 852 Branches 161 Tags
90e4fa8a33f234bfdf8e5294203f2537e416751f
Commit Graph
537 Commits
Author SHA1 Message Date
Thomas Gubler 689536893c px4io driver: force failsafe depending on actuator armed 2014-07-19 12:46:52 +02:00
Lorenz Meier e4bdf2f65a Merge pull request #1199 from PX4/navlogfix 
Nav log fix
 2014-07-18 00:03:17 +02:00
Lorenz Meier 9559668f0f uORB: Add navigation state 2014-07-17 23:25:12 +02:00
Thomas Gubler facffe2b9e mtecs: add altitude prefiltering 2014-07-17 17:38:04 +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
Thomas Gubler 3c8927c423 once offboard is set by mavlink command ignore RC mode 2014-07-16 09:39:40 +02:00
Lorenz Meier 64e33b8896 uORB: Support up to three topics per sensor 2014-07-15 23:18:04 +02:00
Lorenz Meier e696ed5509 Merged master 2014-07-15 22:07:03 +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 373b1705c1 vehicle command: add latest guided commands 2014-07-14 10:57:53 +02:00
Thomas Gubler 574b7fc854 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-07-14 09:56:14 +02:00
Lorenz Meier 0332b79cdf Merge branch 'master' of github.com:PX4/Firmware into airspeed_test_fix 2014-07-12 19:06:12 +02:00
Lorenz Meier 8d081a8b0d uORB: Remove voltage field from airspeed 2014-07-11 09:11:03 +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 19017f1001 remove comment 2014-07-08 13:29:59 +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 84b8e14d66 Merge pull request #1072 from PX4/forcesetpoint 
Force setpoint uorb topic
 2014-07-08 10:40:19 +02:00
Lorenz Meier 512584ed75 Merge pull request #1145 from DonLakeFlyer/MoreWarnings 
Fix compiler warnings
 2014-07-08 07:32:36 +02:00
Don Gagne 680ebf29c3 Fix compiler warnings 2014-07-07 15:11:46 -07: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 822403e34b uorb offboard control topic: add force sp flag 
The flag has the same meaning as bit 10 of type_mask in
MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL
 2014-07-03 16:20:58 +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
Thomas Gubler 722fe92425 Fix compile error: rename field in rc_channels.h 2014-07-02 16:45:42 +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 a9fd5ed90a Merged master to gnss_rework 2014-07-02 00:33:36 +02:00
Lorenz Meier 4b9f9281f5 Merged master into vision_estimate 2014-07-01 14:00:54 +02:00
Lorenz Meier 45016b0df0 Merge pull request #984 from PX4/rc_channels 
rc_channels cleanup
 2014-06-30 17:11:14 +02:00
Anton Babushkin 1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Thomas Gubler e8c34fa174 force setpoint uorb topic: add yaw field 2014-06-30 10:25:57 +02:00
Thomas Gubler ffb0ebf13c Merge remote-tracking branch 'upstream/master' into forcesetpoint 
Conflicts:
	src/modules/uORB/objects_common.cpp
 2014-06-30 09:53:07 +02:00
Kynos 503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
Lorenz Meier 154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier afb5271bfb Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-29 19:27:03 +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
Thomas Gubler 263a2fa9b2 mtecs: add flightpathangle filter 2014-06-29 14:52:09 +02:00
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
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