Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged beta into mavlink rework branch | Lorenz Meier | 2014-01-28 | 4 | -155/+24 |
| | |||||
* | Merge branch 'master' of github.com:PX4/Firmware into navigator_new | Lorenz Meier | 2014-01-05 | 3 | -23/+5 |
|\ | |||||
| * | Do not require suffixed constants | Lorenz Meier | 2014-01-05 | 1 | -2/+1 |
| | | |||||
| * | Trimming down number of apps to save flash space | Lorenz Meier | 2014-01-04 | 2 | -21/+4 |
| | | |||||
* | | 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 | ||||
| * | Removed special logging config to cut down build times | Lorenz Meier | 2013-12-30 | 1 | -157/+0 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 | ||||
| * | | Useful bits for high-rate logging | Lorenz Meier | 2013-12-20 | 1 | -0/+157 |
| | | | |||||
| * | | Enabled MPU6K and updated startup script to start all sensors | Lorenz Meier | 2013-12-15 | 1 | -0/+1 |
| | | | |||||
* | | | 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 | ||||
| * | | SO3 estimator code has been cleaned | Hyon Lim | 2013-11-29 | 3 | -4/+6 |
| | | | |||||
| * | | SO(3) estimator and quaternion receive by mavlink implemented | Hyon Lim | 2013-11-29 | 1 | -0/+1 |
| | | | |||||
* | | | 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 | ||||
* / | Updated backside controller/ added backside config. | James Goppert | 2013-11-14 | 1 | -0/+160 |
|/ | |||||
* | Disable the segway app, as its GCC 4.7 incompatible and not generally used | Lorenz Meier | 2013-11-01 | 2 | -3/+3 |
| | |||||
* | Merge pull request #483 from PX4/calib_rotation | Lorenz Meier | 2013-10-23 | 2 | -0/+2 |
|\ | | | | | Calibration of rotated board | ||||
| * | get_rot_matrix() moved to separate library, accel calibration of rotated ↵ | Anton Babushkin | 2013-10-20 | 2 | -0/+2 |
| | | | | | | | | board fixed | ||||
* | | Updated segway controller for new state machine. | James Goppert | 2013-10-22 | 2 | -2/+2 |
| | | |||||
* | | Working on roboclaw driver. | James Goppert | 2013-10-21 | 2 | -1/+2 |
|/ | |||||
* | Makefile cleanup | Lorenz Meier | 2013-10-10 | 2 | -2/+9 |
| | |||||
* | added hw test, added better io debugging | Lorenz Meier | 2013-10-10 | 1 | -0/+3 |
| | |||||
* | Enabling navigator, does not do anything useful yet | Lorenz Meier | 2013-09-23 | 2 | -0/+2 |
| | |||||
* | Add esc_calib systemcmd to FMUv2 | Julian Oes | 2013-09-22 | 1 | -0/+1 |
| | |||||
* | Merged master | Lorenz Meier | 2013-09-12 | 1 | -2/+2 |
|\ | |||||
| * | make upload on Linux much more reliable | Andrew Tridgell | 2013-09-12 | 1 | -2/+2 |
| | | | | | | | | | | Upload on Linux now only tries usb-3D_Robotics boards. This should also make it handle more ports on MacOS | ||||
* | | Added position controller to default set | Lorenz Meier | 2013-09-10 | 2 | -2/+4 |
|/ | |||||
* | Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 | Lorenz Meier | 2013-09-07 | 1 | -0/+8 |
|\ | |||||
| * | grab the git hash and inject it into every log file header | tstellanova | 2013-09-06 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 | Lorenz Meier | 2013-09-05 | 2 | -4/+4 |
|\| | |||||
| * | Make sure the unit tests aren't included as part of the standard firmware | Simon Wilks | 2013-09-01 | 2 | -4/+4 |
| | | |||||
* | | Merge branch 'multirotor' into fixedwing_l1 | Lorenz Meier | 2013-08-27 | 4 | -4/+36 |
|\| | |||||
| * | Merge pull request #15 from sjwilks/multirotor_unittests | Lorenz Meier | 2013-08-25 | 2 | -0/+12 |
| |\ | | | | | | | Add a simple unit testing framework and tests for the commander state machine. | ||||
| | * | Whitespace and formatting cleanup. | Simon Wilks | 2013-08-25 | 1 | -1/+0 |
| | | | |||||
| | * | Added a simple unit test framework and initial testing some of the commander ↵ | Simon Wilks | 2013-08-25 | 2 | -0/+13 |
| | | | | | | | | | | | | state machines. | ||||
| * | | Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into multirotor | Lorenz Meier | 2013-08-23 | 4 | -4/+24 |
| |\ \ | | |/ | |/| | | | | ge aborts | ||||
| | * | Add support for adding extra files to the ROMFS from the config. | px4dev | 2013-08-22 | 4 | -4/+24 |
| | | | | | | | | | | | | If there is an IO firmware image already built when we build the corresponding FMU ROMFS, copy it into the ROMFS. Note - due to there being no fixed build ordering, to be certain that you have the most current IO firmware, you must build the IO firmware explicitly first. | ||||
* | | | Added complete attitude control framework | Lorenz Meier | 2013-08-23 | 2 | -4/+5 |
|/ / | |||||
* | | Added missing config files, compiling | Lorenz Meier | 2013-08-21 | 2 | -16/+16 |
| | | |||||
* | | Moved math library to library dir, improved sensor-level HIL, cleaned up geo ↵ | Lorenz Meier | 2013-08-21 | 1 | -1/+3 |
| | | | | | | | | / conversion libs | ||||
* | | Merged fmuv2_bringup | Lorenz Meier | 2013-08-21 | 1 | -1/+1 |
|\| | |||||
| * | build: use unqualified com port names on windows | Andrew Tridgell | 2013-08-21 | 1 | -1/+1 |
| | | | | | | | | the qualified names were not working with current versions of python | ||||
* | | merged | Lorenz Meier | 2013-08-19 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new | Anton Babushkin | 2013-08-16 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | WIP, TODO fixedwing | ||||
| | * \ | Merge branch 'master' into seatbelt_multirotor | Anton Babushkin | 2013-07-17 | 1 | -1/+2 |
| | |\ \ |