Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-03-04 | 13 | -98/+299 |
|\ | |||||
| * | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2014-03-04 | 1 | -3/+3 |
| |\ | |||||
| | * | FMUv2: switch debug console and 2nd GPS | Andrew Tridgell | 2014-03-04 | 1 | -3/+3 |
| * | | Fixed warning | Lorenz Meier | 2014-03-04 | 1 | -1/+1 |
| |/ | |||||
| * | tests: added "tests file2" filesystem test | Andrew Tridgell | 2014-03-04 | 4 | -0/+199 |
| * | commander: allow arming with safety enabled in HIL mode | Anton Babushkin | 2014-03-03 | 1 | -1/+1 |
| * | commander: ignore battery voltage in HIL mode | Anton Babushkin | 2014-03-03 | 1 | -1/+1 |
| * | Merge pull request #700 from PX4/fix_mission_dive | Thomas Gubler | 2014-03-03 | 6 | -92/+94 |
| |\ | |||||
| | * | l1_pos_control: fix stupid 'if not' mistake | Julian Oes | 2014-02-24 | 1 | -1/+1 |
| | * | l1_pos_control: set gndspeed_undershoot to 0 in loiter | Julian Oes | 2014-02-24 | 1 | -1/+1 |
| | * | l1_pos_control: prevent NaNs for roll setpoint | Julian Oes | 2014-02-24 | 1 | -2/+11 |
| | * | Merge remote-tracking branch 'px4/beta' into fix_mission_dive | Julian Oes | 2014-02-24 | 8 | -79/+86 |
| | |\ | |||||
| | * | | fw pos ctrl: initialize uorb structs in initialization list | Thomas Gubler | 2014-02-19 | 1 | -13/+10 |
| | * | | fw_pos_control_l1: warning fixes | Julian Oes | 2014-02-19 | 1 | -26/+27 |
| | * | | TECS: warning fixes | Julian Oes | 2014-02-19 | 1 | -14/+13 |
| | * | | TECS: use constant from geo | Julian Oes | 2014-02-19 | 2 | -6/+2 |
| | * | | fw_pos_control_l1: use double everywhere for lat and lon | Julian Oes | 2014-02-18 | 1 | -6/+6 |
| | * | | fw_pos_control_l1: indentation only | Julian Oes | 2014-02-18 | 1 | -16/+16 |
| | * | | Navigator: Get rid of warnings first | Julian Oes | 2014-02-18 | 1 | -23/+23 |
* | | | | Fixes to startup scripts, back to nominal defaults | Lorenz Meier | 2014-03-03 | 2 | -2/+2 |
* | | | | Fixes to altitude units | Lorenz Meier | 2014-03-03 | 1 | -6/+7 |
* | | | | Merge branch 'beta' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-03-03 | 17 | -175/+196 |
|\| | | | |||||
| * | | | Merge pull request #674 from PX4/safety_disarm | julianoes | 2014-03-03 | 1 | -5/+7 |
| |\ \ \ | |||||
| | * | | | commander: disarm system when safety enabled | Anton Babushkin | 2014-02-17 | 1 | -5/+7 |
| * | | | | Merge pull request #653 from PX4/fs_beep | julianoes | 2014-03-03 | 5 | -91/+86 |
| |\ \ \ \ | |||||
| | * | | | | commander: tunes cleanup and fixes | Anton Babushkin | 2014-02-11 | 2 | -23/+18 |
| | * | | | | commander: play warning tune (as for low battery) when in failsafe state | Anton Babushkin | 2014-02-11 | 1 | -9/+6 |
| | * | | | | commander: beeps and blinks cleanup | Anton Babushkin | 2014-02-11 | 5 | -74/+76 |
| | * | | | | commander: reset blink_msg_end when blink message completed to set normal LED... | Anton Babushkin | 2014-02-11 | 1 | -0/+1 |
| * | | | | | Merge pull request #660 from PX4/rtl_heading | julianoes | 2014-03-03 | 1 | -18/+53 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'inav_fs' into rtl_heading | Anton Babushkin | 2014-03-01 | 17 | -132/+129 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | navigator: check if yaw reached only when position reached | Anton Babushkin | 2014-02-18 | 1 | -1/+1 |
| | * | | | | | | navigator: "reached" flags reset fixed | Anton Babushkin | 2014-02-18 | 1 | -11/+28 |
| | * | | | | | | Merge branch 'beta' into rtl_heading | Anton Babushkin | 2014-02-18 | 45 | -906/+1748 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | * | | | | | | navigator: use bearing to home for RTL | Anton Babushkin | 2014-02-12 | 1 | -6/+24 |
| * | | | | | | | Merge pull request #680 from PX4/ready_rtl_fix | julianoes | 2014-03-02 | 1 | -7/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | navigator: don't enter AUTO_READY for fixedwing because we don't have a land ... | Julian Oes | 2014-03-01 | 1 | -1/+2 |
| | * | | | | | | | Merge branch 'beta' into ready_rtl_fix | Anton Babushkin | 2014-02-28 | 14 | -122/+110 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'beta' into ready_rtl_fix | Anton Babushkin | 2014-02-18 | 107 | -2185/+2612 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | navigator: forbid READY - > RTL transition fix | Anton Babushkin | 2014-02-06 | 1 | -1/+1 |
| | * | | | | | | | | navigator: forbid READY - > RTL transition | Anton Babushkin | 2014-02-06 | 1 | -5/+3 |
| * | | | | | | | | | Merge pull request #699 from PX4/beta_phantom | Lorenz Meier | 2014-03-02 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | startup: phantom script was missing the default line | Julian Oes | 2014-03-01 | 1 | -0/+2 |
| * | | | | | | | | | | mc_pos_control: remove some debug logs | Anton Babushkin | 2014-03-02 | 1 | -2/+0 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | position_estimator_inav: log writing on NaN estimate fixed | Anton Babushkin | 2014-03-01 | 1 | -4/+5 |
| * | | | | | | | | | position_estimator_inav: failsafe against NaN estimate | Anton Babushkin | 2014-03-01 | 1 | -2/+12 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge remote-tracking branch 'px4/master' into beta | Julian Oes | 2014-03-01 | 2 | -4/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge pull request #688 from PX4/sdlog2_fix | julianoes | 2014-03-01 | 2 | -4/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | sdlog2: code style fixes broke compilation | Julian Oes | 2014-02-24 | 1 | -1/+0 |
| | | * | | | | | | | Code style fixes (authors should be in the doxygen section), using lseek to a... | Lorenz Meier | 2014-02-23 | 2 | -4/+3 |