aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into new_state_machineJulian Oes2013-07-082165-485353/+10903
|\
| * Merge pull request #320 from PX4/integrationLorenz Meier2013-07-072150-485204/+10653
| |\
| | * Commented flow example slightly betterLorenz Meier2013-07-051-0/+11
| | * Added gyro scaling as parameterLorenz Meier2013-07-052-3/+15
| | * Fixed HIL handlingLorenz Meier2013-07-052-3/+4
| | * Improved limits handlingLorenz Meier2013-07-052-0/+23
| | * Improved return statement of sensors appLorenz Meier2013-07-041-1/+2
| | * Small improvements in system libLorenz Meier2013-07-043-5/+20
| | * Fixes to fixed wing control example, fixes to the way the control lib publish...Lorenz Meier2013-07-043-14/+14
| | * Fixes to estimator and HIL startup scriptLorenz Meier2013-07-043-7/+7
| | * Substantial improvements to math libLorenz Meier2013-07-0413-11/+462
| | * Removed leftover mavlink_receiver.c fileLorenz Meier2013-07-041-600/+0
| | * Updated mavlink version, massive improvements in mission lib, fixes to HIL (s...Lorenz Meier2013-07-04197-2093/+10274
| | * Update to uORB topics, added / improved position triplet, added radio statusLorenz Meier2013-07-046-4/+251
| | * Merge branch 'master' of github.com:PX4/Firmware into origin_integrationLorenz Meier2013-07-0216-124/+254
| | |\
| | * \ Merge pull request #319 from PX4/kalman_navsjwilks2013-06-305-101/+168
| | |\ \
| | | * | Fixed yaw estimate, minor comment and code style improvements. Added option f...Lorenz Meier2013-06-305-33/+148
| | | * | Merge branch 'mag-correct-yaw' of github.com:jgoppert/Firmware into fw_hil_testLorenz Meier2013-06-221-73/+25
| | | |\ \
| | | | * | Changed to yaw only mag correction.James Goppert2013-06-181-73/+25
| | * | | | Merge branch 'master' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-303-3/+25
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merged masterLorenz Meier2013-06-214-66/+201
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'master' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-172-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-1720-80/+2295
| | |\ \ \ \ \
| | * | | | | | Turn off loggingpx4dev2013-06-161-4/+4
| | * | | | | | Set the serial port speed before trying to talk to IOpx4dev2013-06-161-3/+10
| | * | | | | | Use a better way of guessing whether we can use both-edges mode.px4dev2013-06-121-1/+3
| | * | | | | | All NuttX configs are called 'nsh' now, stop trying to guess based on the boa...px4dev2013-06-121-1/+1
| | * | | | | | Merge branch 'master' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-132-16/+38
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergedLorenz Meier2013-06-075-26/+101
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'integration' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-070-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ MergedLorenz Meier2013-06-078-32/+101
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ MergedLorenz Meier2013-06-078-32/+101
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / /
| | * | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into integrationLorenz Meier2013-06-062-2/+11
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Tracked task_spawn API changes for sdlog2 and att_estm_so3_compLorenz Meier2013-06-062-2/+2
| | * | | | | | | | | | MergedLorenz Meier2013-06-0614-26/+2892
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Safe a dozen bytes of flashLorenz Meier2013-06-061-16/+0
| | * | | | | | | | | | | Merged masterLorenz Meier2013-06-0613-158/+524
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Adjust upload target name for v1.x FMUpx4dev2013-06-021-1/+1
| | * | | | | | | | | | | | Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own versi...px4dev2013-06-0123-25/+25
| | * | | | | | | | | | | | All apps compiling and linked (listed in NSH help), but not executing yetLorenz Meier2013-06-014-2/+8
| | * | | | | | | | | | | | Adjusted to renaming of TCB in NuttXLorenz Meier2013-06-015-38/+36
| | * | | | | | | | | | | | Integration WIP with current NuttX versionLorenz Meier2013-06-0116-18/+27
| | * | | | | | | | | | | | Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX nowLorenz Meier2013-06-011877-482974/+6
| * | | | | | | | | | | | | Merge pull request #325 from sjwilks/airspeedLorenz Meier2013-07-072-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into airspeedSimon Wilks2013-07-0717-127/+279
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #314 from DrTon/att_control_der_fixsjwilks2013-07-0216-123/+233
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Copyright fixesAnton Babushkin2013-06-2213-56/+167
| | * | | | | | | | | | | | | multirotor_attitude_control performance improved, tested in flight. PID libra...Anton Babushkin2013-06-207-70/+69
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #318 from PX4/global_pos_logsjwilks2013-06-302-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Added global position to loggingLorenz Meier2013-06-302-1/+21
| |/ / / / / / / / / / / /