aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1346 from PX4/mavlinkabsrelaltLorenz Meier2014-09-041-2/+2
|\
| * fix mission item to mavink waypoint conversionThomas Gubler2014-09-031-2/+2
|/
* Merge pull request #1344 from PX4/hildistancesensorLorenz Meier2014-09-032-1/+55
|\
| * comment and whitespaceThomas Gubler2014-09-021-1/+1
| * parse hil_optical_flow messageThomas Gubler2014-09-022-1/+55
* | Merge pull request #1303 from PX4/launchdetectionstatesThomas Gubler2014-09-037-72/+158
|\ \ | |/ |/|
| * fw pos control: set pitch sp correctly while waiting for launchThomas Gubler2014-08-251-2/+8
| * fw pos control: launchdetection logic cleanupThomas Gubler2014-08-231-26/+18
| * fw pos control: set default roll, pitch while waiting for launchThomas Gubler2014-08-231-1/+7
| * fw pos control: use new lauchdetector statesThomas Gubler2014-08-231-30/+43
| * launchdetector: return state of detectionThomas Gubler2014-08-236-48/+91
| * Merge remote-tracking branch 'julian/launchdelay' into launchdetectionstatesThomas Gubler2014-08-233-3/+29
| |\
| | * autolaunch: added param for delayJulian Oes2014-08-223-3/+29
* | | Merge pull request #1338 from PX4/throttle_limit_simplifiedThomas Gubler2014-08-312-4/+15
|\ \ \
| * | | Simply throttle limiting on approach - limit throttle still defaults to 1Lorenz Meier2014-08-312-4/+15
|/ / /
* | | Better initial config for PhantomLorenz Meier2014-08-311-0/+3
* | | Merge branch 'sf0x_paranoid'Lorenz Meier2014-08-311-21/+19
|\ \ \
| * | | Fixed SF02/F driver, tested okLorenz Meier2014-08-311-2/+2
| * | | Fix reschedule logic for SF02/F driverLorenz Meier2014-08-311-2/+2
| * | | SF02/F driver: Improve parsingLorenz Meier2014-08-311-24/+16
| * | | Add more paranoid checks to sf0x altitude parsingLorenz Meier2014-08-311-1/+7
* | | | Merge pull request #1336 from PX4/laser_landingThomas Gubler2014-08-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Rely on laser altitude once validLorenz Meier2014-08-311-1/+1
|/ / /
* | | Merge pull request #1335 from PX4/landingtecsunderspeedLorenz Meier2014-08-313-0/+18
|\ \ \
| * | | disable underspeed protection when landing also in tecsThomas Gubler2014-08-313-0/+18
|/ / /
* | | Merge pull request #1333 from PX4/uavcan_updateLorenz Meier2014-08-292-0/+2
|\ \ \
| * | | UAVCAN: missing declaration warning fixPavel Kirienko2014-08-291-0/+2
| * | | UAVCAN update (lots of warning fixes)Pavel Kirienko2014-08-291-0/+0
|/ / /
* | | Merge pull request #1320 from PX4/i2c_timeoutLorenz Meier2014-08-283-4/+4
|\ \ \
| * \ \ Merge branch 'master' of github.com:PX4/Firmware into i2c_timeoutLorenz Meier2014-08-2723-125/+193
| |\ \ \
| * | | | Decrease I2C timeout in config so it matches the previous 500 us timeout as c...Lorenz Meier2014-08-263-4/+4
* | | | | Merge pull request #1332 from PX4/FTPLorenz Meier2014-08-283-25/+37
|\ \ \ \ \
| * | | | | Gave up on using bitfieldsDon Gagne2014-08-272-8/+15
| * | | | | Modified to use new FILE_TRANSFER_PROTOCOL messageDon Gagne2014-08-273-25/+30
* | | | | | Merge pull request #1329 from hsteinhaus/uavcan_prioLorenz Meier2014-08-271-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | uavcan: increased thread prio, reduces roundtrip latency by a factor of 5..7Holger Steinhaus2014-08-191-1/+2
* | | | | | mavlink: code style only fixLorenz Meier2014-08-271-13/+13
| |/ / / / |/| | | |
* | | | | Merge pull request #1302 from PX4/catapultlaunchdetectorhotfixThomas Gubler2014-08-261-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | catapult launch detection: fix integration logicThomas Gubler2014-08-221-2/+2
* | | | | Merge pull request #1322 from PX4/payload_commandsLorenz Meier2014-08-262-7/+17
|\ \ \ \ \
| * | | | | Support additional payload commands and let commander ignore themLorenz Meier2014-08-262-7/+17
* | | | | | Merge pull request #1321 from PX4/startup_payloadLorenz Meier2014-08-265-17/+23
|\ \ \ \ \ \
| * | | | | | Improve startup and payload handlingLorenz Meier2014-08-265-17/+23
| |/ / / / /
* | | | | | Merge pull request #1323 from hsteinhaus/ignore_channels2Lorenz Meier2014-08-263-2/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ignore single channels during PWM outputHolger Steinhaus2014-08-263-2/+11
|/ / / / /
* | | | | Merge pull request #1317 from TSC21/sdlog2_visionThomas Gubler2014-08-252-0/+36
|\ \ \ \ \
| * | | | | sdlog2: minor improvementsNuno Marques2014-08-251-3/+3
| * | | | | sdlog2: minor correctionsNuno Marques2014-08-251-8/+8
| * | | | | sdlog2: added BOTTOM_DISTANCE againNuno Marques2014-08-251-1/+8
| * | | | | sdlog2: update vision log fieldsNuno Marques2014-08-252-10/+19