Commit Graph

4530 Commits

Author SHA1 Message Date
Thomas Gubler bf3f8861dd fw landing: horiz flare check: fix wp distance
better calculation of wp distance when behind wp
2014-09-04 11:11:03 +02:00
Thomas Gubler 611f2b3633 Merge remote-tracking branch 'upstream/master' into fwlandingterrain 2014-09-04 08:47:00 +02:00
Thomas Gubler 66c08c9b24 Merge branch 'flarehorizontallimit' into fwlandingterrain
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-03 19:22:14 +02:00
Thomas Gubler 082cd5f95d Merge remote-tracking branch 'upstream/master' into fwlandingterrain
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-03 19:19:36 +02:00
Thomas Gubler 139ca8c327 fw landing: impose horizontal limit for start of flare 2014-09-03 18:53:05 +02:00
Thomas Gubler 7dfc67d032 fix mission item to mavink waypoint conversion 2014-09-03 17:52:24 +02:00
Thomas Gubler 5defd348b7 Merge remote-tracking branch 'upstream/fwlandingterrain' into fwlandingterrain 2014-09-03 12:37:00 +02:00
Thomas Gubler 484f2864d1 remove warnx 2014-09-03 12:36:44 +02:00
Lorenz Meier 7551c653d0 Merge branch 'terrainaltfield' into fwlandingterrain 2014-09-03 12:16:42 +02:00
Lorenz Meier 8c2a158e12 Trust the laser sensor more 2014-09-03 12:15:27 +02:00
Thomas Gubler 7f0ba70b1e fw landing: if using terrain estimate, don't switch back during landing 2014-09-03 08:39:26 +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 80806d44b5 Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain 2014-09-02 23:51:42 +02:00
Thomas Gubler f62f5fb739 Merge branch 'hildistancesensor' into fwlandingterrain 2014-09-02 23:50:44 +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
Lorenz Meier 4c7cc10b62 Working and replay-tested altitude fusion 2014-09-02 15:37:18 +02:00
Lorenz Meier 8729cf2327 Merge branch 'ekf_varweight' of github.com:PX4/Firmware into terrainaltfield 2014-09-02 14:38:27 +02:00
Thomas Gubler 7dd950b01f Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain 2014-09-01 11:42:46 +02:00
Lorenz Meier 71a2025f7d Add filter estimates 2014-09-01 11:35:41 +02:00
Thomas Gubler 63e741824c fw landing: use terrain estimate from global pos 2014-09-01 11:27:28 +02:00
Thomas Gubler 1f951b0df9 add logging for gpos terrain alt 2014-09-01 10:42:56 +02:00
Thomas Gubler 0f548ab88c add global pos valid flag 2014-09-01 10:38:40 +02:00
Thomas Gubler 9f94e4ac84 add terrain alt field to global pos topic 2014-09-01 10:33:59 +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 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
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
Thomas Gubler ab022d5133 disable underspeed protection when landing also in tecs 2014-08-31 16:23:37 +02:00
Pavel Kirienko 580b726536 UAVCAN: missing declaration warning fix 2014-08-29 14:34:29 +04: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 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
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
Thomas Gubler 19fa79dcb1 Merge pull request #1317 from TSC21/sdlog2_vision
Sdlog2: add vision estimation logging
2014-08-25 23:48:26 +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
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