fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'master' into ADIRS

Browse source
This commit is contained in:
legoboyvdlp R 2019-11-09 16:14:04 +00:00
commit d1fb04cfaa
17 changed files with 547 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
A320-100-CFM.xml
View file

@ -76,11 +76,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Left Wing Tank -->
@ -89,11 +89,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12212.50 </capacity>
<capacity unit="LBS"> 12272.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
@ -103,11 +103,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 0 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 14550.50 </capacity>
<contents unit="LBS"> 40.88 </contents>
<capacity unit="LBS"> 14623.00 </capacity>
<contents unit="LBS"> 42 </contents>
<unusable-volume unit="LTR"> 23.20 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Right Wing Tank -->
@ -116,11 +116,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12212.50 </capacity>
<capacity unit="LBS"> 12272.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Outer Right Wing Tank -->
@ -129,11 +129,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Engine 1 Pipes -->
@ -145,7 +145,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- Engine 2 Pipes -->
<location unit="M">
@ -156,11 +156,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="fuel"/>
<system file="glass-effect1"/>
<system file="a320-fcs"/>
<system file="a320-100-fuel"/>

49
A320-200-CFM.xml
View file

@ -76,11 +76,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>0</priority>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Left Wing Tank -->
@ -89,11 +89,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12520.50 </capacity>
<capacity unit="LBS"> 12591.95 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>0</priority>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Center Tank -->
@ -102,11 +102,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 0 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 14550.50 </capacity>
<contents unit="LBS"> 40.88 </contents>
<capacity unit="LBS"> 14623.00 </capacity>
<contents unit="LBS"> 42 </contents>
<unusable-volume unit="LTR"> 23.20 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<priority>0</priority>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Right Wing Tank -->
@ -115,11 +115,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12520.50 </capacity>
<capacity unit="LBS"> 12591.95 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>0</priority>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Outer Right Wing Tank -->
@ -128,11 +128,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>0</priority>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Engine 1 Pipes -->
@ -144,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- Engine 2 Pipes -->
<location unit="M">
@ -155,11 +155,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="fuel"/>
<system file="glass-effect1"/>
<system file="a320-fcs"/>
<system file="a320-adr"/>

39
A320-200-IAE.xml
View file

@ -76,11 +76,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Left Wing Tank -->
@ -89,11 +89,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12212.50 </capacity>
<capacity unit="LBS"> 12272.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Center Tank -->
@ -102,11 +102,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 0 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 14550.50 </capacity>
<contents unit="LBS"> 40.88 </contents>
<capacity unit="LBS"> 14623.00 </capacity>
<contents unit="LBS"> 42 </contents>
<unusable-volume unit="LTR"> 23.20 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Right Wing Tank -->
@ -115,11 +115,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12212.50 </capacity>
<capacity unit="LBS"> 12272.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Outer Right Wing Tank -->
@ -128,11 +128,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Engine 1 Pipes -->
@ -144,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- Engine 2 Pipes -->
<location unit="M">
@ -155,11 +155,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="fuel"/>
<system file="glass-effect1"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>

11
A320-main.xml
View file

@ -837,6 +837,13 @@
<left type="bool">0</left>
<right type="bool">0</right>
</chocks>
<fuel-truck>
<connect type="bool">0</connect>
<enable type="bool">0</enable>
<operate type="bool">0</operate>
<request-lbs type="double">0</request-lbs>
<request-total-lbs type="double">0</request-total-lbs>
</fuel-truck>
</services>
<systems>
@ -970,6 +977,9 @@
</tank>
<ctr-pump-cmd-on-eng-start type="bool">0</ctr-pump-cmd-on-eng-start>
<refuel>
<left-valve type="bool">0</left-valve>
<center-valve type="bool">0</center-valve>
<right-valve type="bool">0</right-valve>
<refuelling type="bool">0</refuelling>
</refuel>
<fuel-used-1 type="double">0</fuel-used-1>
@ -1749,6 +1759,7 @@
<file>Aircraft/A320-family/Nasal/fire.nas</file>
<file>Aircraft/A320-family/Nasal/brakes.nas</file>
<file>Aircraft/A320-family/Nasal/ground_services.nas</file>
<file>Aircraft/A320-family/Nasal/payload.nas</file>
<file>Aircraft/A320-family/Nasal/effects.nas</file>
</systems>
<fadec>

39
A320neo-CFM.xml
View file

