aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin...Thomas Gubler2014-08-1173-1872/+2873
|\
| * Merge pull request #1265 from PX4/FTPLorenz Meier2014-08-102-8/+42
| |\
| | * More FTP supportDon Gagne2014-08-102-8/+42
| * | Updated mavlink versionLorenz Meier2014-08-101-0/+0
| * | Merge pull request #1262 from PX4/mavlink_updateLorenz Meier2014-08-105-137/+53
| |\ \
| | * | Add default initializers and timestamp in local positionLorenz Meier2014-08-103-4/+7
| | * | Updated MAVLink to latest revisionLorenz Meier2014-08-102-136/+49
| | * | Updated MAVLink versionLorenz Meier2014-08-101-0/+0
| | * | Updated mavlink versionLorenz Meier2014-08-091-0/+0
| * | | Merge pull request #1261 from PX4/rcviperLorenz Meier2014-08-094-2/+89
| |\ \ \ | | |/ / | |/| |
| | * | mixers: added Viper mixerJulian Oes2014-08-092-1/+73
| | * | Startup script: added viper scriptJulian Oes2014-08-092-0/+15
| | * | mixers: adapted FX79 mixer to have more pitch influenceJulian Oes2014-08-091-2/+2
| |/ /
| * | Merge pull request #886 from PX4/smooth_pos_holdLorenz Meier2014-08-092-142/+148
| |\ \
| | * | mc_pos_control: more accurate position setpoint reset, keep attitude setpoint...Anton Babushkin2014-08-081-3/+6
| | * | mc_pos_control: manual and offboard control reorganization and cleanupAnton Babushkin2014-08-082-139/+140
| | * | Merge branch 'master' into smooth_pos_holdAnton Babushkin2014-08-0712-92/+156
| | |\|
| | * | Merge branch 'master' into smooth_pos_holdAnton Babushkin2014-08-02777-133379/+29867
| | |\ \
| | * \ \ Merge branch 'master' into smooth_pos_holdAnton Babushkin2014-05-0327-106/+457
| | |\ \ \
| | * | | | mc_pos_control: use MPC_XXX_FF to adjust setpoint on resetAnton Babushkin2014-05-011-3/+5
| | * | | | mc_pos_control: use current velocity to calculate position setpoint on reset ...Anton Babushkin2014-05-011-3/+3
| * | | | | Merge pull request #1259 from PX4/ekf_fixLorenz Meier2014-08-081-3/+28
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Introduce similar checks fo all other health checks in the filterLorenz Meier2014-08-071-2/+19
| | * | | | Do not fuse height after innovation consistency check failLorenz Meier2014-08-071-1/+9
| |/ / / /
| * | | | Merge pull request #1254 from PX4/tecs_loggingLorenz Meier2014-08-067-49/+115
| |\ \ \ \
| | * | | | Add TECS loggingLorenz Meier2014-08-031-0/+47
| | * | | | Reinstate TECS loggingLorenz Meier2014-08-032-32/+57
| | * | | | Remove airspeed and altitude raw data from TECS log, as we have these quantit...Lorenz Meier2014-08-034-17/+11
| | | |_|/ | | |/| |
| * | | | Merge pull request #1258 from PX4/uavcan_fixLorenz Meier2014-08-061-22/+19
| |\ \ \ \
| | * | | | UAVCAN ESC mixer: removed the failsafe placeholder, it's no use herePavel Kirienko2014-08-061-5/+0
| | * | | | uavcan: fix actuator groups subcriptions and poll()Anton Babushkin2014-08-021-17/+19
| | |/ / /
| * | | | Merge pull request #1255 from PX4/ArmingUTFixLorenz Meier2014-08-054-21/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix broken arming unit testDon Gagne2014-08-041-5/+5
| | * | | Add fRunPreArmChecks flagDon Gagne2014-08-042-7/+8
| | * | | Update arming_state_transition callsDon Gagne2014-08-041-9/+9
| |/ / /
| * | | Merge branch 'uavcan_node_info'Pavel Kirienko2014-08-021-10/+7
| |\ \ \
| | * | | UAVCAN: Fixed short git hash computationPavel Kirienko2014-08-021-10/+7
| * | | | Warn on far waypointsLorenz Meier2014-08-011-0/+4
| * | | | Merge branch 'master' of github.com:PX4/FirmwareLorenz Meier2014-08-016-18/+93
| |\ \ \ \
| | * \ \ \ Merge pull request #1250 from PX4/throttle_tuningLorenz Meier2014-08-015-17/+92
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of github.com:PX4/Firmware into throttle_tuningLorenz Meier2014-08-011-1/+1
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #1244 from PX4/asfilter_moreLorenz Meier2014-08-011-1/+1
| | |\ \ \ \ \
| | | * | | | | airspeed: Filter slightly more, just a touch to not induce phase delayLorenz Meier2014-07-311-1/+1
| | | | * | | | Init valuesLorenz Meier2014-08-011-0/+20
| | | | * | | | Add throttle slew rate paramLorenz Meier2014-08-012-0/+16
| | | | * | | | removed debug statement from mTECSLorenz Meier2014-08-011-1/+0
| | | | * | | | Make throttle time constant tunable separately, group TECS params correctly, ...Lorenz Meier2014-08-012-14/+46
| | | | * | | | Move the last throttle demand setting to a better positionLorenz Meier2014-08-011-1/+4
| | | | * | | | Merge branch 'master' of github.com:philipoe/Firmware into throttle_tuningLorenz Meier2014-08-012-1/+6
| | | |/| | | | | | |/| | | | |
| | | | * | | | TECS: Added separate gain / time constant for the throttle loop to allow inde...philipoe2014-07-312-1/+6