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

10401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenz Meier 309a718db4 Put payload outputs for AERT mixer onto right actuator group 2014-08-12 17:57:14 +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 a2e6b2bca0 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-08-12 16:42:55 +02:00
Lorenz Meier 62959d4d01 Merge pull request #1266 from PX4/norc 
Fix NO RC handling (fixes #1263)
 2014-08-12 15:35:05 +02:00
Thomas Gubler a04d70ed5a offboard setpoints: correctly check for force setpoint 2014-08-12 14:57:14 +02:00
Thomas Gubler 017f82e2b8 Merge remote-tracking branch 'origin/master' into obcfailsafe 2014-08-12 12:30:20 +02:00
Lorenz Meier 4adc6d30b3 Merged failsafe from master 2014-08-12 08:22:50 +02:00
Lorenz Meier 32e1bd15b8 Merge branch 'master' into test_bottle_drop_paul 2014-08-12 08:22:05 +02:00
Lorenz Meier 3f4aef60c8 Increase timeout in an attempt to prevent timout python failure 2014-08-12 08:21:38 +02:00
Lorenz Meier f4cf94b084 Improved rcS handling, added failsafe flag. Needs further testing for USB stability 2014-08-12 08:21:06 +02:00
Lorenz Meier 0c0c8e943a Fixed missing return value after last change set 2014-08-12 07:30:01 +02:00
Lorenz Meier 467e67e7e7 Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-11 19:39:30 +02:00
Lorenz Meier 7d1cd7b994 Fix NO RC handling (fixes #1263) 2014-08-11 19:28:14 +02:00
Thomas Gubler 9e9da83cb7 Merge remote-tracking branch 'upstream/master' into attitudeekf 2014-08-11 16:17:27 +02:00
Thomas Gubler 5baf9cea0d geo: fix some warnings 2014-08-11 15:29:59 +02:00
Lorenz Meier 2ca8903240 If we failed loading params, reset them (if the file handle is valid the file is corrupted and there is no hope, if its just not present the reset command will not do anything) 2014-08-11 14:56:13 +02:00
Lorenz Meier 258fb27e14 Ensure that a failing dataman start does not abort boot 2014-08-11 14:54:18 +02:00
Lorenz Meier f0458af28b Extend vehicle commands as needed 2014-08-11 14:53:04 +02:00
Lorenz Meier f47cf9a002 Bottle drop: C++ify full code base, fix transformation assumptions and other things, ready for integration testing 2014-08-11 14:52:45 +02:00
Lorenz Meier c81c94d74f Fix control group in Viper mixer 2014-08-11 14:52:07 +02:00
Lorenz Meier 01a2554771 Viper mixer: Set failsafe values so we are not starting to command actuators 2014-08-11 14:51:49 +02:00
Thomas Gubler 89986cf3e5 epv/eph threshold variable names changed 2014-08-11 13:46:13 +02:00
Thomas Gubler af1ad04c23 Merge remote-tracking branch 'origin/master' into geo 2014-08-11 13:37:08 +02:00
Julian Oes c7819dbb69 mavlink: use pixhawk dialect 2014-08-11 11:05:29 +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 b0fe5ae1ba Bring back nominal state of fw attitude controller 2014-08-11 08:58:39 +02:00
Lorenz Meier ab80459b32 Fixed whitespace in rcS 2014-08-11 08:56:06 +02:00
Lorenz Meier 38ec489dfc Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-11 08:53:49 +02:00
Lorenz Meier 5abdacc907 Merge pull request #1265 from PX4/FTP 
More FTP support
 2014-08-10 23:46:14 +02:00
Lorenz Meier 0633d7f601 Updated mavlink version 2014-08-10 22:05:21 +02:00
Don Gagne 1d3edfa629 More FTP support 
Added:
- sequence numbers
- directory list returns file sizes
- open command returns file size in data
 2014-08-10 12:02:10 -07:00
Lorenz Meier 57e2fb0c49 Merge pull request #1262 from PX4/mavlink_update 
Mavlink update
 2014-08-10 12:00:57 +02:00
Lorenz Meier 9ecec7fada Add default initializers and timestamp in local position 2014-08-10 01:30:25 +02:00
Lorenz Meier 5225d87854 Updated MAVLink to latest revision 2014-08-10 01:24:04 +02:00
Lorenz Meier 4b065a7e1d Updated MAVLink version 2014-08-10 00:52:03 +02:00
Julian Oes 6ff32b2338 Merge branch 'master' into test_bottle_drop_paul 
Conflicts:
	ROMFS/px4fmu_common/init.d/3035_viper
 2014-08-09 19:59:45 +02:00
Lorenz Meier 64ed253591 Merge pull request #1261 from PX4/rcviper 
Viper and FX79 mixer
 2014-08-09 19:56:17 +02:00
Julian Oes e6210058a3 mixers: added Viper mixer 2014-08-09 19:52:30 +02:00
Julian Oes 3fdf63d2b3 Startup script: added viper script 
Conflicts:
	mavlink/include/mavlink/v1.0
 2014-08-09 19:47:48 +02:00
Julian Oes 312f9e0ccc mixers: adapted FX79 mixer to have more pitch influence 2014-08-09 19:43:57 +02:00
Lorenz Meier 5246d6b492 Updated mavlink version 2014-08-09 19:31:34 +02:00
Lorenz Meier f3969abac4 Merge pull request #886 from PX4/smooth_pos_hold 
Smooth transitions to stabilized modes
 2014-08-09 19:01:16 +02:00
Lorenz Meier b0b2f34992 Merged master 2014-08-09 12:22:28 +02:00
Lorenz Meier 2a7848c769 Merge pull request #1259 from PX4/ekf_fix 
EKF filter fix
 2014-08-08 08:46:55 +02:00
Anton Babushkin 03f839a27a mc_pos_control: more accurate position setpoint reset, keep attitude setpoint continuous 2014-08-08 00:24:18 +02:00
Anton Babushkin faaeaeb113 mc_pos_control: manual and offboard control reorganization and cleanup 2014-08-08 00:22:57 +02:00
Anton Babushkin a9d3e9854f Merge branch 'master' into smooth_pos_hold 2014-08-07 23:08:54 +02:00
Lorenz Meier 20c3a329c7 Introduce similar checks fo all other health checks in the filter 2014-08-07 07:36:59 +02:00
Lorenz Meier 13b9cd0cec Do not fuse height after innovation consistency check fail 2014-08-07 07:25:20 +02:00
Lorenz Meier 95fc701376 Merge pull request #1254 from PX4/tecs_logging 
TECS logging
 2014-08-06 17:41:15 +02:00