Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #381 from PX4/waypoint_loiter | Lorenz Meier | 2013-09-07 | 2 | -5/+7 |
|\ | | | | | Have systems loiter at the last waypoint | ||||
| * | Have systems loiter at the last waypoint | Lorenz Meier | 2013-09-06 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:PX4/Firmware into python3_compat | Lorenz Meier | 2013-09-04 | 320 | -7228/+23381 |
| | |\ | |||||
| * | | | Have systems loiter at the last waypoint | Lorenz Meier | 2013-09-06 | 2 | -5/+7 |
| | | | | |||||
* | | | | Removed dysfunctional includes. Need to be re-done properly when finally ↵ | Lorenz Meier | 2013-09-07 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | implementing SITL. No use to leave untested stuff in tree. | ||||
* | | | | Merge pull request #382 from PX4/bool_fix | Lorenz Meier | 2013-09-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Make bool on FMUv1 and FMUv2 behave the same | ||||
| * | | | | Make bool on FMUv1 and FMUv2 behave the same | Lorenz Meier | 2013-09-06 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #383 from tstellanova/inject_version | Lorenz Meier | 2013-09-06 | 3 | -0/+38 |
|\ \ \ \ | |/ / / |/| | | | grab the git hash and inject it into every log file header | ||||
| * | | | grab the git hash and inject it into every log file header | tstellanova | 2013-09-06 | 3 | -0/+38 |
|/ / / | |||||
* | | | Hotfix: Gain optimization | Lorenz Meier | 2013-09-05 | 1 | -3/+3 |
| | | | |||||
* | | | Setting correct battery scaling for FMU-only setups | Lorenz Meier | 2013-09-05 | 4 | -0/+4 |
| | | | |||||
* | | | Merge pull request #380 from julianoes/hotfix_mag_calib | Lorenz Meier | 2013-09-05 | 1 | -5/+6 |
|\ \ \ | | | | | | | | | Workaround to prevent crash during mag calibration | ||||
| * | | | Workaround to prevent crash during mag calibration | Julian Oes | 2013-09-05 | 1 | -5/+6 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2013-09-05 | 1 | -5/+5 |
|\ \ \ | |||||
| * \ \ | Merge pull request #379 from PX4/landed_bugfix | Lorenz Meier | 2013-09-05 | 1 | -5/+5 |
| |\ \ \ | | | | | | | | | | | position_estimator_inav: land detector bug fixed | ||||
| | * | | | position_estimator_inav: land detector bug fixed | Anton Babushkin | 2013-09-05 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Fixed sched param setup in MAVLink app | Lorenz Meier | 2013-09-05 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Hotfix: Better error reporting, fixed sched param setup | Lorenz Meier | 2013-09-05 | 3 | -12/+31 |
|/ / / / | |||||
* / / / | Hotfix: Minor param adjustments based on flight testing | Lorenz Meier | 2013-09-05 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #366 from julianoes/python3_compat | Lorenz Meier | 2013-09-04 | 2 | -35/+74 |
|\ \ \ | |_|/ |/| | | Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3 | ||||
| * | | The python uploader can now reboot the board | Julian Oes | 2013-09-04 | 1 | -1/+23 |
| | | | |||||
| * | | Uploader works now with Python 2.7 and 3.3 | Julian Oes | 2013-09-04 | 1 | -27/+44 |
| | | | |||||
| * | | Merge branch 'master' into python3_compat | Julian Oes | 2013-09-03 | 318 | -7126/+23278 |
| |\ \ | | |/ | |/| | |||||
| * | | Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3 | Julian Oes | 2013-08-23 | 2 | -6/+6 |
| | | | |||||
* | | | Avoid unneccesary cast | Lorenz Meier | 2013-09-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #376 from PX4/scripts_fix | Lorenz Meier | 2013-09-03 | 5 | -79/+79 |
|\ \ \ | | | | | | | | | Tabs replaced by spaces in autostart scripts | ||||
| * | | | Tabs replaced by spaces in autostart scripts | Anton Babushkin | 2013-09-03 | 5 | -79/+79 |
|/ / / | |||||
* | | | Hotfix: Identified mavlink issue source, workaround, working on a fix | Lorenz Meier | 2013-09-03 | 2 | -4/+2 |
| | | | |||||
* | | | Merge pull request #375 from julianoes/hotfix_px4io_uart | Lorenz Meier | 2013-09-03 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | Reset baudrate after px4io update | ||||
| * | | | Reset baudrate after px4io update | Julian Oes | 2013-09-03 | 1 | -0/+15 |
| | | | | |||||
* | | | | Fix UART buf sizes so that MAVLink transfers are not corrupted for all ↵ | Lorenz Meier | 2013-09-03 | 2 | -6/+6 |
|/ / / | | | | | | | | | | serial ports intended for MAVLink | ||||
* | | | Merge pull request #304 from julianoes/ardrone_fixes | Lorenz Meier | 2013-09-03 | 1 | -50/+38 |
|\ \ \ | |_|/ |/| | | Prevent flips at high throttle | ||||
| * | | Prevent flips at high throttle | Julian Oes | 2013-06-15 | 1 | -50/+38 |
| | | | | | | | | | | | | | | | Conflicts: src/drivers/ardrone_interface/ardrone_motor_control.c | ||||
* | | | Hotfix for USB: Starting MAVLink only on USB if connected. Needs rewrite of ↵ | Lorenz Meier | 2013-09-03 | 2 | -5/+4 |
| | | | | | | | | | | | | MAVLink and delay / retries for correct approach | ||||
* | | | MAVLink workaround | Lorenz Meier | 2013-09-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2013-09-03 | 6 | -20/+46 |
|\ \ \ | |||||
| * | | | Set sane defaults for F330 | Lorenz Meier | 2013-09-03 | 1 | -12/+28 |
| | | | | |||||
| * | | | Merge branch 'respect_takeoff_alt' | Lorenz Meier | 2013-09-03 | 4 | -6/+16 |
| |\ \ \ | |||||
| | * | | | Added parameter NAV_TAKEOFF_GAP | Anton Babushkin | 2013-09-02 | 4 | -4/+9 |
| | | | | | |||||
| | * | | | multirotor_pos_control: added takeoff gap (hardcoded 3m), fixed code style | Anton Babushkin | 2013-09-02 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | respect NAV_TAKEOFF_ALT instead of using hardcoded default takeoff value | tstellanova | 2013-09-02 | 3 | -2/+7 |
| | | | | | |||||
| * | | | | Merge pull request #374 from julianoes/hotfix_mixer | Lorenz Meier | 2013-09-02 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | Allow mixer upload when PWM is on | ||||
| | * | | | Allow mixer upload when PWM is on | Julian Oes | 2013-09-02 | 1 | -2/+2 |
| |/ / / | |||||
* / / / | v4 compatibility | Lorenz Meier | 2013-09-03 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'pid_fix' of github.com:PX4/Firmware | Lorenz Meier | 2013-09-02 | 1 | -6/+10 |
|\ \ \ | |||||
| * | | | pid.limit != 0 fix | Anton Babushkin | 2013-09-01 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into pid_fix | Lorenz Meier | 2013-09-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into pid_fix | Lorenz Meier | 2013-09-01 | 10 | -162/+54 |
| |\ \ \ \ | |||||
| * | | | | | pid.c: fixed bad merge of seatbelt_multirotor, should fix EASY/AUTO modes | Anton Babushkin | 2013-09-01 | 1 | -6/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #372 from sjwilks/cleanup | Lorenz Meier | 2013-09-01 | 2 | -4/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Make sure the unit tests aren't included as part of the standard firmware binary |