aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | | | uorb offboard control topic: add force sp flagThomas Gubler2014-07-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag has the same meaning as bit 10 of type_mask in MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL
| | | * | | | | | | | | | | | | | | | | | check sysid and compid for external setpointThomas Gubler2014-07-031-9/+11
| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Update offboard control uorb topicThomas Gubler2014-07-035-46/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work towards supporting the new external setpoint mavlink messages
| | * | | | | | | | | | | | | | | | | | | revert some of the OBC rate changesThomas Gubler2014-10-071-10/+7
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Revert "increase ram"Thomas Gubler2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bc23b6239c50527aa550eed3bc6f17dec15c5c97.
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-10-0719-286/+738
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1341 from PX4/fwlandingterrainThomas Gubler2014-10-073-75/+85
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | FW landing: use terrain estimate
| | | | * | | | | | | | | | | | | | | | | | fw pos control: add param to enable/disable usage of terrain estimate during ↵Thomas Gubler2014-09-232-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing
| | | | * | | | | | | | | | | | | | | | | | inform in GCS when switching to laserThomas Gubler2014-09-231-1/+4
| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-2330-352/+1704
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better calculation of wp distance when behind wp
| | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-041-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'flarehorizontallimit' into fwlandingterrainThomas Gubler2014-09-031-2/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| | | | | * | | | | | | | | | | | | | | | | | | | 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
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| | | | * | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-09-308-24/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary variableThomas Gubler2014-09-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfangThomas Gubler2014-09-3021-338/+1544
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/external_lgpl/tecs/tecs.cpp src/modules/commander/commander_params.c src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/navigator_main.cpp
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #20 from swissfang/swissfang_mfcheckJulian Oes2014-09-231-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mf checker: fix landing check, ensure feedback from all checks is sent
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | mf checker: fix landing check, ensure feedback from all checks is sentThomas Gubler2014-09-221-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'swissfang/master' into sbasdisableJulian Oes2014-09-231-11/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increase ramAndreas Antener2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch mission manager back to what is was beforeAndreas Antener2014-09-221-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change rates for mavlink streamsAndreas Antener2014-09-221-17/+28
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / ubx: add sbas config, default to disableThomas Gubler2014-09-222-0/+29
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #19 from swissfang/geofencedatamanJulian Oes2014-09-223-2/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geofence and dataman: lower update rates, lower priority
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator: geofence with global pos: reduce update rateThomas Gubler2014-09-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | datman: reduce task priorityThomas Gubler2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commander: improve output on gf violationThomas Gubler2014-09-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18 from swissfang/gpschecklocationJulian Oes2014-09-221-18/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | commander: move position of gps failure check
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commander: move position of gps failure checkThomas Gubler2014-09-211-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottle drop: Be less aggressive about schedulingLorenz Meier2014-09-211-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottle_drop: don't talk about distance and errorJulian Oes2014-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |