Commit Graph

9127 Commits

Author SHA1 Message Date
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
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 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 a46e1aa60e Fix reschedule logic for SF02/F driver 2014-08-31 20:55:29 +02:00
Lorenz Meier ee91320299 SF02/F driver: Improve parsing 2014-08-31 19:53:01 +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
Thomas Gubler ab022d5133 disable underspeed protection when landing also in tecs 2014-08-31 16:23:37 +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
Pavel Kirienko a87a264415 UAVCAN update (lots of warning fixes) 2014-08-29 14:29:41 +04:00
Lorenz Meier 6773eb9880 Introduce FMU initialised status flag, only run failsafe trap if initialized once 2014-08-28 21:39:38 +02:00
Lorenz Meier c85d7aae06 Make sure we got to valid input at least once before kicking in failsafe 2014-08-28 20:36:59 +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
Thomas Gubler 92c3e52fec Merge remote-tracking branch 'upstream/termination_failsafe' into obcfailsafe 2014-08-27 21:34:07 +02:00
Thomas Gubler 0502761799 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-27 21:33:42 +02: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 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 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 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