Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-08 | 1 | -1/+10 |
|\ | |||||
| * | Added support for Octo Cox | Lorenz Meier | 2014-01-06 | 1 | -1/+10 |
| | | |||||
* | | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-02 | 1 | -2/+3 |
|\ \ | |||||
| * | | Merge master into navigator_new | Anton Babushkin | 2014-01-02 | 21 | -182/+233 |
| |\| | |||||
| | * | Reboot if IO update startup fails on first try | Lorenz Meier | 2014-01-01 | 1 | -2/+3 |
| | | | |||||
* | | | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-01 | 21 | -180/+230 |
|\ \ \ | | |/ | |/| | |||||
| * | | Cleanup, removed commander start calls in locations where its not needed | Lorenz Meier | 2013-12-30 | 6 | -28/+6 |
| | | | |||||
| * | | Fixed MAV type and typo | Lorenz Meier | 2013-12-28 | 1 | -3/+3 |
| | | | |||||
| * | | Further cleanup, added octos | Lorenz Meier | 2013-12-28 | 4 | -7/+121 |
| | | | |||||
| * | | Fixed typo | Lorenz Meier | 2013-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Cleaned up startup, should be completely compatible, but allows clean QGC ↵ | Lorenz Meier | 2013-12-28 | 18 | -156/+65 |
| | | | | | | | | | | | | indices | ||||
| * | | Getting multicopter startup back to generic, trimming down number and ↵ | Lorenz Meier | 2013-12-28 | 1 | -0/+49 |
| | | | | | | | | | | | | content of different startup scripts | ||||
* | | | Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into ↵ | Anton Babushkin | 2013-12-30 | 6 | -14/+351 |
|\ \ \ | | |/ | |/| | | | | navigator_new_vector | ||||
| * | | Merge remote-tracking branch 'px4/master' into navigator_new | Julian Oes | 2013-12-29 | 6 | -14/+351 |
| |\| | |||||
| | * | Updated defaults following recent test flight that included autostart and land | Simon Wilks | 2013-12-28 | 1 | -14/+19 |
| | | | |||||
| | * | Whitespace fix | Simon Wilks | 2013-12-28 | 1 | -2/+2 |
| | | | |||||
| | * | Set the tested defaults | Simon Wilks | 2013-12-28 | 1 | -3/+7 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into fx79 | Simon Wilks | 2013-12-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Typo fix. | Simon Wilks | 2013-12-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added config for the FX-79 | Simon Wilks | 2013-12-28 | 3 | -0/+165 |
| | |/ | |||||
| | * | Updated parameters to latest flight tested values | Simon Wilks | 2013-12-28 | 1 | -5/+5 |
| | | | |||||
| | * | Startup script for Wing Wing (Z-84) | Simon Wilks | 2013-12-28 | 2 | -0/+97 |
| | | | |||||
| | * | Startup script for simple logging | Julian Oes | 2013-12-26 | 2 | -0/+66 |
| | | | |||||
* | | | Merge branch 'navigator_new' into navigator_new_vector, WIP | Anton Babushkin | 2013-12-28 | 1 | -0/+10 |
|\| | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2013-12-23 | 1 | -0/+0 |
| |\| | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups | ||||
| * | | Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' ↵ | Thomas Gubler | 2013-12-23 | 1 | -0/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| | * | | Dataman: Start dataman and use it in waypoints and navigator instead of ↵ | Julian Oes | 2013-12-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | mission items in mission topic | ||||
| * | | | Merge remote-tracking branch 'upstream/control_groups' into ↵ | Thomas Gubler | 2013-12-23 | 4 | -16/+143 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2013-12-05 | 3 | -1/+96 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator Conflicts: src/modules/mavlink/missionlib.c src/systemcmds/tests/module.mk | ||||
| * | | | | | Startup scripts: start the navigator by default | Julian Oes | 2013-11-19 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | makefiles and rc scripts fixed to use new attitude and position controllers | Anton Babushkin | 2013-12-26 | 4 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'mathlib_new' into vector_control2 | Anton Babushkin | 2013-12-25 | 4 | -0/+96 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Added missing folder | Lorenz Meier | 2013-12-21 | 1 | -0/+0 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Useful bits for high-rate logging | Lorenz Meier | 2013-12-20 | 3 | -0/+96 |
| | | | | | |||||
* | | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-19 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Removed whitespace | Lorenz Meier | 2013-12-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | HIL rc scripts fixed | Anton Babushkin | 2013-12-16 | 2 | -24/+8 |
| | | | | | |||||
* | | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-16 | 2 | -16/+47 |
|\| | | | | |||||
| * | | | | Enabled MPU6K and updated startup script to start all sensors | Lorenz Meier | 2013-12-15 | 1 | -5/+11 |
| | | | | | |||||
| * | | | | Auto-update of IO firmware, shorter preflight check alarm | Lorenz Meier | 2013-12-14 | 1 | -11/+36 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-13 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Merge pull request #535 from NosDE/master | Lorenz Meier | 2013-12-13 | 1 | -2/+2 |
| |\ \ \ | | |_|/ | |/| | | Device renamed, custom device on parameter switch | ||||
| | * | | mkblctrl set a default device / -d (device) parameter for alternate device ↵ | marco | 2013-11-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | added / -t testmode enhanced | ||||
* | | | | Merge branch 'master' into vector_control2 | Anton Babushkin | 2013-12-13 | 3 | -1/+96 |
|\| | | | |||||
| * | | | Hex Startup: Set rate of all 8 PWM outputs (6 are not possible because rate ↵ | Julian Oes | 2013-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | can only be changed for channel groups | ||||
| * | | | init.d: added 3dr_skywalker airframe config | Andrew Tridgell | 2013-12-01 | 2 | -0/+95 |
| | |/ | |/| | | | | | | | params not tuned yet, but servos in the right direction | ||||
* / | | Use mc_att_control_vector as default attitude controller for multirotors | Anton Babushkin | 2013-11-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #524 from PX4/hotfix_iris_max_pwm | Lorenz Meier | 2013-11-13 | 1 | -2/+1 |
|\ \ | |/ |/| | IRIS PWM range | ||||
| * | Don't limit the PWM output maximum for the IRIS to use the whole thrust range | Julian Oes | 2013-11-10 | 1 | -2/+1 |
| | |