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

9611 Commits

Author SHA1 Message Date
Don Gagne e7165d6cbf Generator for mavlink_ftp test files 2014-09-02 15:34:02 -07:00
Don Gagne 1969c9ccf6 Improved unit test framework 
- Added init/cleanup calls before after test
- Added ut_compare macro with better failure reporting
 2014-09-02 15:33:43 -07:00
Don Gagne 6f0160bb5d New mavlink_ftp unit test 2014-09-02 15:32:50 -07:00
Don Gagne 81275e624e Added mavlink_ftp unit test 2014-09-02 15:32:33 -07:00
Don Gagne 7db57310d5 New mavlink_ftp unit test data 2014-09-02 15:32:16 -07:00
Lorenz Meier 2761f98ab6 Merge pull request #1344 from PX4/hildistancesensor 
parse hil_optical_flow message
 2014-09-03 00:30:38 +02:00
Thomas Gubler 6188678f77 Merge pull request #1303 from PX4/launchdetectionstates 
Launchdetection improvements
 2014-09-03 00:29:33 +02:00
Thomas Gubler 80806d44b5 Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain 2014-09-02 23:51:42 +02:00
Thomas Gubler f62f5fb739 Merge branch 'hildistancesensor' into fwlandingterrain 2014-09-02 23:50:44 +02: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
Lorenz Meier 4c7cc10b62 Working and replay-tested altitude fusion 2014-09-02 15:37:18 +02:00
Thomas Gubler 18f0ee3f28 Merge remote-tracking branch 'upstream/master' into obcfailsafe 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2014-09-02 15:00:26 +02:00
Lorenz Meier 8729cf2327 Merge branch 'ekf_varweight' of github.com:PX4/Firmware into terrainaltfield 2014-09-02 14:38:27 +02:00
Anton Babushkin 132c9180ea mc_pos_control: move position offset limiting to separate method 2014-09-01 18:47:56 +02:00
Anton Babushkin 8ad1aa789b mc_pos_control: reset position setpoint on entering to AUTO mode 2014-09-01 18:13:29 +02:00
Anton Babushkin 3c7b9ef94d Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_track 2014-09-01 15:19:42 +02:00
Thomas Gubler 7dd950b01f Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain 2014-09-01 11:42:46 +02:00
Lorenz Meier 71a2025f7d Add filter estimates 2014-09-01 11:35:41 +02:00
Thomas Gubler 63e741824c fw landing: use terrain estimate from global pos 2014-09-01 11:27:28 +02:00
Thomas Gubler 1f951b0df9 add logging for gpos terrain alt 2014-09-01 10:42:56 +02:00
Thomas Gubler 0f548ab88c add global pos valid flag 2014-09-01 10:38:40 +02:00
Thomas Gubler 9f94e4ac84 add terrain alt field to global pos topic 2014-09-01 10:33:59 +02:00
Lorenz Meier 69109b6227 Compile and link ST24 parser in IO firmware 2014-09-01 00:45:41 +02:00
Lorenz Meier 5448396579 Merge branch 'master' into st24 2014-08-31 23:41:54 +02:00
Thomas Gubler 2780dc39ce Merge pull request #1338 from PX4/throttle_limit_simplified 
Simplify throttle limiting on approach
 2014-08-31 22:34:32 +02:00
Lorenz Meier 22d2e26b9c Simply throttle limiting on approach - limit throttle still defaults to 1 2014-08-31 21:55:31 +02:00
Lorenz Meier c9a92e6030 Merge branch 'master' into swissfang 2014-08-31 21:12:23 +02:00
Lorenz Meier 84d26185df Better initial config for Phantom 2014-08-31 21:11:20 +02:00
Lorenz Meier ec740c5509 Merge branch 'sf0x_paranoid' 2014-08-31 21:10:31 +02:00
Lorenz Meier af3b3680e0 Fixed SF02/F driver, tested ok 2014-08-31 21:10:04 +02:00
Lorenz Meier f5f0892b7a Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang 2014-08-31 21:02:23 +02:00
Lorenz Meier a46e1aa60e Fix reschedule logic for SF02/F driver 2014-08-31 20:55:29 +02:00
Lorenz Meier 7109d3b32e Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang 2014-08-31 19:54:03 +02:00
Lorenz Meier ee91320299 SF02/F driver: Improve parsing 2014-08-31 19:53:01 +02:00
Lorenz Meier b81277a1ef Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang 2014-08-31 18:42:43 +02:00
sjwilks 159ba7f3bc Merge pull request #8 from swissfang/mavlink_pixhawk 
mavlink: use pixhawk dialect
 2014-08-31 18:20:32 +02:00
Thomas Gubler f123e3ae1a Merge pull request #1336 from PX4/laser_landing 
Rely on laser altitude once valid
 2014-08-31 18:08:55 +02:00
Lorenz Meier 7a253d50f8 Add more paranoid checks to sf0x altitude parsing 2014-08-31 17:59:21 +02:00
Lorenz Meier 0e954b30c2 Rely on laser altitude once valid 2014-08-31 17:58:43 +02:00
Lorenz Meier c17c585c3e Merge pull request #1335 from PX4/landingtecsunderspeed 
disable underspeed protection when landing also in tecs
 2014-08-31 17:03:03 +02:00
Lorenz Meier 706e5809a1 Fix variable name in param 2014-08-31 17:02:33 +02:00
Thomas Gubler ab022d5133 disable underspeed protection when landing also in tecs 2014-08-31 16:23:37 +02:00
Lorenz Meier 056693df44 Add drag coefficients to adjust bottle drop to other objects to ease testing 2014-08-31 15:55:03 +02:00
Lorenz Meier 592f6f2bcb Revert "Fix drop offset: We want to drop so that the wind carries the bottle into the drop zone" 
This reverts commit ef0a0a1a6e.
 2014-08-30 16:44:30 +02:00
Lorenz Meier b53c0d6d7f Merge branch 'master' of github.com:PX4/Firmware into swissfang 2014-08-30 15:09:40 +02:00
Thomas Gubler fe0642d5e9 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-30 11:47:23 +02:00
Thomas Gubler 3b3115b668 Merge branch 'termination_failsafe' into obcfailsafe 2014-08-30 11:43:05 +02:00
Lorenz Meier 593df0ae12 Merge pull request #1333 from PX4/uavcan_update 
UAVCAN made warning-free
 2014-08-29 14:23:50 +02:00
Pavel Kirienko 580b726536 UAVCAN: missing declaration warning fix 2014-08-29 14:34:29 +04:00