aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1145 from DonLakeFlyer/MoreWarningsLorenz Meier2014-07-087-13/+24
|\
| * Fix compiler warningsDon Gagne2014-07-077-13/+24
* | Merge pull request #1110 from PX4/offboard2_mergeLorenz Meier2014-07-0719-49/+504
|\ \
| * \ Merged master into offboard2_mergeLorenz Meier2014-07-07309-119362/+62
| |\ \ | |/ / |/| |
* | | Merge pull request #1143 from PX4/submodulesLorenz Meier2014-07-07301-115489/+52
|\ \ \
| * | | bugfixes for checks and toolsLorenz Meier2014-07-072-6/+7
| * | | Merged masterLorenz Meier2014-07-0751-637/+1304
| |\ \ \ | | | |/ | | |/|
| * | | Turn instructions into a makefile command, allowing Windows GUI kids to creat...Lorenz Meier2014-07-072-2/+6
| * | | Fixed check toolsLorenz Meier2014-07-072-12/+28
| * | | Added NuttXLorenz Meier2014-07-073-1/+3
| |\ \ \
| | * | | Add proper NuttX submodule checksLorenz Meier2014-07-072-4/+14
| | * | | Added NuttX submoduleLorenz Meier2014-07-073-1/+3
| * | | | Fixed .gitmodulesLorenz Meier2014-07-071-3/+0
| * | | | Cleaning up sub modulesLorenz Meier2014-07-075-5/+19
| * | | | really remove mavlink folderLorenz Meier2014-07-0777-34934/+0
| |/ / /
| * | | add mavlink submodule check scriptThomas Gubler2014-07-071-0/+10
| * | | change mavlink submodule urlThomas Gubler2014-07-071-1/+1
| * | | mavlink as git submoduleThomas Gubler2014-07-022-0/+3
| * | | delete mavlink header filesThomas Gubler2014-07-02218-80550/+0
* | | | Merge pull request #1137 from DonLakeFlyer/FTPLoggingLorenz Meier2014-07-071-3/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Turn off noisier loggingDon Gagne2014-07-071-3/+3
| * | | More loggingDon Gagne2014-07-061-2/+2
| * | | Better loggingDon Gagne2014-07-061-3/+10
| | | * 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
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #1119 from PX4/navigator_rewrite_drtonLorenz Meier2014-07-0714-316/+368
|\ \ \ \
| * | | | 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 navigator_rewrit...Anton Babushkin2014-06-3070-1061/+3986
| |\ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1140 from DonLakeFlyer/UnusedVariableWarningsLorenz Meier2014-07-075-10/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Fix unused variable warningsDon Gagne2014-07-065-10/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1133 from PX4/datalink_fixLorenz Meier2014-07-067-89/+161
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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