Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged master into st24 | Lorenz Meier | 2014-10-07 | 7 | -86/+255 |
|\ | |||||
| * | Revert "Remove range command" | Thomas Gubler | 2014-10-07 | 1 | -5/+0 |
| * | Remove range command | Lorenz Meier | 2014-10-07 | 1 | -0/+5 |
| * | Remove unnecessary commands, unneeded output / resets | Lorenz Meier | 2014-10-07 | 1 | -12/+1 |
| * | Code style fixes, no code changes | Lorenz Meier | 2014-10-07 | 1 | -69/+82 |
| * | Changed to proper parser for SF02/F laser rangefinder | Lorenz Meier | 2014-10-07 | 3 | -75/+18 |
| * | Updated and fixed parser for SF02/F laser sensor, test harness runs clean | Lorenz Meier | 2014-10-07 | 2 | -0/+194 |
| * | remove warnx | Thomas Gubler | 2014-10-05 | 1 | -2/+0 |
| * | ubx: disable sbas configuration per default | Thomas Gubler | 2014-09-30 | 1 | -0/+2 |
| * | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-09-30 | 2 | -12/+14 |
| |\ | |||||
| * | | ubx: add sbas config, default to disable | Thomas Gubler | 2014-09-22 | 2 | -0/+29 |
| * | | Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe | Thomas Gubler | 2014-09-04 | 1 | -1/+2 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into swissfang | Lorenz Meier | 2014-08-31 | 1 | -2/+2 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang | Lorenz Meier | 2014-08-31 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang | Lorenz Meier | 2014-08-31 | 1 | -24/+16 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang | Lorenz Meier | 2014-08-31 | 1 | -1/+7 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into swissfang | Lorenz Meier | 2014-08-27 | 2 | -1/+8 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swiss... | Lorenz Meier | 2014-08-26 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into bottle_drop_friday | Lorenz Meier | 2014-08-24 | 2 | -43/+14 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul | Lorenz Meier | 2014-08-21 | 8 | -8/+733 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into test_bottle_drop_paul | Simon Wilks | 2014-08-14 | 1 | -7/+29 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merged master | Lorenz Meier | 2014-08-09 | 102 | -1560/+5972 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_dr... | Julian Oes | 2014-03-30 | 2 | -2/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-29 | 16 | -171/+2198 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 47 | -928/+2101 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ... | Julian Oes | 2013-12-27 | 23 | -503/+1655 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | HIL: copy correct actuator group | Julian Oes | 2013-12-02 | 1 | -1/+2 |
| | | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigator | Julian Oes | 2013-11-29 | 1 | -1/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/PX4/Firmware into bottledrop | Juchli D | 2013-11-15 | 4 | -12/+19 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | Hack to always arm | Juchli D | 2013-11-05 | 1 | -0/+3 |
| | | | * | | | | | | | | | | | | | | | | fmu: Also take into account actuator group 1 | Juchli D | 2013-11-05 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | IO input driver: Output ST24 as receiver type / status | Lorenz Meier | 2014-10-07 | 2 | -2/+11 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | px4io driver: update cb only when changed | Thomas Gubler | 2014-09-30 | 1 | -2/+7 |
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream' into master_obcfailsafe | Thomas Gubler | 2014-09-30 | 1 | -10/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Set filter frequency for hardware and software in parallel, always do so in t... | Lorenz Meier | 2014-09-30 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | mpu6k: set hardware filter during ACCELIOCLOWPASS | Randy Mackay | 2014-09-30 | 1 | -10/+5 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #1327 from PX4/termination_failsafe | Lorenz Meier | 2014-09-26 | 2 | -3/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-09-02 | 1 | -21/+19 |
|\| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Fixed SF02/F driver, tested ok | Lorenz Meier | 2014-08-31 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Fix reschedule logic for SF02/F driver | Lorenz Meier | 2014-08-31 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | SF02/F driver: Improve parsing | Lorenz Meier | 2014-08-31 | 1 | -24/+16 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add more paranoid checks to sf0x altitude parsing | Lorenz Meier | 2014-08-31 | 1 | -1/+7 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/termination_failsafe' into obcfailsafe | Thomas Gubler | 2014-08-27 | 2 | -3/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | support termination failsafe in IO driver | Lorenz Meier | 2014-08-27 | 1 | -1/+21 |
| * | | | | | | | | | | | | | | Support for termination failsafe in PWM out driver | Lorenz Meier | 2014-08-27 | 1 | -2/+5 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-08-27 | 2 | -1/+8 |
|\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Ignore single channels during PWM output | Holger Steinhaus | 2014-08-26 | 2 | -1/+8 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | fix flight termination circuit breaker name, tested | Thomas Gubler | 2014-08-26 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-08-25 | 2 | -65/+34 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | px4flow: removed flow report in driver, just use uORB topic | Julian Oes | 2014-08-25 | 2 | -65/+34 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |