aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | navigator: mission mode fixedAnton Babushkin2014-06-302-57/+27
| | | | | | | | | | |
| | * | | | | | | | | navigator: more API changes, duplicate code removedAnton Babushkin2014-06-296-119/+95
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_drtonAnton Babushkin2014-06-2931-207/+972
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | navigator: API changes, reparing to move manual modes to navigator, WIPAnton Babushkin2014-06-2910-86/+87
| | | | | | | | | | | |
| | * | | | | | | | | | navigator: whitespace fixAnton Babushkin2014-06-291-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_drtonAnton Babushkin2014-06-2823-552/+835
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | navigator: NavigatorMode and MissionBlock API cleanupAnton Babushkin2014-06-2811-129/+144
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1142 from PX4/simon_testLorenz Meier2014-07-074-143/+510
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | EKF filter update
| | * | | | | | | | | | | | Update estimatorLorenz Meier2014-07-032-16/+17
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into simon_testLorenz Meier2014-07-03101-1255/+2070
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update estimator from PaulLorenz Meier2014-06-294-143/+509
| | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | Merge branch 'master' into offboard2_mergeJulian Oes2014-07-0733-175/+423
| | | | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp
| * | | | | | | | | | | | | | Merge pull request #1140 from DonLakeFlyer/UnusedVariableWarningsLorenz Meier2014-07-075-10/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | Fix unused variable warnings
| | * | | | | | | | | | | | | Fix unused variable warningsDon Gagne2014-07-065-10/+8
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #1133 from PX4/datalink_fixLorenz Meier2014-07-067-89/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telemetry status: use separate topic for each link
| | * | | | | | | | | | | | | sdlog2: TEL message format fixedAnton Babushkin2014-07-061-4/+4
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | telemetry_statur: use 4 separate topicsAnton Babushkin2014-07-067-100/+166
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Commander: Only consider latest active data link heartbeat for timeout.Antonio Sanniravong2014-07-041-12/+18
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1129 from PX4/roboclaw_testLorenz Meier2014-07-062-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a seldomly used module to test config
| | * | | | | | | | | | | | | Move a seldomly used module to test configLorenz Meier2014-07-062-1/+1
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #1123 from DonLakeFlyer/WarningsLorenz Meier2014-07-068-34/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler warning fixes
| | * | | | | | | | | | | | | Bring everything up to doubleDon Gagne2014-07-061-12/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Compiler warning fixesDon Gagne2014-07-058-28/+33
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #1135 from PX4/stack_fw_saveLorenz Meier2014-07-062-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control apps
| | * | | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control appsLorenz Meier2014-07-062-2/+2
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #1130 from PX4/pr-1130Lorenz Meier2014-07-064-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Fix IO Firmware build warnings
| | * | | | | | | | | | | | Fixes #1130px4dev2014-07-064-5/+8
| |/ / / / / / / / / / / /
| | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into offboard2_mergeThomas Gubler2014-07-032-3/+3
| | | | | | | | | | |\ \ \
| | | | | | | | | | * | | | Fix compile error: rename field in rc_channels.hThomas Gubler2014-07-021-1/+1
| | | | | | | | | | | | | |
| | | | | | | | | | * | | | Merge remote-tracking branch 'upstream/mavlinkexternalsetpoints' into ↵Thomas Gubler2014-07-0219-202/+1336
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_merge Conflicts: mavlink/include/mavlink/v1.0/common/common.h
| | | | | | | | | | | * \ \ \ Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpointsThomas Gubler2014-07-02160-4720/+11254
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | |_|/ / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mavlink/include/mavlink/v1.0/common/common.h
| | | | | | | | | | | * | | | sync with mavlink externalsetpoint branchThomas Gubler2014-07-0219-201/+1335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mavlink/mavlink/commit/0d55cc7e886f6d3c824f8436a39b9f9b36d0458f
| | | | | | | | | | | * | | | Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpointsThomas Gubler2014-06-2710-67/+96
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | * | \ \ \ \ Merge branch 'master' into offboard2_mergeJulian Oes2014-07-0289-1164/+1949
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/uORB/topics/rc_channels.h
| | | | | | | | | | * | | | | | Merge branch 'master' into navigator_rewrite_offboard2_mergeJulian Oes2014-07-0252-1008/+4731
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mavlink/include/mavlink/v1.0/common/common.h src/modules/mavlink/mavlink_receiver.cpp
| | | | | | | | | | * | | | | | Merge remote-tracking branch 'px4/mavlinkexternalsetpoints' into ↵Julian Oes2014-06-2724-170/+2917
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | navigator_rewrite_offboard2_merge
| | | | | | | | | | | * | | | | update mavlink headers, headers generated with message definitions from the ↵Thomas Gubler2014-06-2324-170/+2917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | externalsetpoints branch of mavlink
| | | | | | | | | | * | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_mergeJulian Oes2014-06-2723-552/+835
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | |
| | | | | | | | | | * | | | | | mavlink: fix comment in swarm message receiverJulian Oes2014-06-271-2/+1
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | navigator: remove hacked scale factor for offboard controlJulian Oes2014-06-271-1/+1
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_mergeJulian Oes2014-06-2714-519/+245
| | | | | | | | | | |\ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | |
| | | | | | | | | | * | | | | | mc_pos_control: read velocity setpoints form offboard control and do ↵Julian Oes2014-06-271-29/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position offset control
| | | | | | | | | | * | | | | | 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
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | mavlink: only save a offboard_control, don't publish to setpoint topics (let ↵Julian Oes2014-06-271-143/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the navigator do this)
| | | | | | | | | | * | | | | | commander: hack to get velocity offboard control workingJulian Oes2014-06-271-2/+2
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | navigator: added offboard modeJulian Oes2014-06-275-1/+221
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | mc_pos_control: added missing subscribeJulian Oes2014-06-271-2/+4
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | sensors: missing param for offboard switchJulian Oes2014-06-271-0/+17
| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | mavlink: always copy offboard setpoints, not just when control mode changed, ↵Julian Oes2014-06-271-62/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also bugfixes in orb calls