@ -76,11 +76,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Left Wing Tank -->
@ -89,11 +89,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12147.00 </capacity>
<capacity unit="LBS"> 12155.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Center Tank -->
@ -102,11 +102,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 0 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 14601.44 </capacity>
<contents unit="LBS"> 40.88 </contents>
<capacity unit="LBS"> 14620.00 </capacity>
<contents unit="LBS"> 42 </contents>
<unusable-volume unit="LTR"> 23.20 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Right Wing Tank -->
@ -115,11 +115,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12147.00 </capacity>
<capacity unit="LBS"> 12155.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Outer Right Wing Tank -->
@ -128,11 +128,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Engine 1 Pipes -->
@ -144,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- Engine 2 Pipes -->
<location unit="M">
@ -155,11 +155,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="fuel"/>
<system file="glass-effect1"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>

39
A320neo-PW.xml
View file

@ -76,11 +76,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Left Wing Tank -->
@ -89,11 +89,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> -5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12147.00 </capacity>
<capacity unit="LBS"> 12155.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Center Tank -->
@ -102,11 +102,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 0 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 14601.44 </capacity>
<contents unit="LBS"> 40.88 </contents>
<capacity unit="LBS"> 14620.00 </capacity>
<contents unit="LBS"> 42 </contents>
<unusable-volume unit="LTR"> 23.20 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Inner Right Wing Tank -->
@ -115,11 +115,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 12147.00 </capacity>
<capacity unit="LBS"> 12155.90 </capacity>
<contents unit="LBS"> 6000.00 </contents>
<unusable-volume unit="LTR"> 11.70 </unusable-volume>
<unusable-volume unit="LTR"> 28.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Outer Right Wing Tank -->
@ -128,11 +128,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<y> 5.1104 </y>
<z> -0.61182 </z>
</location>
<capacity unit="LBS"> 1552.00 </capacity>
<contents unit="LBS"> 1552.00 </contents>
<unusable-volume unit="LTR"> 17.75 </unusable-volume>
<capacity unit="LBS"> 1523.00 </capacity>
<contents unit="LBS"> 1523.00 </contents>
<unusable-volume unit="LTR"> 4.0 </unusable-volume>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Engine 1 Pipes -->
@ -144,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- Engine 2 Pipes -->
<location unit="M">
@ -155,11 +155,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.67</density>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="fuel"/>
<system file="glass-effect1"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>

1
AircraftConfig/acconfig.nas
View file

@ -113,6 +113,7 @@ var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraf
var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/A320-family/AircraftConfig/update.xml");
var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/A320-family/AircraftConfig/updated.xml");
var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/A320-family/AircraftConfig/error-mismatch.xml");
var fuel_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fuel/dialog", "Aircraft/A320-family/AircraftConfig/fuel.xml");
var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/A320-family/AircraftConfig/groundservices.xml");
var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/A320-family/AircraftConfig/du-quality.xml");
var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/A320-family/AircraftConfig/rendering.xml");

160
AircraftConfig/fuel.xml Normal file
View file

@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->
<PropertyList>
<name>fuel-dlg</name>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Ground Services: Fuel</label>
</text>
<button>
<halign>right</halign>
<pref-width>20</pref-width>
<pref-height>20</pref-height>
<legend>X</legend>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>vbox</layout>
<checkbox>
<label>Enable Fuel Truck</label>
<halign>left</halign>
<enable>
<not><property>/services/fuel-truck/connect</property></not>
</enable>
<property>/services/fuel-truck/enable</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Connect Fuel Truck</label>
<halign>left</halign>
<enable>
<property>/services/fuel-truck/enable</property>
</enable>
<property>/services/fuel-truck/connect</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<hrule />
<group>
<layout>table</layout>
<text>
<label>Total Fuel Quantity (Lbs):</label>
<halign>right</halign>
<padding>2</padding>
<row>0</row>
<col>0</col>
</text>
<text>
<label>Requested Fuel Quantity (Lbs):</label>
<halign>right</halign>
<padding>2</padding>
<row>1</row>
<col>0</col>
</text>
<text>
<label>New Total Fuel Quantity (Lbs):</label>
<halign>right</halign>
<padding>2</padding>
<row>2</row>
<col>0</col>
</text>
<text>
<row>0</row>
<col>1</col>
<halign>left</halign>
<padding>2</padding>
<property>/consumables/fuel/total-fuel-lbs</property>
<live>true</live>
<format>%.1f</format>
</text>
<input>
<row>1</row>
<col>1</col>
<halign>left</halign>
<padding>1</padding>
<property>/services/fuel-truck/request-lbs</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<text>
<row>2</row>
<col>1</col>
<halign>left</halign>
<padding>2</padding>
<property>/services/fuel-truck/request-total-lbs</property>
<live>true</live>
<format>%.1f</format>
</text>
</group>
<hrule />
<group>
<layout>hbox</layout>
<button>
<legend>Refuel</legend>
<padding>2</padding>
<pref-width>80</pref-width>
<pref-height>24</pref-height>
<binding>
<command>nasal</command>
<script>
if ((getprop("/services/fuel-truck/enable") == 1) and (getprop("/services/fuel-truck/connect") == 1)) {
systems.fuelSvc.refuel();
screen.log.write("Refueling process started.", 0, 0.584, 1);
} else
screen.log.write("Please Enable and Connect the Fuel Truck First!", 1, 0, 0);
</script>
</binding>
</button>
<button>
<legend>Stop</legend>
<padding>2</padding>
<pref-width>80</pref-width>
<pref-height>24</pref-height>
<binding>
<command>nasal</command>
<script>
systems.fuelSvc.stop();
screen.log.write("Refueling process stopped.", 0, 0.584, 1);
</script>
</binding>
</button>
</group>
</group>
</PropertyList>

