Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'px4/new_state_machine_drton' into ↵ | Julian Oes | 2013-08-15 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | fmuv2_bringup_new_state_machine_drton Conflicts: src/drivers/blinkm/blinkm.cpp src/drivers/px4io/px4io.cpp src/modules/commander/state_machine_helper.c src/modules/px4iofirmware/protocol.h src/modules/px4iofirmware/registers.c src/modules/systemlib/systemlib.h src/systemcmds/reboot/reboot.c | ||||
| * | 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 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiling again Conflicts: src/modules/fixedwing_att_control/fixedwing_att_control_att.c src/modules/fixedwing_att_control/fixedwing_att_control_rate.c src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c src/modules/mavlink/orb_listener.c src/modules/multirotor_att_control/multirotor_attitude_control.c src/modules/multirotor_att_control/multirotor_rate_control.c src/modules/systemlib/pid/pid.c src/modules/systemlib/pid/pid.h src/modules/uORB/objects_common.cpp | ||||
| * | | | | First try for an ESC calibration tool | Julian Oes | 2013-06-20 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) ↵ | px4dev | 2013-08-14 | 7 | -1/+14 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | into fmuv2_bringup | ||||
| * | | | | Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in ↵ | px4dev | 2013-08-13 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | the toolchain configuration. | ||||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Segway Controller | ||||
| | * \ \ \ | 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 ↵ | px4dev | 2013-08-03 | 2 | -2/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | diffs we have to carry against the NuttX upstream repo to just our local patches to the NuttX code itself. | ||||
* | | | | | 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 ↵ | px4dev | 2013-08-02 | 7 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most of the PX4-specific board configuration data moves out of the config and into the board driver. Rename some directories that got left behind in the great board renaming. | ||||
* | | | | | 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 ↵ | Lorenz Meier | 2013-07-26 | 1 | -0/+1 |
| | |/ / / | | | | | | | | | | | | | | | | sensor drivers, fixed gyro calibration | ||||
* | | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | ETS airspeed and MEAS airspeed combined driver | ||||
| | * | | | | 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 ↵ | Simon Wilks | 2013-07-04 | 1 | -1/+2 |
| | |/ | |/| | | | | | | | from a HoTT sensor. | ||||
* | | | Add builtin command dependency on module makefiles, since they can also ↵ | px4dev | 2013-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | create / remove commands | ||||
* | | | 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 |
| |\| | |||||
| | * | Add PX4Flow board modules and corresponding ORB msgs. | samuezih | 2013-06-14 | 1 | -0/+3 |
| | | | |||||
| | * | Hotfix: Excluded sdlog app from standard build, still keeping code in place ↵ | Lorenz Meier | 2013-06-13 | 1 | -2/+0 |
| | | | | | | | | | | | | for now | ||||
| * | | merged | Lorenz Meier | 2013-06-07 | 1 | -1/+1 |
| |\| | |||||
| * | | Merged | Lorenz Meier | 2013-06-07 | 2 | -7/+11 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:PX4/Firmware into integration | Lorenz Meier | 2013-06-06 | 1 | -2/+10 |
| |\ \ \ | |||||
| * \ \ \ | Merged | Lorenz Meier | 2013-06-06 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| * | | | | | Adjust upload target name for v1.x FMU | px4dev | 2013-06-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | All apps compiling and linked (listed in NSH help), but not executing yet | Lorenz Meier | 2013-06-01 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now | Lorenz Meier | 2013-06-01 | 5 | -2/+2 |
| | | | | | |