Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merged master | Lorenz Meier | 2014-07-15 | 22 | -110/+487 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| * | | | | | introduce multi device support on uORB | Lorenz Meier | 2014-06-10 | 1 | -4/+8 | |
* | | | | | | Merge branch 'master' of github.com:PX4/Firmware into vision_estimate | Lorenz Meier | 2014-07-14 | 3 | -8/+11 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge branch 'master' of github.com:PX4/Firmware into airspeed_test_fix | Lorenz Meier | 2014-07-12 | 2 | -7/+11 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch master into dataman_state_nav_rewrite | Anton Babushkin | 2014-07-10 | 9 | -3/+95 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | * | | | | | Merge branch 'master' into dataman_nav_drton | Anton Babushkin | 2014-07-07 | 2 | -2/+17 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | * | | | | | Merge branch 'master' into dataman_state_nav_rewrite | Anton Babushkin | 2014-07-04 | 6 | -51/+125 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-30 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merged master | Lorenz Meier | 2014-06-29 | 3 | -0/+4 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-21 | 2 | -16/+16 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | mavlink: mission manager moved to separate class and reworked | Anton Babushkin | 2014-06-14 | 2 | -5/+9 | |
| | * | | | | | | | | | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-13 | 1 | -18/+19 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-12 | 11 | -37/+225 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | mavlink: waypoint manager fixes, mission saving on reboot | Anton Babushkin | 2014-06-09 | 1 | -2/+2 | |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | uORB: Remove voltage field from airspeed | Lorenz Meier | 2014-07-11 | 1 | -1/+0 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merged master into vision_estimate | Lorenz Meier | 2014-07-09 | 12 | -14/+207 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #1072 from PX4/forcesetpoint | Lorenz Meier | 2014-07-08 | 2 | -0/+68 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | force setpoint uorb topic: add yaw field | Thomas Gubler | 2014-06-30 | 1 | -0/+1 | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into forcesetpoint | Thomas Gubler | 2014-06-30 | 14 | -50/+243 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | force setpoint: fix comment | Thomas Gubler | 2014-06-24 | 1 | -3/+2 | |
| | * | | | | | | | | | | define force setpoint uorb topic | Thomas Gubler | 2014-06-23 | 2 | -0/+68 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | 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 'navigator_rewrite' into navigator_rewrite_offboard2_merge | Julian Oes | 2014-06-27 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge | Julian Oes | 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 | |
* | | | | | | | | | | | | | | | | | | Merged master into vision_estimate | Lorenz Meier | 2014-07-01 | 15 | -92/+273 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | 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 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | |