aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin...Thomas Gubler2014-07-14107-1651/+4079
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | fix merge errors in offboard.cppThomas Gubler2014-07-081-8/+11
| | * | | | | | | | | | | | | | | | | | remove commentThomas Gubler2014-07-081-1/+0
| | * | | | | | | | | | | | | | | | | | fix merge of mavlink submoduleThomas Gubler2014-07-081-0/+0
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin...Thomas Gubler2014-07-08339-119936/+1203
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | WIP, change uorb offboard control sp topicThomas Gubler2014-07-073-39/+55
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin...Thomas Gubler2014-07-0733-175/+423
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | parsing of MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNALThomas Gubler2014-07-031-2/+32
| | * | | | | | | | | | | | | | | | | | | | uorb offboard control topic: add force sp flagThomas Gubler2014-07-031-0/+2
| | * | | | | | | | | | | | | | | | | | | | check sysid and compid for external setpointThomas Gubler2014-07-031-9/+11
| | * | | | | | | | | | | | | | | | | | | | Update offboard control uorb topicThomas Gubler2014-07-035-46/+102
| * | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | reduce mavlink message buffer sizeThomas Gubler2014-10-051-1/+1
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | remove warnxThomas Gubler2014-10-051-2/+0
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | mavlink: change message buffer size to 4Thomas Gubler2014-09-301-2/+2
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | switch back to common mavlink dialectThomas Gubler2014-09-301-1/+1
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | ubx: disable sbas configuration per defaultThomas Gubler2014-09-301-0/+2
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | fix merge fail, remove double declaration of circuit breakerThomas Gubler2014-09-301-14/+0
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | re-enable MC apps on FMUV1Thomas Gubler2014-09-301-4/+4
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-09-309-28/+55
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | remove unnecessary variableThomas Gubler2014-09-301-2/+0
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfangThomas Gubler2014-09-3030-341/+1598
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #20 from swissfang/swissfang_mfcheckJulian Oes2014-09-231-5/+15
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | mf checker: fix landing check, ensure feedback from all checks is sentThomas Gubler2014-09-221-5/+15
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21 from swissfang/sbasdisableJulian Oes2014-09-232-0/+29
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'swissfang/master' into sbasdisableJulian Oes2014-09-232-13/+14
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | viper: removed wrong failsafe valuesJulian Oes2014-09-231-2/+0