Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-18 16:40:53 -04:00
commit 3f347783f3
2 changed files with 4 additions and 4 deletions

View file

@ -1741,12 +1741,12 @@
<pure_gain name="fcs/flap-pos-gain">
<input>/controls/flight/flaps</input>
<gain>30.0</gain>
<gain>35.0</gain>
</pure_gain>
<switch name="fcs/flap-pos-rate">
<default value="0.0"/>
<test logic="OR" value="0.85714285">
<test logic="OR" value="1.16666666">
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500
</test>
@ -1782,7 +1782,7 @@
<switch name="fcs/slat-pos-rate">
<default value="0.0"/>
<test logic="OR" value="0.74074074">
<test logic="OR" value="1.35">
/systems/hydraulic/blue-psi ge 1500
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500

View file

@ -1 +1 @@
4677
4678