aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | mtecs fix integratorThomas Gubler2014-05-192-25/+22
| * | | | | | | | | | | | | | | Merge branch 'fwattrobustify' into mtecsThomas Gubler2014-05-186-58/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fw pos control: landing: fix argument orderThomas Gubler2014-05-171-8/+22
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/mtecs' into mtecsThomas Gubler2014-05-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into mtecsLorenz Meier2014-05-1616-33/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-1720-45/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/mtecs' into mtecsThomas Gubler2014-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-1592-3745/+6452
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-1594-3746/+6481
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-1410-41/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | mtecs: check if input arguments are finiteThomas Gubler2014-05-141-1/+17
| * | | | | | | | | | | | | | | | | | | | | mtecs: change main functions to int and add some commentsThomas Gubler2014-05-142-8/+21
| * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'private_swissfang/mtecs' into mtecsThomas Gubler2014-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mtecsLorenz Meier2014-05-071-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into mtecsLorenz Meier2014-05-0712-31/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-13128-7170/+1369
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-0331-109/+595
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | mtecs: landing mode which limits pitch and as well throttle at the end of the...Thomas Gubler2014-05-014-17/+60
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-0117-58/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into mtecsLorenz Meier2014-04-2731-919/+974
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce debug option for mTECS and silence it as defaultLorenz Meier2014-04-272-8/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-2631-413/+571
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-248-58/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'private_swissfang/mtecs' into mtecsThomas Gubler2014-04-24384-6320/+25502
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple underspeed protection for mtecsThomas Gubler2014-04-213-12/+65
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mtecs_takeoff' into mtecsThomas Gubler2014-04-215-28/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into mtecs_takeoffThomas Gubler2014-04-2116-82/+182
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-18221-216/+10714
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: add comment about setting the standard limitsThomas Gubler2014-04-061-2/+2
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-061-11/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-0630-695/+1007
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: first rough version of takeoff modeThomas Gubler2014-03-275-28/+112
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-2116-82/+182
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-18221-216/+10714
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: better (but not final) default parameters for mtecsThomas Gubler2014-04-061-11/+11
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into paul_mtecsThomas Gubler2014-04-0630-695/+1007
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: BlockPDLimited: make sure dt > 0Thomas Gubler2014-03-271-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: make sure dt is calculated before any control calculationsThomas Gubler2014-03-272-8/+31
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_pos_control: whitespace in module.mkThomas Gubler2014-03-271-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: add FPA D gainThomas Gubler2014-03-273-17/+50
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'paul_mtecs_hil' into paul_mtecsThomas Gubler2014-03-274-29/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: comment out debug codeThomas Gubler2014-03-251-6/+6
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: correct a very wrong default param valueThomas Gubler2014-03-251-1/+1
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: commented out warnxJulian Oes2014-03-251-10/+10
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecs: don't flow the stdout too muchJulian Oes2014-03-252-12/+24
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hil_range_fix' into paul_mtecs_hilJulian Oes2014-03-251-30/+63
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into paul_mtecsThomas Gubler2014-03-272-31/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/paul_estimator_numeric' intoThomas Gubler2014-03-249-64/+627
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/paul_estimator_numeric' into paul_mtecsThomas Gubler2014-03-2346-226/+3920
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtecsThomas Gubler2014-03-236-33/+766