Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into uavcan | Pavel Kirienko | 2014-07-08 | 363 | -116238/+1953 |
|\ | |||||
| * | Update sensors tests | Lorenz Meier | 2014-07-08 | 1 | -1/+36 |
| | | |||||
| * | Merge pull request #1153 from PX4/mavlinkupdate | Lorenz Meier | 2014-07-08 | 1 | -0/+0 |
| |\ | | | | | | | update mavlink to latest master | ||||
| | * | update mavlink to latest master | Thomas Gubler | 2014-07-08 | 1 | -0/+0 |
| |/ | |||||
| * | Merge pull request #1150 from PX4/mavlinkupdate | Lorenz Meier | 2014-07-08 | 1 | -0/+0 |
| |\ | | | | | | | update mavlink to latest master | ||||
| | * | update mavlink to latest master | Thomas Gubler | 2014-07-08 | 1 | -0/+0 |
| | | | |||||
| * | | Merge pull request #1072 from PX4/forcesetpoint | Lorenz Meier | 2014-07-08 | 2 | -0/+68 |
| |\ \ | | |/ | |/| | Force setpoint uorb topic | ||||
| | * | force setpoint uorb topic: add yaw field | Thomas Gubler | 2014-06-30 | 1 | -0/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into forcesetpoint | Thomas Gubler | 2014-06-30 | 105 | -3647/+9436 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/modules/uORB/objects_common.cpp | ||||
| | * | | force setpoint: fix comment | Thomas Gubler | 2014-06-24 | 1 | -3/+2 |
| | | | | |||||
| | * | | define force setpoint uorb topic | Thomas Gubler | 2014-06-23 | 2 | -0/+68 |
| | | | | |||||
| * | | | Merge pull request #1149 from PX4/ftp_silence | Lorenz Meier | 2014-07-08 | 3 | -23/+25 |
| |\ \ \ | | | | | | | | | | | Silence FTP transactions, be vocal about errors | ||||
| | * | | | Silence FTP transactions, be vocal about errors | Lorenz Meier | 2014-07-08 | 3 | -23/+25 |
| |/ / / | |||||
| * | | | mc pos control: Fix reordering warnings | Lorenz Meier | 2014-07-08 | 1 | -10/+10 |
| | | | | |||||
| * | | | ardrone interface: Remove unused variable | Lorenz Meier | 2014-07-08 | 1 | -2/+0 |
| | | | | |||||
| * | | | HIL: reduce excessive stack usage of driver | Lorenz Meier | 2014-07-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1146 from DonLakeFlyer/UnitTestFix | Lorenz Meier | 2014-07-08 | 1 | -66/+147 |
| |\ \ \ | | | | | | | | | | | Fix mainStateTransitionTest | ||||
| | * | | | Fix mainStateTransitionTest | Don Gagne | 2014-07-07 | 1 | -66/+147 |
| | | | | | |||||
| * | | | | Merge pull request #1145 from DonLakeFlyer/MoreWarnings | Lorenz Meier | 2014-07-08 | 7 | -13/+24 |
| |\ \ \ \ | | | | | | | | | | | | | Fix compiler warnings | ||||
| | * | | | | Fix compiler warnings | Don Gagne | 2014-07-07 | 7 | -13/+24 |
| | | | | | | |||||
| * | | | | | Merge pull request #1110 from PX4/offboard2_merge | Lorenz Meier | 2014-07-07 | 19 | -49/+504 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Offboard2 merge | ||||
| | * \ \ \ \ | Merged master into offboard2_merge | Lorenz Meier | 2014-07-07 | 309 | -119362/+62 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #1143 from PX4/submodules | Lorenz Meier | 2014-07-07 | 301 | -115489/+52 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Submodules for MAVLink and NuttX | ||||
| | * | | | | | | bugfixes for checks and tools | Lorenz Meier | 2014-07-07 | 2 | -6/+7 |
| | | | | | | | | |||||
| | * | | | | | | Merged master | Lorenz Meier | 2014-07-07 | 51 | -637/+1304 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Turn instructions into a makefile command, allowing Windows GUI kids to ↵ | Lorenz Meier | 2014-07-07 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a make target in Eclipse just for this | ||||
| | * | | | | | | Fixed check tools | Lorenz Meier | 2014-07-07 | 2 | -12/+28 |
| | | | | | | | | |||||
| | * | | | | | | Added NuttX | Lorenz Meier | 2014-07-07 | 3 | -1/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Add proper NuttX submodule checks | Lorenz Meier | 2014-07-07 | 2 | -4/+14 |
| | | | | | | | | | |||||
| | | * | | | | | | Added NuttX submodule | Lorenz Meier | 2014-07-07 | 3 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed .gitmodules | Lorenz Meier | 2014-07-07 | 1 | -3/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Cleaning up sub modules | Lorenz Meier | 2014-07-07 | 5 | -5/+19 |
| | | | | | | | | | |||||
| | * | | | | | | | really remove mavlink folder | Lorenz Meier | 2014-07-07 | 77 | -34934/+0 |
| | |/ / / / / / | |||||
| | * | | | | | | add mavlink submodule check script | Thomas Gubler | 2014-07-07 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script checks if the mavlink submodule is up to date | ||||
| | * | | | | | | change mavlink submodule url | Thomas Gubler | 2014-07-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | mavlink as git submodule | Thomas Gubler | 2014-07-02 | 2 | -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 files | Thomas Gubler | 2014-07-02 | 218 | -80550/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1137 from DonLakeFlyer/FTPLogging | Lorenz Meier | 2014-07-07 | 1 | -3/+10 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Better FTP logging | ||||
| | * | | | | | | Turn off noisier logging | Don Gagne | 2014-07-07 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | More logging | Don Gagne | 2014-07-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Better logging | Don Gagne | 2014-07-06 | 1 | -3/+10 |
| | | | | | | | | |||||
| | | | * | | | | navigator: adapt offboard class to new NavigatorMode API | Julian Oes | 2014-07-07 | 2 | -24/+19 |
| | | | | | | | | |||||
| | | | * | | | | navigator: forgot to fix conflicts | Julian Oes | 2014-07-07 | 2 | -2/+1 |
| | | | | | | | | |||||
| | | | * | | | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 18 | -459/+877 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp | ||||
| * | | | | | | | Merge pull request #1119 from PX4/navigator_rewrite_drton | Lorenz Meier | 2014-07-07 | 14 | -316/+368 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Navigator rewrite - DrTon | ||||
| | * | | | | | | | commander: require home position for MISSION, fallback to LOITER | Anton Babushkin | 2014-07-06 | 2 | -1/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | navigator: takeoff altitude fixed | Anton Babushkin | 2014-07-04 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into navigator_rewrite_drton | Anton Babushkin | 2014-07-04 | 61 | -982/+1950 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | navigator: takeoff on start of mission implemented | Anton Babushkin | 2014-06-30 | 2 | -27/+109 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into ↵ | Anton Babushkin | 2014-06-30 | 70 | -1061/+3986 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_rewrite_drton |