Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged beta_mavlink2 / master | Lorenz Meier | 2014-03-16 | 2 | -0/+4 |
|\ | |||||
| * | 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 |
| | | | |\ | | | | | | | | | | | | | Log fetcher utility | ||||
| | | | | * | dumpfile command and fetch_log.py tool implemented to fetch logs via nsh ↵ | Anton Babushkin | 2014-03-08 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | console on USB | ||||
| | | * | | | 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 mavlink_beta2 | Lorenz Meier | 2014-03-11 | 1 | -1/+0 |
|\| | | | |||||
| * | | | Merged stack size changes | Lorenz Meier | 2014-03-10 | 1 | -0/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | mavlink_onboard removed | Anton Babushkin | 2014-02-28 | 1 | -1/+0 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-03-11 | 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 | ||||
| | * | ROMFS: ignore comments and newlines in startup files, text in mixer files | Julian Oes | 2014-02-17 | 1 | -0/+4 |
| | | | |||||
* | | | 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 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v1_backside.mk src/modules/commander/commander.cpp src/modules/sdlog2/sdlog2.c | ||||
| * | \ \ \ | 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 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v2_logging.mk | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'launchdetection' into navigator_new_fw | Thomas Gubler | 2013-12-29 | 4 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| | | * | | | | | | | | | 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 ↵ | Thomas Gubler | 2013-12-23 | 2 | -0/+158 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/systemcmds/tests/module.mk src/systemcmds/tests/tests.h | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2013-12-13 | 3 | -3/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/drivers/px4io/px4io.cpp | ||||
| | * | | | | | | | | | | | | 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 |
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add function to geo.c to determine if global position is inside fence - Add navigator support/commands for maintaining fence coords. - Add data manager module to support persistence fence storage. Can store other data, but only used for fence at this time. - Add unit tests for data manager | ||||
| * | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |