9122 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Lorenz Meier	0f571a18a2	Merge pull request #1321 from PX4/startup_payload ... Improve startup and payload handling	2014-08-26 21:00:21 +02:00
Lorenz Meier	f2683c23e9	Merge pull request #1323 from hsteinhaus/ignore_channels2 ... Ignore single channels during PWM output	2014-08-26 16:43:46 +02:00
Holger Steinhaus	87b2375be4	Ignore single channels during PWM output	2014-08-26 14:38:32 +02:00
Lorenz Meier	4af4e4e1e5	Support additional payload commands and let commander ignore them	2014-08-26 10:14:36 +02:00
Lorenz Meier	65dab36910	Improve startup and payload handling	2014-08-26 10:13:52 +02:00
Lorenz Meier	47e39841df	Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang	2014-08-26 09:37:56 +02:00
Lorenz Meier	9434633912	Merged upstream/master	2014-08-26 09:29:55 +02:00
Lorenz Meier	a54ef70a20	Decrease I2C timeout in config so it matches the previous 500 us timeout as close as possible. This is necessary after fixing the NuttX I2C timeout logic	2014-08-26 08:14:52 +02:00
Thomas Gubler	19fa79dcb1	Merge pull request #1317 from TSC21/sdlog2_vision ... Sdlog2: add vision estimation logging	2014-08-25 23:48:26 +02:00
Lorenz Meier	21e3ca6c99	Merge pull request #1318 from PX4/uavcan_cli_improvements ... Improved UAVCAN status reporting	2014-08-25 23:36:58 +02:00
Pavel Kirienko	eab701b896	Improved UAVCAN status reporting	2014-08-26 00:52:33 +04:00
Nuno Marques	d6810ae1f8	sdlog2: minor improvements	2014-08-25 15:37:51 +01:00
Nuno Marques	ebd56aa2c1	sdlog2: minor corrections	2014-08-25 15:07:14 +01:00
Lorenz Meier	c786f3ce07	Merge pull request #1316 from PX4/fix_flowtopic ... px4flow: removed flow report in driver, just use uORB topic	2014-08-25 15:37:52 +02:00
Nuno Marques	3ef374c426	sdlog2: added BOTTOM_DISTANCE again	2014-08-25 14:20:17 +01:00