Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge branch 'master' into paul_estimator | Lorenz Meier | 2014-02-05 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | merge master | Lorenz Meier | 2014-01-31 | 4 | -51/+4 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into paul_estimator | Lorenz Meier | 2014-01-12 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-01-12 | 4 | -0/+57 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merged master | Lorenz Meier | 2014-01-05 | 1 | -6/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Added new estimator framework, actual estimation code not yet present | Lorenz Meier | 2014-01-01 | 2 | -2/+2 | |
| * | | | | | | | | | | | Removed fp suffix warning | Lorenz Meier | 2014-01-01 | 1 | -2/+1 | |
| * | | | | | | | | | | | Deleted backside config to cut down build times | Lorenz Meier | 2014-01-01 | 1 | -161/+0 | |
* | | | | | | | | | | | | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-29 | 3 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into beta_mavlink2 | Anton Babushkin | 2014-03-15 | 2 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder | Lorenz Meier | 2014-03-12 | 3 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2 | Lorenz Meier | 2014-03-12 | 3 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge pull request #712 from PX4/fetch_log | Lorenz Meier | 2014-03-12 | 2 | -0/+2 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | ||||||
| | | | | * | | | | | | | | | dumpfile command and fetch_log.py tool implemented to fetch logs via nsh cons... | Anton Babushkin | 2014-03-08 | 2 | -0/+2 | |
| | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | | | ||||||
| | | * | / | | | | | | | | gpio_led: bugs fixed, PX4FMUv2 support added | Anton Babushkin | 2014-02-11 | 1 | -0/+1 | |
| | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | * / | | | | | | | | | Added support for driver rangefinder | Lorenz Meier | 2014-03-08 | 1 | -0/+1 | |
| | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | Merged stack size changes | Lorenz Meier | 2014-03-10 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge pull request #673 from PX4/romfs_prune | Lorenz Meier | 2014-03-10 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | ROMFS: ignore comments and newlines in startup files, text in mixer files | Julian Oes | 2014-02-17 | 1 | -0/+4 | |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||||
| * | / | | | | | | | mavlink_onboard removed | Anton Babushkin | 2014-02-28 | 1 | -1/+0 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 6 | -338/+41 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merged master into beta | Lorenz Meier | 2014-02-11 | 2 | -0/+11 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | Merged origin/master into pubsub_cleanup | Lorenz Meier | 2014-02-09 | 5 | -200/+6 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | * | | | | | | mkblctrl fmuv2 support added | marco | 2014-02-02 | 1 | -0/+2 | |
| | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Merged master into logging | Lorenz Meier | 2014-01-20 | 3 | -0/+3 | |
| | | |\ \ \ \ \ | ||||||
| | * | | | | | | | Build the sensors as part of the test binary | Lorenz Meier | 2014-01-14 | 2 | -0/+12 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Trim down FMUv1 config, remove not commonly used modules from default set | Lorenz Meier | 2014-02-01 | 1 | -4/+0 | |
| * | | | | | | | px4fmu-v2_test makefile fixed, CMSIS added | Anton Babushkin | 2014-01-23 | 1 | -0/+5 | |
| * | | | | | | | makefile for backside removed | Anton Babushkin | 2014-01-23 | 1 | -147/+0 | |
| * | | | | | | | mc_att_control_vector renamed to mc_att_control | Anton Babushkin | 2014-01-19 | 2 | -2/+2 | |
| * | | | | | | | Merge branch 'autostart_cleanup' into navigator_new_vector | Anton Babushkin | 2014-01-17 | 4 | -0/+150 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'master' into autostart_cleanup | Anton Babushkin | 2014-01-14 | 2 | -0/+2 | |
| | |\| | | | | | ||||||
| | * | | | | | | Merge branch 'master' into autostart_cleanup | Anton Babushkin | 2014-01-10 | 2 | -0/+55 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | * | | | | | | hw_ver app added for hardware version checking | Anton Babushkin | 2014-01-07 | 4 | -0/+4 | |
| * | | | | | | | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-17 | 4 | -199/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into navigator_new | Thomas Gubler | 2014-01-17 | 5 | -199/+3 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | ||||||
| | | * | | | | | | Remove outdated configs, clean up pwm limit compilation | Lorenz Meier | 2014-01-15 | 2 | -194/+0 | |
| | | * | | | | | | Disabling EEPROM and old RAMTRON driver | Lorenz Meier | 2014-01-14 | 4 | -5/+3 | |
| | | | |_|/ / / | | | |/| | | | | ||||||
| * | | | | | | | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-14 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Added mtd tool | Lorenz Meier | 2014-01-11 | 2 | -0/+2 | |
| | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-13 | 2 | -7/+12 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into navigator_new | Thomas Gubler | 2014-01-11 | 4 | -0/+57 | |
| | |\| | | | | ||||||
| | | * | | | | Merge branch 'master' into mount_tests | Lorenz Meier | 2014-01-07 | 3 | -21/+6 | |
| | | |\| | | | ||||||
| | | * | | | | Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests | Lorenz Meier | 2014-01-07 | 1 | -2/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests | Lorenz Meier | 2014-01-05 | 1 | -0/+3 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Do not require suffixed constants | Lorenz Meier | 2014-01-05 | 1 | -2/+1 | |
| | | | | |_|/ / | | | | |/| | | | ||||||
| | | * | | | | | Improved mount test | Lorenz Meier | 2014-01-04 | 1 | -0/+4 | |
| | | * | | | | | Create test config for FMUv1 | Lorenz Meier | 2014-01-04 | 1 | -0/+48 | |
| | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | Fixed tests config | Lorenz Meier | 2014-01-04 | 1 | -0/+3 | |
| | | |/ / / | ||||||
| * | | | | | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-08 | 2 | -0/+2 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | |