Commit Graph

9104 Commits

Author SHA1 Message Date
Lorenz Meier 706e5809a1 Fix variable name in param 2014-08-31 17:02:33 +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
Nuno Marques 0994006f96 sdlog2: update vision log fields 2014-08-25 14:16:13 +01:00
Julian Oes d0f5eca5be px4flow: removed flow report in driver, just use uORB topic 2014-08-25 13:13:07 +02:00
Nuno Marques ec8438bdca sdlog2: added vision estimate logging 2014-08-25 11:20:55 +01:00
Nuno Marques 60799e5155 sdlog2: add vision log struct 2014-08-25 11:07:30 +01:00
Lorenz Meier 7e5a7a16e0 Merge pull request #1314 from PX4/configflow
Include px4flow driver by default
2014-08-25 11:24:27 +02:00
Julian Oes 73ecbbe13d config_px4fmu-v2_default: include px4flow driver by default 2014-08-25 11:12:01 +02:00
Lorenz Meier 9825ed8f3c Attempt at fixing programming timeouts 2014-08-25 10:21:26 +02:00
Lorenz Meier ff28b5e930 Merge pull request #1313 from PX4/onboardrates
mavlink_main: raise rates of onboard mode
2014-08-25 09:37:24 +02:00
Julian Oes b150c3092c mavlink_main: raise rates of onboard mode 2014-08-25 09:33:39 +02:00
Thomas Gubler ca06c7b4e7 Merge pull request #1312 from PX4/airspeed_fix
Deal with zero airspeed measurements
2014-08-25 09:01:45 +02:00
Lorenz Meier 2f5c0cbd13 Deal with zero airspeed measurements 2014-08-24 23:05:28 +02:00
Pavel Kirienko 04ccf5d8c9 UAVCAN update 2014-08-24 19:44:54 +04:00
Lorenz Meier 3454c42596 Merge pull request #1301 from PX4/uavcan_sensors
Generalizing support for UAVCAN-interfaced sensor nodes
2014-08-24 15:59:54 +02:00
Lorenz Meier 8f2fa6da25 Adjust rates for attitude and attitude SP 2014-08-24 14:40:39 +02:00
Pavel Kirienko 1a582e8be0 UAVCAN update for #1306 2014-08-24 16:36:35 +04:00
Lorenz Meier 163224eda2 Updated MAVLink 2014-08-24 13:37:00 +02:00
Pavel Kirienko 2418969b87 UAVCAN update 2014-08-24 15:35:02 +04:00