aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into uavcanPavel Kirienko2014-07-0859-747/+1895
|\
| * Update sensors testsLorenz Meier2014-07-081-1/+36
| * Merge pull request #1072 from PX4/forcesetpointLorenz Meier2014-07-082-0/+68
| |\
| | * force setpoint uorb topic: add yaw fieldThomas Gubler2014-06-301-0/+1
| | * Merge remote-tracking branch 'upstream/master' into forcesetpointThomas Gubler2014-06-3096-3623/+9406
| | |\
| | * | force setpoint: fix commentThomas Gubler2014-06-241-3/+2
| | * | define force setpoint uorb topicThomas Gubler2014-06-232-0/+68
| * | | 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 mainStateTransitionTestDon Gagne2014-07-071-66/+147
| * | | | Merge pull request #1145 from DonLakeFlyer/MoreWarningsLorenz Meier2014-07-086-12/+19
| |\ \ \ \
| | * | | | Fix compiler warningsDon Gagne2014-07-076-12/+19
| * | | | | Merged master into offboard2_mergeLorenz Meier2014-07-071-3/+10
| |\ \ \ \ \
| | * \ \ \ \ 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-0454-978/+1896
| | | |\ \ \ \ \
| | | * | | | | | navigator: takeoff on start of mission implementedAnton Babushkin2014-06-302-27/+109
| | | * | | | | | Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into navigator_rewrit...Anton Babushkin2014-06-3069-1056/+3982
| | | |\ \ \ \ \ \
| | | * | | | | | | 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-2923-193/+947
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | 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-2822-552/+831
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-0395-1251/+2060
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Update estimator from PaulLorenz Meier2014-06-294-143/+509
| * | | | | | | | | | | | | Merge branch 'master' into offboard2_mergeJulian Oes2014-07-0728-174/+345
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | 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
| | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1123 from DonLakeFlyer/WarningsLorenz Meier2014-07-068-34/+37
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \