aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #381 from PX4/waypoint_loiterLorenz Meier2013-09-072-5/+7
|\ | | | | Have systems loiter at the last waypoint
| * Have systems loiter at the last waypointLorenz Meier2013-09-061-2/+2
| |\
| | * Merge branch 'master' of github.com:PX4/Firmware into python3_compatLorenz Meier2013-09-04320-7228/+23381
| | |\
| * | | Have systems loiter at the last waypointLorenz Meier2013-09-062-5/+7
| | | |
* | | | Removed dysfunctional includes. Need to be re-done properly when finally ↵Lorenz Meier2013-09-072-2/+0
| | | | | | | | | | | | | | | | implementing SITL. No use to leave untested stuff in tree.
* | | | Merge pull request #382 from PX4/bool_fixLorenz Meier2013-09-061-1/+1
|\ \ \ \ | | | | | | | | | | Make bool on FMUv1 and FMUv2 behave the same
| * | | | Make bool on FMUv1 and FMUv2 behave the sameLorenz Meier2013-09-061-1/+1
| |/ / /
* | | | Merge pull request #383 from tstellanova/inject_versionLorenz Meier2013-09-063-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 headertstellanova2013-09-063-0/+38
|/ / /
* | | Hotfix: Gain optimizationLorenz Meier2013-09-051-3/+3
| | |
* | | Setting correct battery scaling for FMU-only setupsLorenz Meier2013-09-054-0/+4
| | |
* | | Merge pull request #380 from julianoes/hotfix_mag_calibLorenz Meier2013-09-051-5/+6
|\ \ \ | | | | | | | | Workaround to prevent crash during mag calibration
| * | | Workaround to prevent crash during mag calibrationJulian Oes2013-09-051-5/+6
|/ / /
* | | Merge branch 'master' of github.com:PX4/FirmwareLorenz Meier2013-09-051-5/+5
|\ \ \
| * \ \ Merge pull request #379 from PX4/landed_bugfixLorenz Meier2013-09-051-5/+5
| |\ \ \ | | | | | | | | | | position_estimator_inav: land detector bug fixed
| | * | | position_estimator_inav: land detector bug fixedAnton Babushkin2013-09-051-5/+5
| | | | |
* | | | | Fixed sched param setup in MAVLink appLorenz Meier2013-09-051-0/+1
| | | | |
* | | | | Hotfix: Better error reporting, fixed sched param setupLorenz Meier2013-09-053-12/+31
|/ / / /
* / / / Hotfix: Minor param adjustments based on flight testingLorenz Meier2013-09-051-2/+2
|/ / /
* | | Merge pull request #366 from julianoes/python3_compatLorenz Meier2013-09-042-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 boardJulian Oes2013-09-041-1/+23
| | |
| * | Uploader works now with Python 2.7 and 3.3Julian Oes2013-09-041-27/+44
| | |
| * | Merge branch 'master' into python3_compatJulian Oes2013-09-03318-7126/+23278
| |\ \ | | |/ | |/|
| * | Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3Julian Oes2013-08-232-6/+6
| | |
* | | Avoid unneccesary castLorenz Meier2013-09-041-1/+1
| | |
* | | Merge pull request #376 from PX4/scripts_fixLorenz Meier2013-09-035-79/+79
|\ \ \ | | | | | | | | Tabs replaced by spaces in autostart scripts
| * | | Tabs replaced by spaces in autostart scriptsAnton Babushkin2013-09-035-79/+79
|/ / /
* | | Hotfix: Identified mavlink issue source, workaround, working on a fixLorenz Meier2013-09-032-4/+2
| | |
* | | Merge pull request #375 from julianoes/hotfix_px4io_uartLorenz Meier2013-09-031-0/+15
|\ \ \ | | | | | | | | Reset baudrate after px4io update
| * | | Reset baudrate after px4io updateJulian Oes2013-09-031-0/+15
| | | |
* | | | Fix UART buf sizes so that MAVLink transfers are not corrupted for all ↵Lorenz Meier2013-09-032-6/+6
|/ / / | | | | | | | | | serial ports intended for MAVLink
* | | Merge pull request #304 from julianoes/ardrone_fixesLorenz Meier2013-09-031-50/+38
|\ \ \ | |_|/ |/| | Prevent flips at high throttle
| * | Prevent flips at high throttleJulian Oes2013-06-151-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 Meier2013-09-032-5/+4
| | | | | | | | | | | | MAVLink and delay / retries for correct approach
* | | MAVLink workaroundLorenz Meier2013-09-031-0/+1
| | |
* | | Merge branch 'master' of github.com:PX4/FirmwareLorenz Meier2013-09-036-20/+46
|\ \ \
| * | | Set sane defaults for F330Lorenz Meier2013-09-031-12/+28
| | | |
| * | | Merge branch 'respect_takeoff_alt'Lorenz Meier2013-09-034-6/+16
| |\ \ \
| | * | | Added parameter NAV_TAKEOFF_GAPAnton Babushkin2013-09-024-4/+9
| | | | |
| | * | | multirotor_pos_control: added takeoff gap (hardcoded 3m), fixed code styleAnton Babushkin2013-09-021-6/+6
| | | | |
| | * | | respect NAV_TAKEOFF_ALT instead of using hardcoded default takeoff valuetstellanova2013-09-023-2/+7
| | | | |
| * | | | Merge pull request #374 from julianoes/hotfix_mixerLorenz Meier2013-09-021-2/+2
| |\ \ \ \ | | |/ / / | |/| | | Allow mixer upload when PWM is on
| | * | | Allow mixer upload when PWM is onJulian Oes2013-09-021-2/+2
| |/ / /
* / / / v4 compatibilityLorenz Meier2013-09-032-2/+2
|/ / /
* | | Merge branch 'pid_fix' of github.com:PX4/FirmwareLorenz Meier2013-09-021-6/+10
|\ \ \
| * | | pid.limit != 0 fixAnton Babushkin2013-09-011-2/+4
| | | |
| * | | Merge branch 'master' into pid_fixLorenz Meier2013-09-011-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:PX4/Firmware into pid_fixLorenz Meier2013-09-0110-162/+54
| |\ \ \ \
| * | | | | pid.c: fixed bad merge of seatbelt_multirotor, should fix EASY/AUTO modesAnton Babushkin2013-09-011-6/+8
| | | | | |
* | | | | | Merge pull request #372 from sjwilks/cleanupLorenz Meier2013-09-012-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make sure the unit tests aren't included as part of the standard firmware binary