aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into paul_estimatorLorenz Meier2014-02-051-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge masterLorenz Meier2014-01-314-51/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into paul_estimatorLorenz Meier2014-01-122-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into paul_estimatorLorenz Meier2014-01-124-0/+57
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merged masterLorenz Meier2014-01-051-6/+4
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added new estimator framework, actual estimation code not yet presentLorenz Meier2014-01-012-2/+2
| * | | | | | | | | | | Removed fp suffix warningLorenz Meier2014-01-011-2/+1
| * | | | | | | | | | | Deleted backside config to cut down build timesLorenz Meier2014-01-011-161/+0
* | | | | | | | | | | | Merge remote-tracking branch 'px4/master' into bottle_dropJulian Oes2014-03-293-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into beta_mavlink2Anton Babushkin2014-03-152-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinderLorenz Meier2014-03-123-0/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2Lorenz Meier2014-03-123-0/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge pull request #712 from PX4/fetch_logLorenz Meier2014-03-122-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | dumpfile command and fetch_log.py tool implemented to fetch logs via nsh cons...Anton Babushkin2014-03-082-0/+2
| | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | | * | / | | | | | | | gpio_led: bugs fixed, PX4FMUv2 support addedAnton Babushkin2014-02-111-0/+1
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * / | | | | | | | | Added support for driver rangefinderLorenz Meier2014-03-081-0/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Merged stack size changesLorenz Meier2014-03-101-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #673 from PX4/romfs_pruneLorenz Meier2014-03-101-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | ROMFS: ignore comments and newlines in startup files, text in mixer filesJulian Oes2014-02-171-0/+4
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | / | | | | | | mavlink_onboard removedAnton Babushkin2014-02-281-1/+0
| |/ / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'px4/master' into bottle_dropJulian Oes2014-03-076-338/+41
|\| | | | | | | |
| * | | | | | | | Merged master into betaLorenz Meier2014-02-112-0/+11
| |\| | | | | | |
| | * | | | | | | Merged origin/master into pubsub_cleanupLorenz Meier2014-02-095-200/+6
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | mkblctrl fmuv2 support addedmarco2014-02-021-0/+2
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merged master into loggingLorenz Meier2014-01-203-0/+3
| | | |\ \ \ \ \
| | * | | | | | | Build the sensors as part of the test binaryLorenz Meier2014-01-142-0/+12
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Trim down FMUv1 config, remove not commonly used modules from default setLorenz Meier2014-02-011-4/+0
| * | | | | | | px4fmu-v2_test makefile fixed, CMSIS addedAnton Babushkin2014-01-231-0/+5
| * | | | | | | makefile for backside removedAnton Babushkin2014-01-231-147/+0
| * | | | | | | mc_att_control_vector renamed to mc_att_controlAnton Babushkin2014-01-192-2/+2
| * | | | | | | Merge branch 'autostart_cleanup' into navigator_new_vectorAnton Babushkin2014-01-174-0/+150
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'master' into autostart_cleanupAnton Babushkin2014-01-142-0/+2
| | |\| | | | |
| | * | | | | | Merge branch 'master' into autostart_cleanupAnton Babushkin2014-01-102-0/+55
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | hw_ver app added for hardware version checkingAnton Babushkin2014-01-074-0/+4
| * | | | | | | Merge branch 'navigator_new' into navigator_new_vectorAnton Babushkin2014-01-174-199/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into navigator_newThomas Gubler2014-01-175-199/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Remove outdated configs, clean up pwm limit compilationLorenz Meier2014-01-152-194/+0
| | | * | | | | | Disabling EEPROM and old RAMTRON driverLorenz Meier2014-01-144-5/+3
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge branch 'master' into navigator_new_vectorAnton Babushkin2014-01-142-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Added mtd toolLorenz Meier2014-01-112-0/+2
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'navigator_new' into navigator_new_vectorAnton Babushkin2014-01-132-7/+12
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'upstream/master' into navigator_newThomas Gubler2014-01-114-0/+57
| | |\| | | |
| | | * | | | Merge branch 'master' into mount_testsLorenz Meier2014-01-073-21/+6
| | | |\| | |
| | | * | | | Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_testsLorenz Meier2014-01-071-2/+1
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_testsLorenz Meier2014-01-051-0/+3
| | | | |\ \ \ \
| | | | * | | | | Do not require suffixed constantsLorenz Meier2014-01-051-2/+1
| | | | | |_|/ / | | | | |/| | |
| | | * | | | | Improved mount testLorenz Meier2014-01-041-0/+4
| | | * | | | | Create test config for FMUv1Lorenz Meier2014-01-041-0/+48
| | | | |/ / / | | | |/| | |
| | | * | | | Fixed tests configLorenz Meier2014-01-041-0/+3
| | | |/ / /
| * | | | | Merge branch 'master' into navigator_new_vectorAnton Babushkin2014-01-082-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |