Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged master | Lorenz Meier | 2014-07-12 | 5 | -59/+57 |
|\ | |||||
| * | Stop warning users just because they shake a bit, be more strict to catch sen... | Lorenz Meier | 2014-07-11 | 1 | -6/+3 |
| * | Make commander error message more verbose | Lorenz Meier | 2014-07-11 | 1 | -1/+1 |
| * | Commander: More hotfixes to prearm check routine | Lorenz Meier | 2014-07-11 | 2 | -3/+7 |
| * | Hotfix: fix typo | Lorenz Meier | 2014-07-11 | 1 | -1/+1 |
| * | Add a check command and fix error reporting | Lorenz Meier | 2014-07-11 | 3 | -20/+24 |
| * | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2014-07-11 | 1 | -32/+23 |
| |\ | |||||
| | * | mavlink: use all outputs in HIL mode | Anton Babushkin | 2014-07-10 | 1 | -32/+23 |
| * | | Hotfix: Close fd before reusing it again | Lorenz Meier | 2014-07-11 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'master' of github.com:PX4/Firmware into sensor_drivers | Lorenz Meier | 2014-07-08 | 5 | -23/+93 |
|\| | |||||
| * | Merge pull request #1072 from PX4/forcesetpoint | Lorenz Meier | 2014-07-08 | 2 | -0/+68 |
| |\ | |||||
| | * | 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 | 75 | -3566/+9303 |
| | |\ | |||||
| | * | | 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 |
* | | | | board_serial: use a uint8_t buffer | Andrew Tridgell | 2014-07-08 | 3 | -6/+6 |
|/ / / | |||||
* | | | mc pos control: Fix reordering warnings | Lorenz Meier | 2014-07-08 | 1 | -10/+10 |
* | | | Merge pull request #1146 from DonLakeFlyer/UnitTestFix | Lorenz Meier | 2014-07-08 | 1 | -66/+147 |
|\ \ \ | |||||
| * | | | Fix mainStateTransitionTest | Don Gagne | 2014-07-07 | 1 | -66/+147 |
* | | | | Merge pull request #1145 from DonLakeFlyer/MoreWarnings | Lorenz Meier | 2014-07-08 | 4 | -11/+17 |
|\ \ \ \ | |||||
| * | | | | Fix compiler warnings | Don Gagne | 2014-07-07 | 4 | -11/+17 |
* | | | | | 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 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1119 from PX4/navigator_rewrite_drton | Lorenz Meier | 2014-07-07 | 14 | -316/+368 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 | 35 | -170/+635 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | navigator: takeoff on start of mission implemented | Anton Babushkin | 2014-06-30 | 2 | -27/+109 |
| | * | | | | | | Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into navigator_rewrit... | Anton Babushkin | 2014-06-30 | 45 | -923/+3865 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 15 | -177/+903 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 | 19 | -531/+806 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 | 58 | -321/+790 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Update estimator from Paul | Lorenz Meier | 2014-06-29 | 4 | -143/+509 |
* | | | | | | | | | | | | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 21 | -133/+205 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix unused variable warnings | Don Gagne | 2014-07-06 | 4 | -10/+5 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1133 from PX4/datalink_fix | Lorenz Meier | 2014-07-06 | 7 | -89/+161 |
| |\ \ \ \ \ \ \ \ \ \ \ |