A3XX: Finally fully fix new fuel system

This commit is contained in:
Joshua Davidson 2017-09-23 00:55:45 -04:00
parent 4431bfdcf7
commit 6b367dc7bc
14 changed files with 61 additions and 61 deletions

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -497,8 +497,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>
@ -508,8 +508,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y>0</y>
<z>-45.567</z>
</location>
<capacity unit="LBS">1.00</capacity>
<contents unit="LBS">0.00</contents>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<type>JET-A1</type>
</tank>

View file

@ -14,32 +14,32 @@
<channel name="Fuel to Engine 1 Pipes">
<switch name="fuel/from-tank0-to-tank3">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[0]/feed == 1
propulsion/tank[0]/contents-lbs GT 0
propulsion/tank[3]/contents-lbs LT 0.9
propulsion/tank[3]/contents-lbs LT 9
</test>
</switch>
<switch name="fuel/from-tank1-to-tank3">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs GT 0
propulsion/tank[3]/contents-lbs LT 0.9
propulsion/tank[3]/contents-lbs LT 9
</test>
</switch>
<switch name="fuel/from-tank2-to-tank3">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/x-feed == 1
/systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[2]/feed == 1
propulsion/tank[0]/contents-lbs EQ 0
propulsion/tank[2]/contents-lbs GT 0
propulsion/tank[3]/contents-lbs LT 0.9
propulsion/tank[3]/contents-lbs LT 9
</test>
</switch>
</channel>
@ -47,32 +47,32 @@
<channel name="Fuel to Engine 2 Pipes">
<switch name="fuel/from-tank2-to-tank4">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[2]/feed == 1
propulsion/tank[2]/contents-lbs GT 0
propulsion/tank[4]/contents-lbs LT 0.9
propulsion/tank[4]/contents-lbs LT 9
</test>
</switch>
<switch name="fuel/from-tank1-to-tank4">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs GT 0
propulsion/tank[4]/contents-lbs LT 0.9
propulsion/tank[4]/contents-lbs LT 9
</test>
</switch>
<switch name="fuel/from-tank0-to-tank4">
<default value="0"/>
<test logic="AND" value="0.9">
<test logic="AND" value="9">
/systems/fuel/x-feed == 1
/systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[0]/feed == 1
propulsion/tank[2]/contents-lbs EQ 0
propulsion/tank[0]/contents-lbs GT 0
propulsion/tank[4]/contents-lbs LT 0.9
propulsion/tank[4]/contents-lbs LT 9
</test>
</switch>
</channel>

View file

@ -1 +1 @@
1525
1526