Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge branch 'master' into seatbelt_multirotor | Anton Babushkin | 2013-07-08 | 6 | -4/+5 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor | Anton Babushkin | 2013-06-15 | 1 | -2/+3 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into seatbelt_multirotor | Anton Babushkin | 2013-06-10 | 4 | -11/+25 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into seatbelt_multirotor | Anton Babushkin | 2013-05-28 | 2 | -1/+2 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into seatbelt_multirotor | Anton Babushkin | 2013-05-24 | 5 | -40/+249 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | position_estimator_inav added to config_px4fmu_default.mk | Anton Babushkin | 2013-05-17 | 1 | -0/+1 | |
* | | | | | | | | | | Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_br... | Lorenz Meier | 2013-08-19 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Put console and syslog on UART8, added support to nshterm for proper serial p... | Lorenz Meier | 2013-08-18 | 2 | -0/+3 | |
* | | | | | | | | | | Added support for FMUv1 for RGB led and dim led support | Lorenz Meier | 2013-08-17 | 1 | -0/+1 | |
* | | | | | | | | | | Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup... | Julian Oes | 2013-08-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | ||||||
| * | | | | | | | | Build fixes | Lorenz Meier | 2013-08-15 | 1 | -1/+1 | |
| * | | | | | | | | Merged master | Lorenz Meier | 2013-08-14 | 8 | -4/+20 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merged master | Lorenz Meier | 2013-07-15 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into new_state_machine | Julian Oes | 2013-07-08 | 6 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | First try for an ESC calibration tool | Julian Oes | 2013-06-20 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) int... | px4dev | 2013-08-14 | 7 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in th... | px4dev | 2013-08-13 | 3 | -5/+10 | |
| * | | | | | | | | Remove our depdenency on CONFIG_ARCH_BOARD_* coming from <nuttx/config.h> | px4dev | 2013-08-12 | 3 | -0/+6 | |
* | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup | Lorenz Meier | 2013-08-14 | 1 | -0/+1 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #347 from jgoppert/md25_dev | Lorenz Meier | 2013-08-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:jgoppert/Firmware into md25_dev | James Goppert | 2013-08-03 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Working on segway controller, restructure of fixedwing. | James Goppert | 2013-07-28 | 1 | -0/+1 | |
| | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Enabled mathlib | Lorenz Meier | 2013-08-04 | 1 | -0/+1 | |
| * | | | | | | | | | Add a missing module -> module makefile dependency | px4dev | 2013-08-03 | 1 | -1/+1 | |
| * | | | | | | | | | Move NuttX configurations out of the NuttX tree proper. This reduces the diff... | px4dev | 2013-08-03 | 2 | -2/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Fixed to FMUv2 autostart and config | Lorenz Meier | 2013-08-11 | 1 | -1/+1 | |
* | | | | | | | | | Merge a path definition from the mainline. | px4dev | 2013-08-04 | 1 | -0/+1 | |
* | | | | | | | | | Enabled filter in makefile | Lorenz Meier | 2013-08-04 | 2 | -0/+2 | |
* | | | | | | | | | Restructure things so that the PX4 configs move out of the NuttX tree, and mo... | px4dev | 2013-08-02 | 7 | -6/+15 | |
* | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup | Lorenz Meier | 2013-07-30 | 1 | -0/+1 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'config' of github.com:PX4/Firmware | Lorenz Meier | 2013-07-30 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Implemented config command, fixed a number range set / get issues for some se... | Lorenz Meier | 2013-07-26 | 1 | -0/+1 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | Enabled additional drivers on v2, kill misplaced code in mkblctrl | Lorenz Meier | 2013-07-28 | 1 | -1/+4 | |
* | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup | Lorenz Meier | 2013-07-28 | 1 | -0/+2 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #343 from PX4/meas_split | Lorenz Meier | 2013-07-28 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Merged | Lorenz Meier | 2013-07-14 | 1 | -1/+2 | |
| | |\| | | | | | | | ||||||
| | * | | | | | | | | Reworked airspeed driver to keep most of it abstract | Lorenz Meier | 2013-07-10 | 1 | -0/+2 | |
| | | |_|/ / / / / | | |/| | | | | | | ||||||
* | | | | | | | | | Merged in RAMTRON update | Lorenz Meier | 2013-07-28 | 1 | -0/+1 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Added RAMTRON device, updated diagrams | Lorenz Meier | 2013-07-28 | 1 | -0/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Fixed led and reboot linker challenges in C++ environments | Lorenz Meier | 2013-07-28 | 1 | -0/+1 | |
* | | | | | | | | Added iirFilter to LSM303D | Julian Oes | 2013-07-18 | 1 | -1/+0 | |
* | | | | | | | | Added led support to FMUv2 | Lorenz Meier | 2013-07-17 | 1 | -0/+1 | |
* | | | | | | | | More compile fixes | Lorenz Meier | 2013-07-16 | 1 | -1/+2 | |
* | | | | | | | | Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup | px4dev | 2013-07-14 | 1 | -1/+2 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into hott-esc | Simon Wilks | 2013-07-09 | 6 | -4/+5 | |
| |\| | | | | | | ||||||
| * | | | | | | | Refactoring of the hott telemetry driver and added functionality to read from... | Simon Wilks | 2013-07-04 | 1 | -1/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Add builtin command dependency on module makefiles, since they can also creat... | px4dev | 2013-07-11 | 1 | -1/+1 | |
* | | | | | | | Pull v2 pieces up to build with the merge | px4dev | 2013-07-07 | 7 | -7/+1 | |
* | | | | | | | Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup | px4dev | 2013-07-07 | 6 | -6/+8 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'master' of github.com:PX4/Firmware into integration | Lorenz Meier | 2013-06-17 | 1 | -2/+3 | |
| |\| | | | | |