| Commit message (Expand) | Author | Age | Files | Lines |
* | Merged upstream master into gnss_rework branch | Kynos | 2014-06-30 | 14 | -50/+243 |
|\ |
|
| * | 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 '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_estimator | 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 |
| * | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| |\| | | |
|
| | * | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| * | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -0/+2 |
| |\| | | |
|
| | * | | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -0/+2 |
| * | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-18 | 2 | -15/+14 |
| |\| | | |
|
| | * | | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 1 | -1/+2 |
| | * | | | commander: failsafe_state removed, replaced with bool failsafe, navigation st... | Anton Babushkin | 2014-06-16 | 1 | -14/+11 |
| | * | | | mavlink: store last heartbeat time in telemetry_status topic | Anton Babushkin | 2014-06-16 | 1 | -0/+1 |
| * | | | | Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewr... | Thomas Gubler | 2014-06-13 | 1 | -18/+19 |
| |\| | | |
|
| | * | | | Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into navigator_re... | Julian Oes | 2014-06-12 | 1 | -0/+1 |
| | |\ \ \ |
|
| | * | | | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 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 'upstream/mtecs' into navigator_rewrite | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| | |\ \ \ \
| | | |/ / /
| | |/| | /
| | | | |/
| | | |/| |
|
| | | * | | mtecs: filter airspeed | 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 remote-tracking branch 'px4/mtecs' into navigator_rewrite | Julian Oes | 2014-06-06 | 3 | -0/+80 |
| |\| | |
|
| | * | | Merge branch 'mtecs' into mtecs_wind_estimate | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | |\ \ |
|
| | | * | | Merge branch 'master' of github.com:PX4/Firmware into mtecs | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | | |\| |
|
| | * | | | wind estimate: added uORB topic | Lorenz Meier | 2014-06-01 | 2 | -0/+70 |
| | |/ / |
|
| | * | | mtecs publish state | Thomas Gubler | 2014-05-30 | 1 | -0/+10 |
| * | | | Merge branch 'mtecs' into navigator_rewrite | Julian Oes | 2014-06-03 | 3 | -0/+87 |
| |\| | |
|
| | * | | introduce tecs status uorb message | Thomas Gubler | 2014-05-24 | 3 | -0/+87 |
| * | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -5/+15 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 2 | -26/+16 |
| * | | | commander and navigator: lot's of changes, failsafe handling in commander, na... | Julian Oes | 2014-05-27 | 3 | -21/+30 |
| * | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 5 | -25/+50 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 1 | -2/+2 |
| * | | | Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_h... | Julian Oes | 2014-04-26 | 6 | -14/+16 |
| |\ \ \ |
|
| | * | | | Send current local position estimate as well | Lorenz Meier | 2014-04-26 | 1 | -1/+4 |
| | * | | | Merged mpc_rc into ekf_params | Lorenz Meier | 2014-04-26 | 6 | -54/+30 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params | Lorenz Meier | 2014-04-21 | 1 | -0/+2 |
| | |\ \ \ \ |
|
| * | \ \ \ \ | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 4 | -11/+28 |
| * | | | | | | | navigator: wrong mission topic was copied, clearer naming of offboard mission... | Julian Oes | 2014-04-18 | 2 | -2/+2 |
| * | | | | | | | mavlink and mission topic: added reading in DO_JUMP mission items | Julian Oes | 2014-04-18 | 1 | -1/+3 |
* | | | | | | | | Merge master with the exception of ubx.cpp and ubx.h | Kynos | 2014-06-15 | 1 | -5/+15 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | actuator_armed: Fixed comments and doxygen, no C-level changes | Lorenz Meier | 2014-06-01 | 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 |
|/ / / / / / |
|