Merge branch 'master' into dev

This commit is contained in:
Jonathan Redpath 2018-10-19 16:45:42 +01:00
commit f4256b78f0
2 changed files with 150 additions and 98 deletions

View file

@ -1738,6 +1738,19 @@
</channel>
<channel name="Flaps">
<switch name="fcs/sfcc/unit1-avail">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/bus/dc-ess ge 25
</test>
</switch>
<switch name="fcs/sfcc/unit2-avail">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/bus/dc2 ge 25
</test>
</switch>
<pure_gain name="fcs/flap-pos-gain">
<input>/controls/flight/flaps</input>
@ -1746,9 +1759,29 @@
<switch name="fcs/flap-pos-rate">
<default value="0.0"/>
<test logic="OR" value="1.16666666">
<test logic="AND" value="1.16666666">
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 0
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/yellow-psi ge 1500
fcs/sfcc/unit1-avail eq 0
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi lt 1500
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi lt 1500
/systems/hydraulic/yellow-psi ge 1500
</test>
</switch>
@ -1782,10 +1815,29 @@
<switch name="fcs/slat-pos-rate">
<default value="0.0"/>
<test logic="OR" value="1.35">
<test logic="AND" value="1.35">
/systems/hydraulic/blue-psi ge 1500
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 0
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/green-psi ge 1500
fcs/sfcc/unit1-avail eq 0
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi ge 1500
/systems/hydraulic/green-psi lt 1500
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi lt 1500
/systems/hydraulic/green-psi ge 1500
</test>
</switch>

View file

@ -1 +1 @@
4678
4679