Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | revert some of the OBC rate changes | Thomas Gubler | 2014-10-07 | 1 | -10/+7 | |
| * | | | | | | | | | | | | | | | | | | Revert "increase ram" | Thomas Gubler | 2014-10-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | reduce mavlink message buffer size | Thomas Gubler | 2014-10-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mavlink: change message buffer size to 4 | Thomas Gubler | 2014-09-30 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | switch back to common mavlink dialect | Thomas Gubler | 2014-09-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fix merge fail, remove double declaration of circuit breaker | Thomas Gubler | 2014-09-30 | 1 | -14/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-09-30 | 5 | -12/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary variable | Thomas Gubler | 2014-09-30 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang | Thomas Gubler | 2014-09-30 | 20 | -338/+1543 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #20 from swissfang/swissfang_mfcheck | Julian Oes | 2014-09-23 | 1 | -5/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | mf checker: fix landing check, ensure feedback from all checks is sent | Thomas Gubler | 2014-09-22 | 1 | -5/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increase ram | Andreas Antener | 2014-09-22 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch mission manager back to what is was before | Andreas Antener | 2014-09-22 | 1 | -16/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change rates for mavlink streams | Andreas Antener | 2014-09-22 | 1 | -17/+28 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #19 from swissfang/geofencedataman | Julian Oes | 2014-09-22 | 3 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator: geofence with global pos: reduce update rate | Thomas Gubler | 2014-09-21 | 1 | -1/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | datman: reduce task priority | Thomas Gubler | 2014-09-21 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commander: improve output on gf violation | Thomas Gubler | 2014-09-21 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18 from swissfang/gpschecklocation | Julian Oes | 2014-09-22 | 1 | -18/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commander: move position of gps failure check | Thomas Gubler | 2014-09-21 | 1 | -18/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottle drop: Be less aggressive about scheduling | Lorenz Meier | 2014-09-21 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottle_drop: don't talk about distance and error | Julian Oes | 2014-09-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12 from swissfang/bottledrop | Julian Oes | 2014-09-20 | 2 | -12/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bottle drop: Better cd default | Lorenz Meier | 2014-09-06 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better message formatting | Lorenz Meier | 2014-09-06 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | More user feedback on approach angle and approach error. Fix check for approa... | Lorenz Meier | 2014-09-06 | 1 | -9/+18 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop at the exact timing, drop only if facing into the right direction | Lorenz Meier | 2014-09-06 | 1 | -6/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator: fix status information, remove fence_valid flag (this is handled b... | Thomas Gubler | 2014-09-20 | 2 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geofence: better usefeedback if loaded | Thomas Gubler | 2014-09-20 | 3 | -1/+11 |