Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1145 from DonLakeFlyer/MoreWarnings | Lorenz Meier | 2014-07-08 | 1 | -0/+10 |
|\ | |||||
| * | Fix compiler warnings | Don Gagne | 2014-07-07 | 1 | -0/+10 |
* | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 3 | -3/+17 |
|\| | |||||
| * | telemetry_statur: use 4 separate topics | Anton Babushkin | 2014-07-06 | 2 | -2/+17 |
| * | Use NAV-PVT with ubx7 and ubx8 modules | Kynos | 2014-07-03 | 1 | -1/+0 |
* | | Fix compile error: rename field in rc_channels.h | Thomas Gubler | 2014-07-02 | 1 | -1/+1 |
* | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-02 | 6 | -50/+125 |
|\| | |||||
| * | Merged master to gnss_rework | Lorenz Meier | 2014-07-02 | 2 | -42/+30 |
| |\ | |||||
| | * | Merge pull request #984 from PX4/rc_channels | Lorenz Meier | 2014-06-30 | 1 | -42/+26 |
| | |\ | |||||
| | | * | rc_channels topic cleanup | Anton Babushkin | 2014-05-20 | 1 | -42/+26 |
| | * | | Merged master into power_enforce | Lorenz Meier | 2014-06-30 | 13 | -50/+241 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into power_enforce | Lorenz Meier | 2014-06-26 | 2 | -5/+17 |
| | |\ \ \ | |||||
| | * | | | | system status topic: Add support for circuit breaker | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| | * | | | | commander: Enforce (in presence of power sensing) that a) system is not purel... | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| * | | | | | Merged upstream master into gnss_rework branch | Kynos | 2014-06-30 | 14 | -50/+243 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge master with the exception of ubx.cpp and ubx.h | Kynos | 2014-06-15 | 1 | -5/+15 |
| |\ \ \ \ \ | |||||
| * | | | | | | U-blox driver rework, step 3 | Kynos | 2014-06-08 | 1 | -7/+10 |
| * | | | | | | U-blox driver rework, step 2 | Kynos | 2014-05-30 | 4 | -8/+92 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'master' into navigator_rewrite_offboard2_merge | Julian Oes | 2014-07-02 | 2 | -3/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estim... | Lorenz Meier | 2014-06-29 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #1089 from PX4/navigator_rewrite | Lorenz Meier | 2014-06-29 | 8 | -47/+69 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | mtecs: add flightpathangle filter | Thomas Gubler | 2014-06-29 | 1 | -0/+1 |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-28 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| * | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-18 | 2 | -15/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewr... | Thomas Gubler | 2014-06-13 | 1 | -18/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewr... | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'px4/mtecs_estimator' into navigator_rewrite_est... | Julian Oes | 2014-06-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Extend estimator status | Lorenz Meier | 2014-06-04 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge | Julian Oes | 2014-06-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | extend integrator reset flags in uorb attitude setpoint topic to all axes | Thomas Gubler | 2014-06-24 | 1 | -0/+2 |
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge | Julian Oes | 2014-06-27 | 1 | -0/+1 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED in... | Anton Babushkin | 2014-06-27 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | position_setpoint_triplet: add local position and velocity setpoints | Julian Oes | 2014-06-27 | 1 | -0/+10 |
* | | | | | | | | | | | | offboard_control_setpoint: armed does not make sense there | Julian Oes | 2014-06-27 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard | Julian Oes | 2014-06-20 | 4 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-21 | 4 | -8/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-16 | 30 | -254/+386 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-03-30 | 11 | -14/+510 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | commander: publish vehicle_control_mode for OFFBOARD state | Anton Babushkin | 2014-02-17 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-02-14 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-02-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-01-29 | 6 | -50/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | OFFBOARD switch added, WIP | Anton Babushkin | 2014-01-22 | 2 | -3/+9 |
* | | | | | | | | | | | | | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -0/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |