aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into uavcanPavel Kirienko2014-07-08363-116238/+1953
|\
| * Update sensors testsLorenz Meier2014-07-081-1/+36
| |
| * Merge pull request #1153 from PX4/mavlinkupdateLorenz Meier2014-07-081-0/+0
| |\ | | | | | | update mavlink to latest master
| | * update mavlink to latest masterThomas Gubler2014-07-081-0/+0
| |/
| * Merge pull request #1150 from PX4/mavlinkupdateLorenz Meier2014-07-081-0/+0
| |\ | | | | | | update mavlink to latest master
| | * update mavlink to latest masterThomas Gubler2014-07-081-0/+0
| | |
| * | Merge pull request #1072 from PX4/forcesetpointLorenz Meier2014-07-082-0/+68
| |\ \ | | |/ | |/| Force setpoint uorb topic
| | * force setpoint uorb topic: add yaw fieldThomas Gubler2014-06-301-0/+1
| | |
| | * Merge remote-tracking branch 'upstream/master' into forcesetpointThomas Gubler2014-06-30105-3647/+9436
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/modules/uORB/objects_common.cpp
| | * | force setpoint: fix commentThomas Gubler2014-06-241-3/+2
| | | |
| | * | define force setpoint uorb topicThomas Gubler2014-06-232-0/+68
| | | |
| * | | Merge pull request #1149 from PX4/ftp_silenceLorenz Meier2014-07-083-23/+25
| |\ \ \ | | | | | | | | | | Silence FTP transactions, be vocal about errors
| | * | | Silence FTP transactions, be vocal about errorsLorenz Meier2014-07-083-23/+25
| |/ / /
| * | | mc pos control: Fix reordering warningsLorenz Meier2014-07-081-10/+10
| | | |
| * | | ardrone interface: Remove unused variableLorenz Meier2014-07-081-2/+0
| | | |
| * | | HIL: reduce excessive stack usage of driverLorenz Meier2014-07-081-1/+1
| | | |
| * | | Merge pull request #1146 from DonLakeFlyer/UnitTestFixLorenz Meier2014-07-081-66/+147
| |\ \ \ | | | | | | | | | | Fix mainStateTransitionTest
| | * | | Fix mainStateTransitionTestDon Gagne2014-07-071-66/+147
| | | | |
| * | | | Merge pull request #1145 from DonLakeFlyer/MoreWarningsLorenz Meier2014-07-087-13/+24
| |\ \ \ \ | | | | | | | | | | | | Fix compiler warnings
| | * | | | Fix compiler warningsDon Gagne2014-07-077-13/+24
| | | | | |
| * | | | | Merge pull request #1110 from PX4/offboard2_mergeLorenz Meier2014-07-0719-49/+504
| |\ \ \ \ \ | | | | | | | | | | | | | | Offboard2 merge
| | * \ \ \ \ Merged master into offboard2_mergeLorenz Meier2014-07-07309-119362/+62
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1143 from PX4/submodulesLorenz Meier2014-07-07301-115489/+52
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Submodules for MAVLink and NuttX
| | * | | | | | 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 ↵Lorenz Meier2014-07-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a make target in Eclipse just for this
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script checks if the mavlink submodule is up to date
| | * | | | | | change mavlink submodule urlThomas Gubler2014-07-071-1/+1
| | | | | | | |
| | * | | | | | mavlink as git submoduleThomas Gubler2014-07-022-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mavlink is now a git submodule because auto generated header files are available at https://github.com/mavlink/c_library
| | * | | | | | delete mavlink header filesThomas Gubler2014-07-02218-80550/+0
| | | | | | | |
| * | | | | | | Merge pull request #1137 from DonLakeFlyer/FTPLoggingLorenz Meier2014-07-071-3/+10
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Better FTP logging
| | * | | | | | 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
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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