aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into offboard2_mergeJulian Oes2014-07-073-3/+17
|\
| * telemetry_statur: use 4 separate topicsAnton Babushkin2014-07-062-2/+17
| * Use NAV-PVT with ubx7 and ubx8 modulesKynos2014-07-031-1/+0
* | Fix compile error: rename field in rc_channels.hThomas Gubler2014-07-021-1/+1
* | Merge branch 'master' into offboard2_mergeJulian Oes2014-07-026-50/+125
|\|
| * Merged master to gnss_reworkLorenz Meier2014-07-022-42/+30
| |\
| | * Merge pull request #984 from PX4/rc_channelsLorenz Meier2014-06-301-42/+26
| | |\
| | | * rc_channels topic cleanupAnton Babushkin2014-05-201-42/+26
| | * | Merged master into power_enforceLorenz Meier2014-06-3013-50/+241
| | |\ \
| | * \ \ Merge branch 'master' into power_enforceLorenz Meier2014-06-262-5/+17
| | |\ \ \
| | * | | | system status topic: Add support for circuit breakerLorenz Meier2014-05-251-0/+2
| | * | | | commander: Enforce (in presence of power sensing) that a) system is not purel...Lorenz Meier2014-05-251-0/+2
| * | | | | Merged upstream master into gnss_rework branchKynos2014-06-3014-50/+243
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge master with the exception of ubx.cpp and ubx.hKynos2014-06-151-5/+15
| |\ \ \ \ \
| * | | | | | U-blox driver rework, step 3Kynos2014-06-081-7/+10
| * | | | | | U-blox driver rework, step 2Kynos2014-05-304-8/+92
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master' into navigator_rewrite_offboard2_mergeJulian Oes2014-07-022-3/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estim...Lorenz Meier2014-06-291-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1089 from PX4/navigator_rewriteLorenz Meier2014-06-298-47/+69
| | |\ \ \ \ \
| | * | | | | | mtecs: add flightpathangle filterThomas Gubler2014-06-291-0/+1
| | * | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-06-281-0/+2
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimatorJulian Oes2014-06-271-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimatorJulian Oes2014-06-271-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'navigator_rewrite' into navigator_rewrite_estimatorJulian Oes2014-06-191-3/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'navigator_rewrite' into navigator_rewrite_estimatorJulian Oes2014-06-191-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'navigator_rewrite' into navigator_rewrite_estimatorJulian Oes2014-06-182-15/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewr...Thomas Gubler2014-06-131-18/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewr...Thomas Gubler2014-06-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'px4/mtecs_estimator' into navigator_rewrite_est...Julian Oes2014-06-071-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Extend estimator statusLorenz Meier2014-06-041-3/+3
* | | | | | | | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_mergeJulian Oes2014-06-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into navigator_rewriteJulian Oes2014-06-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | extend integrator reset flags in uorb attitude setpoint topic to all axesThomas Gubler2014-06-241-0/+2
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_mergeJulian Oes2014-06-271-0/+1
|\| | | | | | | | | | | |
| * | | | | | | | | | | | navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED in...Anton Babushkin2014-06-271-0/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | position_setpoint_triplet: add local position and velocity setpointsJulian Oes2014-06-271-0/+10
* | | | | | | | | | | | offboard_control_setpoint: armed does not make sense thereJulian Oes2014-06-271-1/+1
* | | | | | | | | | | | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboardJulian Oes2014-06-204-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into offboard2Anton Babushkin2014-05-214-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into offboard2Anton Babushkin2014-05-1630-254/+386
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into offboard2Anton Babushkin2014-03-3011-14/+510
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commander: publish vehicle_control_mode for OFFBOARD stateAnton Babushkin2014-02-171-0/+1
| * | | | | | | | | | | | | Merge branch 'beta' into offboard2Anton Babushkin2014-02-141-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta' into offboard2Anton Babushkin2014-02-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta' into offboard2Anton Babushkin2014-01-296-50/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | OFFBOARD switch added, WIPAnton Babushkin2014-01-222-3/+9
* | | | | | | | | | | | | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station)Julian Oes2014-06-191-3/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | commander: added some failsafe logicJulian Oes2014-06-181-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | commander: modes display fixes, don't activate failsafe while disarmedAnton Babushkin2014-06-171-1/+2
* | | | | | | | | | | | | | | commander: failsafe_state removed, replaced with bool failsafe, navigation st...Anton Babushkin2014-06-161-14/+11