Commit Graph

9299 Commits

Author SHA1 Message Date
Lorenz Meier 3dc1d868d1 Merge branch 'master' of github.com:PX4/Firmware into i2c_timeout 2014-08-27 11:24:15 +02:00
Lorenz Meier 91d50301c6 Do not enter RC override if FMU is lost and termination failsafe mode requested 2014-08-27 10:46:10 +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 a7109609ec support termination failsafe in IO driver 2014-08-27 08:00:28 +02:00
Lorenz Meier 49846d476f IO firmware supports termination failsafe 2014-08-27 08:00:12 +02:00
Lorenz Meier 1fbdca4ee9 Add command to run termination failsafe 2014-08-27 07:59:53 +02:00
Lorenz Meier c79bc7073e Support for termination failsafe in PWM out driver 2014-08-27 07:59:34 +02:00
Lorenz Meier b928897ab5 mavlink: code style only fix 2014-08-27 07:58:36 +02:00
Thomas Gubler 9cc1f1ab9d flight termination on gps failure && datalink loss: do not activate in manual modes 2014-08-26 23:12:28 +02:00
Thomas Gubler 5e5322c593 fix flight termination circuit breaker name, tested 2014-08-26 22:46:09 +02:00
Thomas Gubler 3d528a2c97 introduce new nav state to allow normal rtl with RC switch 2014-08-26 22:22:59 +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
Thomas Gubler 8a9da209d1 limit warnx output on flight termination 2014-08-25 23:17:56 +02:00
Pavel Kirienko eab701b896 Improved UAVCAN status reporting 2014-08-26 00:52:33 +04:00
Thomas Gubler d1a183b7f7 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-25 22:06:11 +02: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
Thomas Gubler c591444c1e fw pos control: set pitch sp correctly while waiting for launch 2014-08-25 12:48:14 +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
Thomas Gubler 98e74ed0e7 commander: limit the output of a warnx 2014-08-24 22:18:01 +02:00
Thomas Gubler 06317046f2 move flight termination and geofence flags from setpoint triplet to mission result 2014-08-24 17:45:15 +02:00
Pavel Kirienko 04ccf5d8c9 UAVCAN update 2014-08-24 19:44:54 +04:00
Thomas Gubler a432d0493c correctly initialize stay in failsafe flag 2014-08-24 17:44:36 +02:00
Thomas Gubler e52f7770be Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-24 16:26:42 +02: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
Thomas Gubler bdccd69030 geofence: make some functions private, correctly update params 2014-08-24 15:27:31 +02:00
Lorenz Meier 582b493f84 Merge branch 'master' of github.com:PX4/Firmware into ekf_varweight 2014-08-24 14:45:12 +02:00