Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged beta into paul_estimator | Lorenz Meier | 2014-02-16 | 3 | -8/+13 |
|\ | |||||
| * | Merged master into beta | Lorenz Meier | 2014-02-11 | 2 | -0/+11 |
| |\ | |||||
| * | | 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 '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 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-14 | 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 navigator_new_vector | Anton Babushkin | 2014-01-08 | 2 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-06 | 4 | -23/+8 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into navigator_new | Lorenz Meier | 2014-01-05 | 3 | -23/+5 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into navigator_new_fw | Thomas Gubler | 2014-01-01 | 1 | -159/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'launchdetection' into navigator_new_fw | Thomas Gubler | 2013-12-29 | 4 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | initial wip version of launchdetector | Thomas Gubler | 2013-11-15 | 2 | -0/+2 |
| * | | | | | | | | | | | Merge branch 'master' into navigator_new_vector fix | Anton Babushkin | 2014-01-01 | 1 | -158/+0 |
| * | | | | | | | | | | | Use new controllers in logging build | Anton Babushkin | 2013-12-30 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'navigator_new' into navigator_new_vector, WIP | Anton Babushkin | 2013-12-28 | 4 | -0/+4 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | add dataman to config_px4fmu-v2_logging.mk | Thomas Gubler | 2013-12-23 | 1 | -0/+1 |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_t... | Thomas Gubler | 2013-12-23 | 2 | -0/+158 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navi... | Thomas Gubler | 2013-12-13 | 3 | -3/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Navigator: only whitespace fixes | Julian Oes | 2013-11-18 | 2 | -2/+2 |
| | * | | | | | | | | | | | | Makefiles: fix compilation for backside | Julian Oes | 2013-11-18 | 1 | -0/+1 |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip | Julian Oes | 2013-11-18 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Add data manager module and fence support to navigator | Jean Cyr | 2013-11-03 | 2 | -0/+2 |
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | | makefiles and rc scripts fixed to use new attitude and position controllers | Anton Babushkin | 2013-12-26 | 2 | -4/+2 |
| * | | | | | | | | | | | | | Merge branch 'mathlib_new' into vector_control2 | Anton Babushkin | 2013-12-25 | 1 | -0/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mathlib_new | Anton Babushkin | 2013-12-23 | 1 | -0/+157 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | New mathlib, WIP | Anton Babushkin | 2013-12-18 | 1 | -0/+50 |
| * | | | | | | | | | | | | | | Merge branch 'mathlib_new' into vector_control2 | Anton Babushkin | 2013-12-25 | 1 | -0/+157 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-13 | 3 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into vector_control | Anton Babushkin | 2013-11-16 | 1 | -0/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add mc_att_control_vector to apps list | Anton Babushkin | 2013-11-08 | 2 | -0/+2 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into paul_estimator | Lorenz Meier | 2014-02-11 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merged origin/master into pubsub_cleanup | Lorenz Meier | 2014-02-09 | 5 | -200/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Build the sensors as part of the test binary | Lorenz Meier | 2014-01-14 | 2 | -0/+12 |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into paul_estimator | Lorenz Meier | 2014-02-05 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | mkblctrl fmuv2 support added | marco | 2014-02-02 | 1 | -0/+2 |
* | | | | | | | | | | | | | | merge master | Lorenz Meier | 2014-01-31 | 4 | -51/+4 |
|\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merged master into logging | Lorenz Meier | 2014-01-20 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | 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 paul_estimator | Lorenz Meier | 2014-01-12 | 2 | -0/+2 |
|\| | | | | | | | | | |