aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* navigator: adapt offboard class to new NavigatorMode APIJulian Oes2014-07-072-24/+19
|
* navigator: forgot to fix conflictsJulian Oes2014-07-072-2/+1
|
* Merge branch 'master' into offboard2_mergeJulian Oes2014-07-0718-459/+877
|\ | | | | | | | | | | Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp
| * Merge pull request #1119 from PX4/navigator_rewrite_drtonLorenz Meier2014-07-0714-316/+368
| |\ | | | | | | Navigator rewrite - DrTon
| | * commander: require home position for MISSION, fallback to LOITERAnton Babushkin2014-07-062-1/+8
| | |
| | * navigator: takeoff altitude fixedAnton Babushkin2014-07-041-1/+2
| | |
| | * Merge branch 'master' into navigator_rewrite_drtonAnton Babushkin2014-07-0461-982/+1950
| | |\
| | * | navigator: takeoff on start of mission implementedAnton Babushkin2014-06-302-27/+109
| | | |
| | * | Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into ↵Anton Babushkin2014-06-3070-1061/+3986
| | |\ \ | | | | | | | | | | | | | | | navigator_rewrite_drton
| | * | | 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 pull request #1117 from PX4/mavlink_stack_sizeLorenz Meier2014-07-041-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | mavlink: stack size for main thread increased
| | * | | | | | | | mavlink: stack size for main thread increasedAnton Babushkin2014-07-041-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #1118 from PX4/hkmicropcbLorenz Meier2014-07-042-0/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Hk micro pcb quad: Startup script
| | * | | | | | | micro pcb quad: remove unnecessary settingThomas Gubler2014-07-041-1/+0
| | | | | | | | |
| | * | | | | | | hk micro pcb quad startup script: add commentThomas Gubler2014-07-041-0/+1
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into hkmicropcbThomas Gubler2014-07-049-36/+175
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1113 from Kynos/gnss_nav_pvtLorenz Meier2014-07-035-27/+122
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use NAV-PVT with ubx7 and ubx8 modules
| | * | | | | | | | Use NAV-PVT with ubx7 and ubx8 modulesKynos2014-07-035-25/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC.
| | * | | | | | | | Added NAV-TIMEUTC valid flag definesKynos2014-07-031-2/+9
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1114 from PX4/contributingLorenz Meier2014-07-031-0/+44
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | Contributing notes
| | * | | | | | | | Changed branch name suggestionLorenz Meier2014-07-031-1/+1
| | | | | | | | | |
| | * | | | | | | | Contributing notesLorenz Meier2014-07-031-0/+44
| | | | | | | | | |
| * | | | | | | | | Merge branch 'est_reinit_fix'Lorenz Meier2014-07-031-6/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | estimator: Fixed body / world matrix initialization and resetLorenz Meier2014-07-031-6/+6
| | | |/ / / / / / / | | |/| | | | | | |