aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* fix includeThomas Gubler2014-12-251-1/+1
* Merge remote-tracking branch 'upstream/isvtol' into dev_rosThomas Gubler2014-12-254-45/+28
|\
| * VTOL: Do not allow manual overrideLorenz Meier2014-12-231-1/+1
| * Merge branch 'master' of github.com:PX4/Firmware into isvtolLorenz Meier2014-12-226-78/+203
| |\
| * | mc att ctl: remove autostart id paramThomas Gubler2014-12-221-8/+0
| * | fw att ctl: remove autostart id paramThomas Gubler2014-12-221-7/+0
| * | fix flag_external_manual_override_okThomas Gubler2014-12-181-2/+1
| * | is_vtol flag in vehicle_statusThomas Gubler2014-12-184-33/+40
* | | Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-2527-161/+477
|\ \ \
| * \ \ Merge pull request #1465 from PX4/mcposoffbaltitudeLorenz Meier2014-12-251-3/+4
| |\ \ \
| | * | | MC pos control offb: read altitude sp separatelyThomas Gubler2014-11-191-3/+4
| * | | | add interrupt latency printout command and mean/variance to interval performa...Mark Whitehorn2014-12-244-16/+60
| * | | | VTOL: Remove unneeded headersLorenz Meier2014-12-231-3/+0
| * | | | UAVCAN: Move into lib directoryLorenz Meier2014-12-232-2/+2
| * | | | Merge pull request #1523 from bansiesta/geofence_parse_fixThomas Gubler2014-12-231-4/+13
| |\ \ \ \
| | * | | | geofence: be more verbose if import failsBan Siesta2014-12-211-3/+6
| | * | | | geofence: don't fall over lines containing just a LFBan Siesta2014-12-211-1/+7
| | | |_|/ | | |/| |
| * | | | Merge pull request #1518 from bansiesta/do_jump_feedbackThomas Gubler2014-12-2313-55/+195
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | navigator: reset some flags after the mission result has been publishedBan Siesta2014-12-191-0/+7
| | * | | navigator: report using mission result if a DO_JUMP waypoint has been changedBan Siesta2014-12-194-1/+28
| | * | | navigator: report when a waypoint has been reached not when the whole mission...Ban Siesta2014-12-191-8/+2
| | * | | navigator: don't publish mission result immediately but only after every iter...Ban Siesta2014-12-197-17/+26
| | * | | mavlink: don't slow mission updates down like this, otherwise we might miss m...Ban Siesta2014-12-191-3/+0
| | * | | navigator: deleted some verbose outputBan Siesta2014-12-191-1/+0
| | * | | topics: move geofence status to its own topicBan Siesta2014-12-196-28/+135
| * | | | MPU6000: Add regdump commandGrant Morphett2014-12-211-2/+42
| * | | | Remove vel resetM.H.Kabir2014-12-211-4/+0
| * | | | IO firmware: Change to inttypes headerLorenz Meier2014-12-201-1/+1
| * | | | PX4IO firmware: Add required include.Lorenz Meier2014-12-201-0/+2
| |/ / /
| * | | Merge pull request #1493 from PX4/fwposcontrolmodeThomas Gubler2014-12-191-57/+69
| |\ \ \
| | * | | fix comment style and typeThomas Gubler2014-12-131-3/+3
| | * | | fw pos ctrl: takeoff special case only in takeoffThomas Gubler2014-12-131-24/+27
| | * | | Merge remote-tracking branch 'upstream/master' into fwposcontrolmodeThomas Gubler2014-12-131-3/+3
| | |\ \ \
| | * | | | fw pos control: improve mode logic slightlyThomas Gubler2014-12-131-26/+36
| | * | | | fw pos control: better check for control modeThomas Gubler2014-12-131-5/+4
| * | | | | shortened parameter names to max 16 bytesRoman Bapst2014-12-182-10/+10
| * | | | | fixed parameter issue for VTOL so that parameter wiki tool can document themRoman Bapst2014-12-182-10/+85
| | |_|_|/ | |/| | |
* | | | | fix small compile error after mergeThomas Gubler2014-12-191-10/+10
* | | | | multiplatform subscription: uorb: separate class for no callback caseThomas Gubler2014-12-182-22/+41
* | | | | Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-1824-329/+1257
|\| | | |
| * | | | fw pos ctl: compile with -OsThomas Gubler2014-12-171-0/+2
| * | | | fw pos ctl: make loop performance counter more meaningfulThomas Gubler2014-12-171-4/+2
| * | | | removed white space noisetumbili2014-12-152-3/+3
| * | | | Merge branch 'master' of https://github.com/PX4/Firmware into vtol_mergetumbili2014-12-1557-3585/+2848
| |\ \ \ \
| * | | | | added sanity checkto prevent false low airspeed readings during transitiontumbili2014-12-151-0/+5
| * | | | | merged with caipi_airspeed_scaletumbili2014-12-102-2/+85
| |\ \ \ \ \
| | * | | | | added scaling of mc pitch control with airspeedtumbili2014-12-062-2/+85
| * | | | | | fixed _loop_perf messagetumbili2014-12-061-1/+1
| |/ / / / /
| * | | | | make sure vtol attitude control module is started with idle speed set for mul...Roman Bapst2014-12-041-2/+6
| * | | | | introduced vtol_motor_count and idle_pwm_mc parameterRoman Bapst2014-12-041-10/+18