9144 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lorenz Meier	960587b10f	Drop at the exact timing, drop only if facing into the right direction	2014-09-06 11:03:32 +02:00
Lorenz Meier	e57a758350	Merge pull request #11 from swissfang/fwintegratorlanded ... FW: in seatbelt/althold on ground reset integrators (swissfang)	2014-09-06 10:54:50 +02:00
Thomas Gubler	f315be5416	FW: in seatbelt/althold on ground reset integrators	2014-09-06 10:36:51 +02:00
Lorenz Meier	2fe50a6524	Merge pull request #10 from swissfang/loiteracceptance ... navigator: loiter mission items: better reached check for FW (swissfang)	2014-09-05 22:37:34 +02:00
Thomas Gubler	0a6267e010	update comment	2014-09-05 10:18:51 +02:00
Thomas Gubler	d7f93f4ece	loiter mission items: better reached check for FW	2014-09-05 10:04:42 +02:00
Thomas Gubler	9b2a40068a	Merge remote-tracking branch 'private_swissfang/master' into stable	2014-09-04 20:32:14 +02:00
Lorenz Meier	ee2eb98167	Merge pull request #1346 from PX4/mavlinkabsrelalt ... fix mission item to mavink waypoint conversion	2014-09-04 00:01:25 +02:00
Lorenz Meier	75e9497ab1	Fix FX79 mixer	2014-09-03 18:15:30 +02:00
Lorenz Meier	5134015800	always obey commands in bottle drop	2014-09-03 18:15:12 +02:00
Thomas Gubler	7dfc67d032	fix mission item to mavink waypoint conversion	2014-09-03 17:52:24 +02: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	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
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 ef0a0a1a6e86aff79a0fd8829ca5c86244fa39bc.	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
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
Pavel Kirienko	a87a264415	UAVCAN update (lots of warning fixes)	2014-08-29 14:29:41 +04:00
Lorenz Meier	37910d2230	Merge branch 'master' of github.com:PX4/Firmware into swissfang	2014-08-28 14:37:13 +02:00
Lorenz Meier	03d30acec5	Merge pull request #1320 from PX4/i2c_timeout ... Decrease I2C timeout in config so it matches the previous 500 us timeout...	2014-08-28 14:16:57 +02:00
Lorenz Meier	2c724685d8	Merge pull request #1332 from PX4/FTP ... Modified to use new FILE_TRANSFER_PROTOCOL message	2014-08-28 09:28:42 +02:00
Don Gagne	fce0a3b728	Gave up on using bitfields	2014-08-27 21:39:55 -07: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
Lorenz Meier	62b98cc944	Merge pull request #1329 from hsteinhaus/uavcan_prio ... uavcan: increased thread prio, reduces roundtrip latency by a factor of ...	2014-08-27 13:40:25 +02:00
Lorenz Meier	3dc1d868d1	Merge branch 'master' of github.com:PX4/Firmware into i2c_timeout	2014-08-27 11:24:15 +02:00
Lorenz Meier	a4ff5b5cdd	Merge branch 'master' of github.com:PX4/Firmware into swissfang	2014-08-27 09:49:49 +02:00
Lorenz Meier	b928897ab5	mavlink: code style only fix	2014-08-27 07:58:36 +02:00
Thomas Gubler	96f5a823e9	Merge pull request #1302 from PX4/catapultlaunchdetectorhotfix ... catapult launch detection: fix integration logic	2014-08-26 21:55:52 +02:00
Lorenz Meier	7819e364bc	Merge pull request #1322 from PX4/payload_commands ... Support additional payload commands and let commander ignore them	2014-08-26 21:01:23 +02:00