aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1372 from PX4/swissfangLorenz Meier2014-10-0717-17/+1140
|\
| * revert some of the OBC rate changesThomas Gubler2014-10-071-10/+7
| * Revert "increase ram"Thomas Gubler2014-10-071-1/+1
| * Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-10-0721-286/+769
| |\ | |/ |/|
* | Merge pull request #1341 from PX4/fwlandingterrainThomas Gubler2014-10-073-75/+85
|\ \
| * | fw pos control: add param to enable/disable usage of terrain estimate during ...Thomas Gubler2014-09-232-6/+8
| * | inform in GCS when switching to laserThomas Gubler2014-09-231-1/+4
| * | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-2339-355/+1758
| |\ \
| * | | flare pitch limit: apply at throttle lim altitudeThomas Gubler2014-09-212-1/+3
| * | | Fixed delay calculation of laserLorenz Meier2014-09-061-1/+1
| * | | make flare pitch angle a paramThomas Gubler2014-09-042-62/+86
| * | | fw landing: horiz flare check: fix wp distanceThomas Gubler2014-09-041-3/+11
| * | | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-041-2/+2
| |\ \ \
| * \ \ \ Merge branch 'flarehorizontallimit' into fwlandingterrainThomas Gubler2014-09-031-2/+5
| |\ \ \ \
| | * | | | fw landing: impose horizontal limit for start of flareThomas Gubler2014-09-031-1/+5
| * | | | | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-037-72/+158
| |\| | | |
| * | | | | Merge remote-tracking branch 'upstream/fwlandingterrain' into fwlandingterrainThomas Gubler2014-09-031-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'terrainaltfield' into fwlandingterrainLorenz Meier2014-09-031-1/+1
| | |\ \ \ \ \
| * | | | | | | remove warnxThomas Gubler2014-09-031-3/+0
| |/ / / / / /
| * | | | | | fw landing: if using terrain estimate, don't switch back during landingThomas Gubler2014-09-031-9/+14
| * | | | | | Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrainThomas Gubler2014-09-023-328/+603
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'hildistancesensor' into fwlandingterrainThomas Gubler2014-09-022-1/+55
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrainThomas Gubler2014-09-011-1/+34
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fw landing: use terrain estimate from global posThomas Gubler2014-09-011-58/+24
* | | | | | | | | | File test compile fixesLorenz Meier2014-10-051-5/+5
* | | | | | | | | | Navigator: Optimize for spaceLorenz Meier2014-10-051-0/+2
* | | | | | | | | | Dataman: Optimize for spaceLorenz Meier2014-10-051-0/+2
* | | | | | | | | | Compile fixes in navigatorLorenz Meier2014-10-051-3/+3
* | | | | | | | | | Merge pull request #1363 from vooon/ftp_write_supportLorenz Meier2014-10-052-39/+253
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FTP: Return bytes written in payload.Vladimir Ermakov2014-10-051-5/+2
| * | | | | | | | | | FTP: Save errno in _copy_file().Vladimir Ermakov2014-10-051-2/+8
| * | | | | | | | | | FTP: Add file checksum calculation command.Vladimir Ermakov2014-09-222-0/+41
| * | | | | | | | | | FTP: Rename command.Vladimir Ermakov2014-09-222-0/+33
| * | | | | | | | | | FTP: fix truncate errors. Also correct errno reporting.Vladimir Ermakov2014-09-171-4/+4
| * | | | | | | | | | FTP: Add truncate command.Vladimir Ermakov2014-09-172-0/+129
| * | | | | | | | | | FTP: Implement write command.Vladimir Ermakov2014-09-171-17/+24
| * | | | | | | | | | FTP: Add new open command for write.Vladimir Ermakov2014-09-172-22/+23
* | | | | | | | | | | Merge pull request #1360 from DonLakeFlyer/UnitTestFrameworkLorenz Meier2014-10-0511-88/+139
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Upgraded unit test frameworkDon Gagne2014-09-1311-88/+139
* | | | | | | | | | | | Merge pull request #1279 from PX4/takeoff_fixLorenz Meier2014-10-052-37/+73
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed function name of mission modification logic, attributed @DrTonLorenz Meier2014-10-052-10/+12
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into takeoff_fixThomas Gubler2014-10-0540-196/+2492
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1286 from PX4/mpc_trackLorenz Meier2014-10-041-40/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mc_pos_control: AUTO speed limiting bug fixedAnton Babushkin2014-10-021-4/+6
| * | | | | | | | | | | | | Merge branch 'master' into mpc_trackAnton Babushkin2014-09-2813-40/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mc_pos_control: commented code block removedAnton Babushkin2014-09-281-10/+0
| * | | | | | | | | | | | | | Merge branch 'master' into mpc_trackAnton Babushkin2014-09-1845-806/+2659
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mc_pos_control: move position offset limiting to separate methodAnton Babushkin2014-09-011-0/+28
| * | | | | | | | | | | | | | | mc_pos_control: reset position setpoint on entering to AUTO modeAnton Babushkin2014-09-011-5/+14
| * | | | | | | | | | | | | | | Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_trackAnton Babushkin2014-09-0176-489/+2183
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \