Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 96 | -3623/+9406 |
| |\ | | | | | | | | | | | | | 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 |
| | | | |||||
* | | | 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 | 6 | -12/+19 |
|\ \ \ \ | | | | | | | | | | | Fix compiler warnings | ||||
| * | | | | Fix compiler warnings | Don Gagne | 2014-07-07 | 6 | -12/+19 |
| | | | | | |||||
* | | | | | Merged master into offboard2_merge | Lorenz Meier | 2014-07-07 | 1 | -3/+10 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 | 54 | -978/+1896 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | navigator: takeoff on start of mission implemented | Anton Babushkin | 2014-06-30 | 2 | -27/+109 |
| | | | | | | | | |||||
| | * | | | | | | Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into ↵ | Anton Babushkin | 2014-06-30 | 69 | -1056/+3982 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_rewrite_drton | ||||
| | * | | | | | | | navigator: mission mode fixed | Anton Babushkin | 2014-06-30 | 2 | -57/+27 |
| | | | | | | | | | |||||
| | * | | | | | | | navigator: more API changes, duplicate code removed | Anton Babushkin | 2014-06-29 | 6 | -119/+95 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_drton | Anton Babushkin | 2014-06-29 | 23 | -193/+947 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | navigator: API changes, reparing to move manual modes to navigator, WIP | Anton Babushkin | 2014-06-29 | 10 | -86/+87 |
| | | | | | | | | | | |||||
| | * | | | | | | | | navigator: whitespace fix | Anton Babushkin | 2014-06-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_drton | Anton Babushkin | 2014-06-28 | 22 | -552/+831 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | navigator: NavigatorMode and MissionBlock API cleanup | Anton Babushkin | 2014-06-28 | 11 | -129/+144 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1142 from PX4/simon_test | Lorenz Meier | 2014-07-07 | 4 | -143/+510 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | EKF filter update | ||||
| | * | | | | | | | | | | Update estimator | Lorenz Meier | 2014-07-03 | 2 | -16/+17 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into simon_test | Lorenz Meier | 2014-07-03 | 95 | -1251/+2060 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Update estimator from Paul | Lorenz Meier | 2014-06-29 | 4 | -143/+509 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 28 | -174/+345 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp | ||||
| * | | | | | | | | | | | | Fix unused variable warnings | Don Gagne | 2014-07-06 | 5 | -10/+8 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1133 from PX4/datalink_fix | Lorenz Meier | 2014-07-06 | 7 | -89/+161 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Telemetry status: use separate topic for each link | ||||
| | * | | | | | | | | | | | sdlog2: TEL message format fixed | Anton Babushkin | 2014-07-06 | 1 | -4/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | telemetry_statur: use 4 separate topics | Anton Babushkin | 2014-07-06 | 7 | -100/+166 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Commander: Only consider latest active data link heartbeat for timeout. | Antonio Sanniravong | 2014-07-04 | 1 | -12/+18 |
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1123 from DonLakeFlyer/Warnings | Lorenz Meier | 2014-07-06 | 8 | -34/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler warning fixes | ||||
| | * | | | | | | | | | | | Bring everything up to double | Don Gagne | 2014-07-06 | 1 | -12/+10 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Compiler warning fixes | Don Gagne | 2014-07-05 | 8 | -28/+33 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #1135 from PX4/stack_fw_save | Lorenz Meier | 2014-07-06 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control apps | ||||
| | * | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control apps | Lorenz Meier | 2014-07-06 | 2 | -2/+2 |
| | |/ / / / / / / / / / | |||||
| * / / / / / / / / / / | Fixes #1130 | px4dev | 2014-07-06 | 4 | -5/+8 |
| |/ / / / / / / / / / |