Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-10-07 | 19 | -286/+738 |
|\ | |||||
| * | Merge pull request #1341 from PX4/fwlandingterrain | Thomas Gubler | 2014-10-07 | 3 | -75/+85 |
| |\ | |||||
| | * | fw pos control: add param to enable/disable usage of terrain estimate during ... | Thomas Gubler | 2014-09-23 | 2 | -6/+8 |
| | * | inform in GCS when switching to laser | Thomas Gubler | 2014-09-23 | 1 | -1/+4 |
| | * | Merge remote-tracking branch 'upstream/master' into fwlandingterrain | Thomas Gubler | 2014-09-23 | 22 | -349/+1640 |
| | |\ | |||||
| | * | | flare pitch limit: apply at throttle lim altitude | Thomas Gubler | 2014-09-21 | 2 | -1/+3 |
| | * | | Fixed delay calculation of laser | Lorenz Meier | 2014-09-06 | 1 | -1/+1 |
| | * | | make flare pitch angle a param | Thomas Gubler | 2014-09-04 | 2 | -62/+86 |
| | * | | fw landing: horiz flare check: fix wp distance | Thomas Gubler | 2014-09-04 | 1 | -3/+11 |
| | * | | Merge remote-tracking branch 'upstream/master' into fwlandingterrain | Thomas Gubler | 2014-09-04 | 1 | -2/+2 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'flarehorizontallimit' into fwlandingterrain | Thomas Gubler | 2014-09-03 | 1 | -2/+5 |
| | |\ \ \ | |||||
| | | * | | | fw landing: impose horizontal limit for start of flare | Thomas Gubler | 2014-09-03 | 1 | -1/+5 |
| | * | | | | Merge remote-tracking branch 'upstream/master' into fwlandingterrain | Thomas Gubler | 2014-09-03 | 1 | -42/+59 |
| | |\| | | | |||||
| | * | | | | Merge remote-tracking branch 'upstream/fwlandingterrain' into fwlandingterrain | Thomas Gubler | 2014-09-03 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'terrainaltfield' into fwlandingterrain | Lorenz Meier | 2014-09-03 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | * | | | | | | remove warnx | Thomas Gubler | 2014-09-03 | 1 | -3/+0 |
| | |/ / / / / | |||||
| | * | | | | | fw landing: if using terrain estimate, don't switch back during landing | Thomas Gubler | 2014-09-03 | 1 | -9/+14 |
| | * | | | | | Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain | Thomas Gubler | 2014-09-02 | 3 | -328/+603 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'hildistancesensor' into fwlandingterrain | Thomas Gubler | 2014-09-02 | 2 | -1/+55 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain | Thomas Gubler | 2014-09-01 | 1 | -1/+34 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | fw landing: use terrain estimate from global pos | Thomas Gubler | 2014-09-01 | 1 | -58/+24 |
| * | | | | | | | | | File test compile fixes | Lorenz Meier | 2014-10-05 | 1 | -5/+5 |
| * | | | | | | | | | Navigator: Optimize for space | Lorenz Meier | 2014-10-05 | 1 | -0/+2 |
| * | | | | | | | | | Dataman: Optimize for space | Lorenz Meier | 2014-10-05 | 1 | -0/+2 |
| * | | | | | | | | | Compile fixes in navigator | Lorenz Meier | 2014-10-05 | 1 | -3/+3 |
| * | | | | | | | | | Merge pull request #1363 from vooon/ftp_write_support | Lorenz Meier | 2014-10-05 | 2 | -39/+253 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | FTP: Return bytes written in payload. | Vladimir Ermakov | 2014-10-05 | 1 | -5/+2 |
| | * | | | | | | | | | FTP: Save errno in _copy_file(). | Vladimir Ermakov | 2014-10-05 | 1 | -2/+8 |
| | * | | | | | | | | | FTP: Add file checksum calculation command. | Vladimir Ermakov | 2014-09-22 | 2 | -0/+41 |
| | * | | | | | | | | | FTP: Rename command. | Vladimir Ermakov | 2014-09-22 | 2 | -0/+33 |
| | * | | | | | | | | | FTP: fix truncate errors. Also correct errno reporting. | Vladimir Ermakov | 2014-09-17 | 1 | -4/+4 |
| | * | | | | | | | | | FTP: Add truncate command. | Vladimir Ermakov | 2014-09-17 | 2 | -0/+129 |
| | * | | | | | | | | | FTP: Implement write command. | Vladimir Ermakov | 2014-09-17 | 1 | -17/+24 |
| | * | | | | | | | | | FTP: Add new open command for write. | Vladimir Ermakov | 2014-09-17 | 2 | -22/+23 |
| * | | | | | | | | | | Merge pull request #1360 from DonLakeFlyer/UnitTestFramework | Lorenz Meier | 2014-10-05 | 9 | -88/+108 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Upgraded unit test framework | Don Gagne | 2014-09-13 | 9 | -88/+108 |
| * | | | | | | | | | | | Fixed function name of mission modification logic, attributed @DrTon | Lorenz Meier | 2014-10-05 | 2 | -10/+12 |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into takeoff_fix | Thomas Gubler | 2014-10-05 | 36 | -180/+2471 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #1286 from PX4/mpc_track | Lorenz Meier | 2014-10-04 | 1 | -40/+208 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | mc_pos_control: AUTO speed limiting bug fixed | Anton Babushkin | 2014-10-02 | 1 | -4/+6 |
| | | * | | | | | | | | | | | Merge branch 'master' into mpc_track | Anton Babushkin | 2014-09-28 | 10 | -36/+176 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | mc_pos_control: commented code block removed | Anton Babushkin | 2014-09-28 | 1 | -10/+0 |
| | | * | | | | | | | | | | | | Merge branch 'master' into mpc_track | Anton Babushkin | 2014-09-18 | 28 | -772/+2444 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | mc_pos_control: move position offset limiting to separate method | Anton Babushkin | 2014-09-01 | 1 | -0/+28 |
| | | * | | | | | | | | | | | | | mc_pos_control: reset position setpoint on entering to AUTO mode | Anton Babushkin | 2014-09-01 | 1 | -5/+14 |
| | | * | | | | | | | | | | | | | Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_track | Anton Babushkin | 2014-09-01 | 38 | -308/+1286 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | mc_pos_control: navigation fixes, smooth position setpoint movements | Anton Babushkin | 2014-08-17 | 1 | -33/+44 |
| | | * | | | | | | | | | | | | | | mc_pos_control: trajectory following, using previous and next waypoints | Anton Babushkin | 2014-08-16 | 1 | -28/+156 |
| | * | | | | | | | | | | | | | | | Revert "Use global position altitude to report HUD altitude, for consistency." | Lorenz Meier | 2014-10-04 | 1 | -5/+1 |
| | * | | | | | | | | | | | | | | | Use global position altitude to report HUD altitude, for consistency. | tstellanova | 2014-10-03 | 1 | -1/+5 |