dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
9,246 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

9246 Commits

Author SHA1 Message Date
Thomas Gubler f62be0eebd Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:19:08 +02:00
Thomas Gubler 0a6267e010 update comment 2014-09-05 10:18:51 +02:00
Thomas Gubler eec6777585 Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:11:28 +02:00
Thomas Gubler d7f93f4ece loiter mission items: better reached check for FW 2014-09-05 10:04:42 +02:00
Thomas Gubler 033e4892ca engine failure detection 2014-09-05 08:59:00 +02:00
Thomas Gubler faa221e6cb Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe 2014-09-04 21:11:07 +02:00
Thomas Gubler 9b2a40068a Merge remote-tracking branch 'private_swissfang/master' into stable 2014-09-04 20:32:14 +02:00
Thomas Gubler 2d5b2edc03 Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-04 20:28:25 +02:00
Thomas Gubler 2d3b6a88de swissfang: don't build MC apps on FMU1 2014-09-04 17:18:06 +02:00
Lorenz Meier ee2eb98167 Merge pull request #1346 from PX4/mavlinkabsrelalt 
fix mission item to mavink waypoint conversion
 2014-09-04 00:01:25 +02:00
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
Thomas Gubler 7dfc67d032 fix mission item to mavink waypoint conversion 2014-09-03 17:52:24 +02:00
Thomas Gubler 3f8793210b datalink check: ignore onboard computer 2014-09-03 10:34:52 +02:00
Thomas Gubler 3d01da35d0 write sysid & compid to telemetry status 2014-09-03 10:34:27 +02:00
Thomas Gubler e5650df321 Merge remote-tracking branch 'upstream/master' into obcfailsafe 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2014-09-03 09:20:06 +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 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
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 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
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 37910d2230 Merge branch 'master' of github.com:PX4/Firmware into swissfang 2014-08-28 14:37:13 +02:00