34
AircraftConfig/groundservices.xml
View file

@ -56,31 +56,21 @@
</binding>
</button>
<checkbox>
<label>Enable Fuel Truck</label>
<halign>left</halign>
<enable>
<not><property>/services/fuel-truck/connect</property></not>
</enable>
<property>/services/fuel-truck/enable</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<hrule />
<checkbox>
<label>Connect Fuel Truck</label>
<halign>left</halign>
<enable>
<property>/services/fuel-truck/enable</property>
</enable>
<property>/services/fuel-truck/connect</property>
<button>
<legend>Fuel Truck</legend>
<halign>center</halign>
<padding>5</padding>
<binding>
<command>dialog-apply</command>
<command>nasal</command>
<script>
acconfig.fuel_dlg.open();
</script>
</binding>
<live>true</live>
</checkbox>
</button>
<hrule />
<checkbox>
<label>Enable Catering Truck</label>

6
Models/Instruments/Lower-ECAM/Lower-ECAM.nas
View file

@ -222,9 +222,9 @@ var fadec2 = props.globals.getNode("/systems/fadec/powered2", 1);
var fuel_flow1 = props.globals.getNode("/engines/engine[0]/fuel-flow_actual", 1);
var fuel_flow2 = props.globals.getNode("/engines/engine[1]/fuel-flow_actual", 1);
var fuel_left_outer_temp = props.globals.getNode("/consumables/fuel/tank[0]/temperature_degC", 1);
var fuel_left_inner_temp = props.globals.getNode("/consumables/fuel/tank[0]/temperature_degC", 1);
var fuel_right_outer_temp = props.globals.getNode("/consumables/fuel/tank[1]/temperature_degC", 1);
var fuel_right_inner_temp = props.globals.getNode("/consumables/fuel/tank[1]/temperature_degC", 1);
var fuel_left_inner_temp = props.globals.getNode("/consumables/fuel/tank[1]/temperature_degC", 1);
var fuel_right_outer_temp = props.globals.getNode("/consumables/fuel/tank[3]/temperature_degC", 1);
var fuel_right_inner_temp = props.globals.getNode("/consumables/fuel/tank[4]/temperature_degC", 1);
var cutoff_switch1 = props.globals.getNode("/controls/engines/engine[0]/cutoff-switch", 1);
var cutoff_switch2 = props.globals.getNode("/controls/engines/engine[1]/cutoff-switch", 1);
var fuel_xfeed = props.globals.getNode("/controls/fuel/x-feed", 1);

9
Nasal/fuel.nas
View file

