Merge branch 'master' into MCDU

This commit is contained in:
Joshua Davidson 2018-01-12 18:52:44 -05:00
commit 8ebd597ae8
3 changed files with 7 additions and 7 deletions

View file

@ -638,7 +638,7 @@ var ap_various = func {
} }
if (getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) { if (getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) {
if (getprop("/controls/flight/aileron") > 0.3 or getprop("/controls/flight/aileron") < -0.2 or getprop("/controls/flight/elevator") > 0.3 or getprop("/controls/flight/elevator") < -0.2) { if (getprop("/controls/flight/aileron") > 0.2 or getprop("/controls/flight/aileron") < -0.2 or getprop("/controls/flight/elevator") > 0.2 or getprop("/controls/flight/elevator") < -0.2) {
setprop("/it-autoflight/input/ap1", 0); setprop("/it-autoflight/input/ap1", 0);
setprop("/it-autoflight/input/ap2", 0); setprop("/it-autoflight/input/ap2", 0);
} }

View file

@ -25,7 +25,7 @@
<pure_gain name="hydraulics/aileron-droop-neg"> <pure_gain name="hydraulics/aileron-droop-neg">
<input>hydraulics/aileron-droop</input> <input>hydraulics/aileron-droop</input>
<gain>-1.0</gain> <gain>-1.0</gain>
</pure_gain> </pure_gain>-
<fcs_function name="hydraulics/elevator-droop"> <fcs_function name="hydraulics/elevator-droop">
<function> <function>
@ -646,8 +646,8 @@
<table> <table>
<independentVar lookup="row">velocities/ve-kts</independentVar> <independentVar lookup="row">velocities/ve-kts</independentVar>
<tableData> <tableData>
30 0.00 30 0.00
60 2.00 60 2.00
</tableData> </tableData>
</table> </table>
<clipto> <clipto>
@ -661,8 +661,8 @@
<table> <table>
<independentVar lookup="row">velocities/ve-kts</independentVar> <independentVar lookup="row">velocities/ve-kts</independentVar>
<tableData> <tableData>
30 0.0 30 0.0
31 1.0 31 1.0
</tableData> </tableData>
</table> </table>
</scheduled_gain> </scheduled_gain>

View file

@ -1 +1 @@
4221 4222