aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix order of arguments (merge fix)uorbtinymergeThomas Gubler2014-11-251-1/+1
* Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymergeThomas Gubler2014-11-258-69/+195
|\
| * Merge branch 'master' of git://github.com/PX4/Firmware into uORB_tinyJames Goppert2014-06-2328-719/+1223
| |\
| * | Added uORB tiny pub/sub for usage without struct on stack.James Goppert2014-06-059-239/+232
* | | Merge remote-tracking branch 'upstream/master' into rosThomas Gubler2014-11-24137-601/+1536
|\ \ \
| * | | Update NuttX version, MD5 fixLorenz Meier2014-11-231-0/+0
| * | | dataman: less verbose, fix code styleLorenz Meier2014-11-221-9/+5
| * | | INAV: Less verboseLorenz Meier2014-11-221-5/+3
| * | | position controller main: Less verboseLorenz Meier2014-11-221-2/+0
| * | | mc attitude controller: Less verboseLorenz Meier2014-11-221-2/+0
| * | | EKF: less verboseLorenz Meier2014-11-221-4/+0
| * | | GPS: be less verboseLorenz Meier2014-11-221-1/+0
| * | | ROMFS: Do only output necessary information on bootLorenz Meier2014-11-222-6/+1
| * | | Fix FD for commander arm operationLorenz Meier2014-11-221-2/+6
| * | | INAV: use int for outputsLorenz Meier2014-11-222-7/+8
| * | | Merge pull request #1462 from stebl/masterLorenz Meier2014-11-223-8/+21
| |\ \ \
| | * | | made invalid setpoints publish once every time it enters an invalid stateSteven Blass2014-11-181-1/+8
| | * | | Merge branch 'offboard_fix'Steven Blass2014-11-183-7/+12
| | |\ \ \
| | | * | | improved readability of offboard fixesSteven Blass2014-11-183-7/+12
| | * | | | Merge branch 'offboard_fix'Steven Blass2014-11-172-5/+6
| | |\| | |
| | | * | | fixed yaw/yawrate bit masking. fixed navigator overriding offboard setpointSteven Blass2014-11-172-5/+6
| | |/ / /
| * | | | Merge pull request #1453 from hsteinhaus/apm_compass_compatLorenz Meier2014-11-225-21/+42
| |\ \ \ \
| | * | | | UAVCAN: preserve original UAVCAN message timestampsHolger Steinhaus2014-11-184-10/+3
| | * | | | UAVCAN: fix mag report timestampHolger Steinhaus2014-11-131-5/+2
| | * | | | UACVAN: add read()-style interface to mag deviceHolger Steinhaus2014-11-132-11/+39
| | * | | | UAVCAN: declare mag external again to allow different rotation than the inter...Holger Steinhaus2014-11-131-1/+1
| | * | | | UAVCAN: improve mag compatibilityHolger Steinhaus2014-11-131-0/+3
| * | | | | Merge pull request #1464 from DonLakeFlyer/ParametersInPX4Lorenz Meier2014-11-214-0/+20
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Parameter xml metadata in .px4Don Gagne2014-11-184-0/+20
| |/ / / /
| * | | | Toolchain: Allow GCC 4.7 and 4.8 variantsLorenz Meier2014-11-171-3/+3
| * | | | Fix up stack sizesLorenz Meier2014-11-175-4/+6
| * | | | Do not spam filter resets in static modeLorenz Meier2014-11-171-2/+5
| * | | | Fix output of ver hwcmd callLorenz Meier2014-11-171-1/+1
| * | | | Merge pull request #1419 from PX4/nshtermLorenz Meier2014-11-171-2/+25
| |\ \ \ \
| | * | | | NSH term: Only time out if no arming information is available, if arming info...Lorenz Meier2014-11-011-2/+25
| * | | | | Merge pull request #1420 from PX4/rctypeLorenz Meier2014-11-172-2/+55
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1460 from DonLakeFlyer/rctypeLorenz Meier2014-11-171-1/+6
| | |\ \ \ \ \
| | | * | | | | Correct setting of DSM and ST24 flagsDon Gagne2014-11-161-1/+6
| | * | | | | | Merge pull request #1431 from DonLakeFlyer/rctypeLorenz Meier2014-11-051-0/+2
| | |\| | | | |
| | | * | | | | Initialize RSSI so it doesn't remain uninitializedDon Gagne2014-11-051-0/+2
| | |/ / / / /
| | * | | | | Force RSSI to zero if RC is lostLorenz Meier2014-11-011-0/+5
| | * | | | | Encode RC type in RSSI field for GCSLorenz Meier2014-11-011-1/+42
| | |/ / / /
| * | | | | Fix PWM commandLorenz Meier2014-11-161-34/+34
| * | | | | px4io: added RC_CONFIG, SET_OVERRIDE_OK and CLEAR_OVERRIDE_OK ioctlsAndrew Tridgell2014-11-161-4/+4
| * | | | | px4io: added OVERRIDE_IMMEDIATE arming flagAndrew Tridgell2014-11-165-3/+31
| * | | | | px4io: publish pwm values when STATUS_FLAGS_FMU_OK is not setAndrew Tridgell2014-11-161-4/+0
| * | | | | px4io: added RC_CONFIG, SET_OVERRIDE_OK and CLEAR_OVERRIDE_OK ioctlsAndrew Tridgell2014-11-162-0/+62
| * | | | | Merge pull request #1459 from PX4/navprioThomas Gubler2014-11-161-1/+1
| |\ \ \ \ \
| | * | | | | Adjust navigator priorityLorenz Meier2014-11-161-1/+1
| |/ / / / /
| * | | | | Merge pull request #1458 from PX4/fix_navigatorloadLorenz Meier2014-11-161-1/+2
| |\ \ \ \ \