@ -8,6 +8,7 @@ var FUEL = {
offset2: 0,
timeEngStart: 0,
cmdCtrOn: props.globals.getNode("/systems/fuel/ctr-pump-cmd-on-eng-start"),
refuelling: props.globals.getNode("/systems/fuel/refuel/refuelling"),
Fail: {
},
@ -27,13 +28,21 @@ var FUEL = {
lpValve2: props.globals.getNode("/systems/fuel/valves/engine-2-lp-valve"),
transfer1: props.globals.getNode("/systems/fuel/valves/outer-inner-transfer-valve-1"),
transfer2: props.globals.getNode("/systems/fuel/valves/outer-inner-transfer-valve-2"),
refuelLeft: props.globals.getNode("/systems/fuel/refuel/left-valve"),
refuelCenter: props.globals.getNode("/systems/fuel/refuel/center-valve"),
refuelRight: props.globals.getNode("/systems/fuel/refuel/right-valve"),
},
Quantity: {
leftOuter: props.globals.getNode("/consumables/fuel/tank[0]/level-lbs"),
leftOuterPct: props.globals.getNode("/consumables/fuel/tank[0]/level-norm"),
leftInner: props.globals.getNode("/consumables/fuel/tank[1]/level-lbs"),
leftInnerPct: props.globals.getNode("/consumables/fuel/tank[1]/level-norm"),
center: props.globals.getNode("/consumables/fuel/tank[2]/level-lbs"),
centerPct: props.globals.getNode("/consumables/fuel/tank[2]/level-norm"),
rightInner: props.globals.getNode("/consumables/fuel/tank[3]/level-lbs"),
rightInnerPct: props.globals.getNode("/consumables/fuel/tank[3]/level-norm"),
rightOuter: props.globals.getNode("/consumables/fuel/tank[4]/level-lbs"),
rightOuterPct: props.globals.getNode("/consumables/fuel/tank[4]/level-norm"),
usedLeft: props.globals.getNode("/systems/fuel/fuel-used-1"),
usedRight: props.globals.getNode("/systems/fuel/fuel-used-2"),
},

4
Nasal/libraries.nas
View file

@ -270,10 +270,10 @@ var systemsLoop = maketimer(0.1, func {
setprop("/engines/ready", 0);
}
if ((getprop("/engines/engine[0]/state") == 2 or getprop("/engines/engine[0]/state") == 3) and getprop("/fdm/jsbsim/propulsion/tank[3]/contents-lbs") < 1) {
if ((getprop("/engines/engine[0]/state") == 2 or getprop("/engines/engine[0]/state") == 3) and getprop("/fdm/jsbsim/propulsion/tank[5]/contents-lbs") < 1) {
systems.cutoff_one();
}
if ((getprop("/engines/engine[1]/state") == 2 or getprop("/engines/engine[1]/state") == 3) and getprop("/fdm/jsbsim/propulsion/tank[4]/contents-lbs") < 1) {
if ((getprop("/engines/engine[1]/state") == 2 or getprop("/engines/engine[1]/state") == 3) and getprop("/fdm/jsbsim/propulsion/tank[6]/contents-lbs") < 1) {
systems.cutoff_two();
}

87
Nasal/payload.nas Normal file
View file

@ -0,0 +1,87 @@
# A32X Fuelling and Loading
# Jonathan Redpath
var fuelSvc = {
enable: props.globals.getNode("/services/fuel-truck/enable"),
connect: props.globals.getNode("/services/fuel-truck/connect"),
operate: props.globals.getNode("/services/fuel-truck/operate"),
Nodes: {
requestLbs: props.globals.getNode("/services/fuel-truck/request-lbs"),
requestTotalLbs: props.globals.getNode("/services/fuel-truck/request-total-lbs"),
},
newRequest: func() {
if (pts.Sim.aero.getValue() == "A320-200-CFM") {
me.Nodes.requestTotalLbs.setValue(math.max(math.min(pts.Consumables.Fuel.totalFuelLbs.getValue() + me.Nodes.requestLbs.getValue(), 42872), 0));
} elsif (pts.Sim.aero.getValue() == "A320-200-IAE" or pts.Sim.aero.getValue() == "A320-100-CFM") {
me.Nodes.requestTotalLbs.setValue(math.max(math.min(pts.Consumables.Fuel.totalFuelLbs.getValue() + me.Nodes.requestLbs.getValue(), 42214), 0));
} elsif (pts.Sim.aero.getValue() == "A320neo-CFM" or pts.Sim.aero.getValue() == "A320neo-PW") {
me.Nodes.requestTotalLbs.setValue(math.max(math.min(pts.Consumables.Fuel.totalFuelLbs.getValue() + me.Nodes.requestLbs.getValue(), 41977), 0));
}
},
refuel: func() {
if (me.operate.getBoolValue()) { return; }
if (me.enable.getValue() and me.connect.getValue()) {
me.operate.setBoolValue(1);
}
fuelTimer.start();
systems.FUEL.refuelling.setBoolValue(1);
systems.FUEL.Valves.refuelLeft.setBoolValue(1);
systems.FUEL.Valves.refuelRight.setBoolValue(1);
if (pts.Sim.aero.getValue() == "A320-200-CFM" and me.Nodes.requestTotalLbs.getValue() > 28229.9) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
} elsif ((pts.Sim.aero.getValue() == "A320-200-IAE" or pts.Sim.aero.getValue() == "A320-100-CFM") and me.Nodes.requestTotalLbs.getValue() > 27591.8) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
} elsif ((pts.Sim.aero.getValue() == "A320neo-CFM" or pts.Sim.aero.getValue() == "A320neo-PW") and me.Nodes.requestTotalLbs.getValue() > 27357.8) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
}
},
stop: func() {
systems.FUEL.refuelling.setBoolValue(0);
systems.FUEL.Valves.refuelLeft.setBoolValue(0);
systems.FUEL.Valves.refuelCenter.setBoolValue(0);
systems.FUEL.Valves.refuelRight.setBoolValue(0);
me.operate.setBoolValue(0);
},
};
setlistener("/services/fuel-truck/request-lbs", func() {
fuelSvc.newRequest();
}, 0, 0);
setlistener("/services/fuel-truck/enable", func() {
if (!fuelSvc.enable.getBoolValue()) {
fuelSvc.stop();
}
}, 0, 0);
setlistener("/services/fuel-truck/connect", func() {
if (!fuelSvc.connect.getBoolValue()) {
fuelSvc.stop();
}
}, 0, 0);
var fuelTimer = maketimer(0.25, func() {
if (systems.FUEL.Quantity.leftInnerPct.getValue() >= 0.999) {
systems.FUEL.Valves.refuelLeft.setBoolValue(0);
}
if (systems.FUEL.Quantity.centerPct.getValue() >= 0.999) {
systems.FUEL.Valves.refuelCenter.setBoolValue(0);
}
if (systems.FUEL.Quantity.rightInnerPct.getValue() >= 0.999) {
systems.FUEL.Valves.refuelRight.setBoolValue(0);
}
if (abs(pts.Consumables.Fuel.totalFuelLbs.getValue() - fuelSvc.Nodes.requestTotalLbs.getValue()) < 5) {
fuelSvc.stop();
fuelTimer.stop();
}
});

7
Nasal/property-tree-setup.nas
View file

@ -5,6 +5,12 @@
# Anything that says Temp is set by another file to avoid multiple getValue calls
# Usage Example: pts.Class.SubClass.node.getValue()
var Consumables = {
Fuel: {
totalFuelLbs: props.globals.getNode("/consumables/fuel/total-fuel-lbs"),
},
};
var Controls = {
Engines: {
Engine1: {
@ -81,6 +87,7 @@ var Position = {
};
var Sim = {
aero: props.globals.getNode("/sim/aero"),
Replay: {
replayActive: props.globals.getNode("/sim/replay/replay-state"),
},

183
Systems/a320-fuel.xml
View file

@ -61,16 +61,34 @@
/systems/electrical/bus/ac-2 ge 110
</test>
</switch>
<fcs_function name="/systems/fuel/internal/left-inner-tank-underfull-level">
<function>
<difference>
<property>/consumables/fuel/tank[1]/capacity-gal_us</property>
<value>106.197</value>
</difference>
</function>
</fcs_function>
<fcs_function name="/systems/fuel/internal/right-inner-tank-underfull-level">
<function>
<difference>
<property>/consumables/fuel/tank[3]/capacity-gal_us</property>
<value>106.197</value>
</difference>
</function>
</fcs_function>
<switch name="/systems/fuel/left-inner-full">
<default value="0"/>
<test logic="AND" value="1">
/systems/fuel/left-inner-full eq 1
propulsion/tank[1]/contents-lbs lt 11420
propulsion/tank[1]/contents-lbs ge 10300
/consumables/fuel/tank[1]/level-norm lt 0.999
/consumables/fuel/tank[1]/level-gal_us ge /systems/fuel/internal/left-inner-tank-underfull-level
</test>
<test value="1">
propulsion/tank[1]/contents-lbs eq 11420
/consumables/fuel/tank[1]/level-norm gt 0.999
</test>
</switch>
@ -78,11 +96,11 @@
<default value="0"/>
<test logic="AND" value="1">
/systems/fuel/right-inner-full eq 1
propulsion/tank[3]/contents-lbs lt 11420
propulsion/tank[3]/contents-lbs ge 10300
/consumables/fuel/tank[3]/level-norm lt 0.999
/consumables/fuel/tank[3]/level-gal_us ge /systems/fuel/internal/right-inner-tank-underfull-level
</test>
<test value="1">
propulsion/tank[3]/contents-lbs eq 11420
/consumables/fuel/tank[3]/level-norm gt 0.999
</test>
</switch>
@ -92,12 +110,14 @@
/controls/fuel/switches/pump-center-1 eq 1
<test logic="OR">
/controls/fuel/switches/center-mode eq 0
<test logic="OR">
<test logic="AND">
/systems/fuel/pumps/center-control-low-level ne 1
/systems/fuel/ctr-pump-cmd-on-eng-start eq 1
<test logic="AND">
fcs/slat-pos-deg lt 16
/systems/fuel/left-inner-full ne 1
<test logic="OR">
/systems/fuel/ctr-pump-cmd-on-eng-start eq 1
<test logic="AND">
fcs/slat-pos-deg lt 16
/systems/fuel/left-inner-full ne 1
</test>
</test>
</test>
</test>
@ -111,13 +131,14 @@
/controls/fuel/switches/pump-center-2 eq 1
<test logic="OR">
/controls/fuel/switches/center-mode eq 0
<test logic="OR">
<test logic="AND">
/systems/fuel/pumps/center-control-low-level ne 1
/systems/fuel/ctr-pump-cmd-on-eng-start eq 1
<test logic="AND">
fcs/slat-pos-deg lt 16
/systems/fuel/pumps/center-control-low-level ne 1
/systems/fuel/right-inner-full ne 1
<test logic="OR">
/systems/fuel/ctr-pump-cmd-on-eng-start eq 1
<test logic="AND">
fcs/slat-pos-deg lt 16
/systems/fuel/left-inner-full ne 1
</test>
</test>
</test>
</test>
@ -172,9 +193,12 @@
/systems/fuel/valves/outer-inner-transfer-valve-1-cmd eq 1
/systems/fuel/refuel/refuelling eq 0
</test>
<test logic="OR" value="1">
/systems/fuel/quantity/left-wing-inner-low eq 1
/systems/fuel/quantity/right-wing-inner-low eq 1
<test logic="AND" value="1">
<test logic="OR">
/systems/fuel/quantity/left-wing-inner-low eq 1
/systems/fuel/quantity/right-wing-inner-low eq 1
</test>
/systems/fuel/refuel/refuelling eq 0
</test>
</switch>
@ -196,9 +220,12 @@
/systems/fuel/valves/outer-inner-transfer-valve-2-cmd eq 1
/systems/fuel/refuel/refuelling eq 0
</test>
<test logic="OR" value="1">
/systems/fuel/quantity/left-wing-inner-low eq 1
/systems/fuel/quantity/right-wing-inner-low eq 1
<test logic="AND" value="1">
<test logic="OR">
/systems/fuel/quantity/left-wing-inner-low eq 1
/systems/fuel/quantity/right-wing-inner-low eq 1
</test>
/systems/fuel/refuel/refuelling eq 0
</test>
</switch>
@ -387,6 +414,13 @@
/systems/fuel/pumps/wing-pump-left-1-operate eq 1
/systems/fuel/pumps/wing-pump-left-2-operate eq 1
</test>
<test logic="AND" value="0"> <!-- crossfeeding overrides gravity feed -->
/systems/fuel/valves/crossfeed-valve eq 1
<test logic="OR">
/systems/fuel/pumps/wing-pump-right-1-operate eq 1
/systems/fuel/pumps/wing-pump-right-2-operate eq 1
</test>
</test>
<test logic="AND" value="1"> <!-- Suction/Gravity feed if G is not to far below 1 -->
/accelerations/pilot-gdamped ge 0.5
</test>
@ -398,6 +432,13 @@
/systems/fuel/pumps/wing-pump-right-1-operate eq 1
/systems/fuel/pumps/wing-pump-right-2-operate eq 1
</test>
<test logic="AND" value="0"> <!-- crossfeeding overrides gravity feed -->
/systems/fuel/valves/crossfeed-valve eq 1
<test logic="OR">
/systems/fuel/pumps/wing-pump-left-1-operate eq 1
/systems/fuel/pumps/wing-pump-left-2-operate eq 1
</test>
</test>
<test logic="AND" value="1"> <!-- Suction/Gravity feed if G is not to far below 1 -->
/accelerations/pilot-gdamped ge 0.5
</test>
@ -417,6 +458,81 @@
</test>
</switch>
<!-- Refuel system -->
<switch name="/systems/fuel/internal/left-outer-wing-tank-refuel">
<default value="0"/>
<test logic="AND" value="16.615">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/left-valve eq 1
/systems/fuel/refuel/center-valve eq 0
</test>
<test logic="AND" value="11.076">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/left-valve eq 1
/systems/fuel/refuel/center-valve eq 1
</test>
</switch>
<switch name="/systems/fuel/internal/left-inner-wing-tank-refuel">
<default value="0"/>
<test logic="AND" value="/systems/fuel/internal/left-outer-wing-tank-refuel">
/systems/fuel/refuel/refuelling eq 1
propulsion/tank[0]/pct-full ge 99.9
</test>
</switch>
<switch name="/systems/fuel/internal/center-tank-refuel">
<default value="0"/>
<test logic="AND" value="33.230">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/right-valve eq 0
/systems/fuel/refuel/center-valve eq 1
</test>
<test logic="AND" value="16.615">
/systems/fuel/refuel/refuelling eq 1
<test logic="OR">
<test logic="AND">
/systems/fuel/refuel/left-valve eq 1
/systems/fuel/refuel/right-valve eq 0
</test>
<test logic="AND">
/systems/fuel/refuel/left-valve eq 0
/systems/fuel/refuel/right-valve eq 1
</test>
</test>
/systems/fuel/refuel/center-valve eq 1
</test>
<test logic="AND" value="11.076">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/left-valve eq 1
/systems/fuel/refuel/right-valve eq 1
/systems/fuel/refuel/center-valve eq 1
</test>
</switch>
<switch name="/systems/fuel/internal/right-outer-wing-tank-refuel">
<default value="0"/>
<test logic="AND" value="16.615">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/right-valve eq 1
/systems/fuel/refuel/center-valve eq 0
</test>
<test logic="AND" value="11.076">
/systems/fuel/refuel/refuelling eq 1
/systems/fuel/refuel/right-valve eq 1
/systems/fuel/refuel/center-valve eq 1
</test>
</switch>
<switch name="/systems/fuel/internal/right-inner-wing-tank-refuel">
<default value="0"/>
<test logic="AND" value="/systems/fuel/internal/right-outer-wing-tank-refuel">
/systems/fuel/refuel/refuelling eq 1
propulsion/tank[4]/pct-full ge 99.9
</test>
</switch>
<!-- Feed system -->
<switch name="/systems/fuel/internal/left-wing-tank-eng-1">
<default value="0"/>
<test logic="AND" value="9">
@ -425,7 +541,7 @@
/systems/fuel/feed-center-1 eq 0
</test>
/systems/fuel/feed-left-inner eq 1
propulsion/tank[1]/contents-lbs gt 31.24
/consumables/fuel/tank[1]/level-gal_us gt /consumables/fuel/tank[1]/unusable-gal_us
propulsion/tank[5]/contents-lbs lt 9
</test>
</switch>
@ -440,7 +556,7 @@
/systems/fuel/valves/crossfeed-valve eq 1
</test>
</test>
propulsion/tank[3]/contents-lbs gt 31.24
/consumables/fuel/tank[2]/level-gal_us gt /consumables/fuel/tank[2]/unusable-gal_us
propulsion/tank[5]/contents-lbs lt 9
</test>
</switch>
@ -454,7 +570,7 @@
/systems/fuel/feed-center-2 eq 0
</test>
/systems/fuel/valves/crossfeed-valve eq 1
propulsion/tank[3]/contents-lbs gt 31.24
/consumables/fuel/tank[3]/level-gal_us gt /consumables/fuel/tank[3]/unusable-gal_us
propulsion/tank[5]/contents-lbs lt 9
</test>
</switch>
@ -468,7 +584,7 @@
/systems/fuel/feed-center-1 eq 0
</test>
/systems/fuel/feed-left-inner eq 1
propulsion/tank[1]/contents-lbs gt 31.24
/consumables/fuel/tank[1]/level-gal_us gt /consumables/fuel/tank[1]/unusable-gal_us
propulsion/tank[6]/contents-lbs lt 9
</test>
</switch>
@ -483,7 +599,7 @@
/systems/fuel/valves/crossfeed-valve eq 1
</test>
</test>
propulsion/tank[3]/contents-lbs gt 31.24
/consumables/fuel/tank[2]/level-gal_us gt /consumables/fuel/tank[2]/unusable-gal_us
propulsion/tank[6]/contents-lbs lt 9
</test>
</switch>
@ -496,7 +612,7 @@
/systems/fuel/feed-center-2 eq 0
</test>
/systems/fuel/feed-right-inner eq 1
propulsion/tank[3]/contents-lbs gt 31.24
/consumables/fuel/tank[3]/level-gal_us gt /consumables/fuel/tank[3]/unusable-gal_us
propulsion/tank[6]/contents-lbs lt 9
</test>
</switch>
@ -506,6 +622,8 @@
<test logic="AND" value="9">
/systems/fuel/valves/outer-inner-transfer-valve-1 eq 1
/accelerations/pilot-gdamped ge 0.5
/consumables/fuel/tank[0]/level-gal_us gt /consumables/fuel/tank[0]/unusable-gal_us
/consumables/fuel/tank[1]/level-norm lt 0.999
</test>
</switch>
@ -514,22 +632,27 @@
<test logic="AND" value="9">
/systems/fuel/valves/outer-inner-transfer-valve-2 eq 1
/accelerations/pilot-gdamped ge 0.5
/consumables/fuel/tank[4]/level-gal_us gt /consumables/fuel/tank[4]/unusable-gal_us
/consumables/fuel/tank[3]/level-norm lt 0.999
</test>
</switch>
<summer name="/systems/fuel/internal/left-outer-flow-rate">
<input>/systems/fuel/internal/left-outer-wing-tank-refuel</input>
<input>-/systems/fuel/internal/left-wing-outer-to-inner-tank</input>
<output>propulsion/tank[0]/external-flow-rate-pps</output>
</summer>
<summer name="/systems/fuel/internal/left-inner-flow-rate">
<input>/systems/fuel/internal/left-wing-outer-to-inner-tank</input>
<input>/systems/fuel/internal/left-inner-wing-tank-refuel</input>
<input>-/systems/fuel/internal/left-wing-tank-eng-1</input>
<input>-/systems/fuel/internal/left-wing-tank-eng-2</input>
<output>propulsion/tank[1]/external-flow-rate-pps</output>
</summer>
<summer name="/systems/fuel/internal/center-flow-rate">
<input>/systems/fuel/internal/center-tank-refuel</input>
<input>-/systems/fuel/internal/center-tank-eng-1</input>
<input>-/systems/fuel/internal/center-tank-eng-2</input>
<output>propulsion/tank[2]/external-flow-rate-pps</output>
@ -537,12 +660,14 @@
<summer name="/systems/fuel/internal/right-inner-flow-rate">
<input>/systems/fuel/internal/right-wing-outer-to-inner-tank</input>
<input>/systems/fuel/internal/right-inner-wing-tank-refuel</input>
<input>-/systems/fuel/internal/right-wing-tank-eng-1</input>
<input>-/systems/fuel/internal/right-wing-tank-eng-2</input>
<output>propulsion/tank[3]/external-flow-rate-pps</output>
</summer>
<summer name="/systems/fuel/internal/right-outer-flow-rate">
<input>/systems/fuel/internal/right-outer-wing-tank-refuel</input>
<input>-/systems/fuel/internal/right-wing-outer-to-inner-tank</input>
<output>propulsion/tank[4]/external-flow-rate-pps</output>
</summer>

113
Systems/fuel.xml
View file

@ -1,113 +0,0 @@
<?xml version="1.0"?>
<!-- A3XX Fuel System -->
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<system name="fuel">
<channel name="Fuel to Engine 1 Pipes">
<switch name="fuel/from-tank0-to-tank3">
<default value="0"/>
<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 9
</test>
</switch>
<switch name="fuel/from-tank1-to-tank3">
<default value="0"/>
<test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs gt 0
propulsion/tank[3]/contents-lbs lt 9
</test>
</switch>
<switch name="fuel/from-tank2-to-tank3">
<default value="0"/>
<test logic="AND" value="9">
/systems/fuel/valves/crossfeed-valve == 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 9
</test>
</switch>
</channel>
<channel name="Fuel to Engine 2 Pipes">
<switch name="fuel/from-tank2-to-tank4">
<default value="0"/>
<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 9
</test>
</switch>
<switch name="fuel/from-tank1-to-tank4">
<default value="0"/>
<test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs gt 0
propulsion/tank[4]/contents-lbs lt 9
</test>
</switch>
<switch name="fuel/from-tank0-to-tank4">
<default value="0"/>
<test logic="AND" value="9">
/systems/fuel/valves/crossfeed-valve == 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 9
</test>
</switch>
</channel>
<channel name="Engine 1 Pipes">
<summer name="tank0 tank1 tank 2 to tank3">
<input>fuel/from-tank0-to-tank3</input>
<input>fuel/from-tank1-to-tank3</input>
<input>fuel/from-tank2-to-tank3</input>
<output>propulsion/tank[3]/external-flow-rate-pps</output>
</summer>
</channel>
<channel name="Engine 2 Pipes">
<summer name="tank0 tank1 tank 2 to tank4">
<input>fuel/from-tank2-to-tank4</input>
<input>fuel/from-tank1-to-tank4</input>
<input>fuel/from-tank0-to-tank4</input>
<output>propulsion/tank[4]/external-flow-rate-pps</output>
</summer>
</channel>
<channel name="Total PPS">
<summer name="fuel/tank0-flow-rate">
<input>-fuel/from-tank0-to-tank3</input>
<input>-fuel/from-tank0-to-tank4</input>
<output>propulsion/tank[0]/external-flow-rate-pps</output>
</summer>
<summer name="fuel/tank1-flow-rate">
<input>-fuel/from-tank1-to-tank3</input>
<input>-fuel/from-tank1-to-tank4</input>
<output>propulsion/tank[1]/external-flow-rate-pps</output>
</summer>
<summer name="fuel/tank2-flow-rate">
<input>-fuel/from-tank2-to-tank4</input>
<input>-fuel/from-tank2-to-tank3</input>
<output>propulsion/tank[2]/external-flow-rate-pps</output>
</summer>
</channel>
</system>

2
revision.txt
View file

@ -1 +1 @@
8
9