Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin... | Thomas Gubler | 2014-07-14 | 107 | -1651/+4079 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | fix merge errors in offboard.cpp | Thomas Gubler | 2014-07-08 | 1 | -8/+11 | |
| | * | | | | | | | | | | | | | | | | | | remove comment | Thomas Gubler | 2014-07-08 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | | | | | | | fix merge of mavlink submodule | Thomas Gubler | 2014-07-08 | 1 | -0/+0 | |
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin... | Thomas Gubler | 2014-07-08 | 339 | -119936/+1203 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | WIP, change uorb offboard control sp topic | Thomas Gubler | 2014-07-07 | 3 | -39/+55 | |
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin... | Thomas Gubler | 2014-07-07 | 33 | -175/+423 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | parsing of MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL | Thomas Gubler | 2014-07-03 | 1 | -2/+32 | |
| | * | | | | | | | | | | | | | | | | | | | | uorb offboard control topic: add force sp flag | Thomas Gubler | 2014-07-03 | 1 | -0/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | check sysid and compid for external setpoint | Thomas Gubler | 2014-07-03 | 1 | -9/+11 | |
| | * | | | | | | | | | | | | | | | | | | | | Update offboard control uorb topic | Thomas Gubler | 2014-07-03 | 5 | -46/+102 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #1372 from PX4/swissfang | Lorenz Meier | 2014-10-07 | 17 | -17/+1140 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | 21 | -286/+769 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | 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 | 39 | -355/+1758 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -72/+158 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | remove warnx | Thomas Gubler | 2014-10-05 | 1 | -2/+0 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | ubx: disable sbas configuration per default | Thomas Gubler | 2014-09-30 | 1 | -0/+2 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | fix merge fail, remove double declaration of circuit breaker | Thomas Gubler | 2014-09-30 | 1 | -14/+0 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | re-enable MC apps on FMUV1 | Thomas Gubler | 2014-09-30 | 1 | -4/+4 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-09-30 | 9 | -28/+55 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | remove unnecessary variable | Thomas Gubler | 2014-09-30 | 1 | -2/+0 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang | Thomas Gubler | 2014-09-30 | 30 | -341/+1598 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21 from swissfang/sbasdisable | Julian Oes | 2014-09-23 | 2 | -0/+29 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'swissfang/master' into sbasdisable | Julian Oes | 2014-09-23 | 2 | -13/+14 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | viper: removed wrong failsafe values | Julian Oes | 2014-09-23 | 1 | -2/+0 |