From e711e2701bae155369ba19cb285e7630c9579b29 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 22 Sep 2017 21:56:44 -0400 Subject: [PATCH] A32X: New Fuel System --- A318-100-CFM.xml | 163 ++++++----------- A319-100-CFM.xml | 163 ++++++----------- A319-100-IAE.xml | 163 ++++++----------- A320-100-CFM.xml | 161 ++++++----------- A320-200-CFM.xml | 169 +++++------------- A320-200-IAE.xml | 161 ++++++----------- A320-main.xml | 44 ++--- A320neo-CFM.xml | 161 ++++++----------- A320neo-PW.xml | 161 ++++++----------- A321-200-CFM.xml | 161 ++++++----------- A321-200-IAE.xml | 161 ++++++----------- A321neo-CFM.xml | 161 ++++++----------- A321neo-PW.xml | 161 ++++++----------- AircraftConfig/acconfig.nas | 24 +-- AircraftConfig/fail.xml | 12 +- Models/Instruments/OHpanel/OHpanel.xml | 48 ++--- Nasal/fuel.nas | 186 ++++++++++---------- Systems/fuel.xml | 231 ++++++++----------------- 18 files changed, 868 insertions(+), 1623 deletions(-) diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml index 38f59580..644f37d6 100644 --- a/A318-100-CFM.xml +++ b/A318-100-CFM.xml @@ -400,169 +400,116 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 -47.0 14281 - 0 + 0 43 1 JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml index c1d02966..68452383 100644 --- a/A319-100-CFM.xml +++ b/A319-100-CFM.xml @@ -400,169 +400,116 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 -47.0 14281 - 0 + 0 43 1 JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml index 57617ba3..6312add7 100644 --- a/A319-100-IAE.xml +++ b/A319-100-IAE.xml @@ -400,169 +400,116 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 -47.0 14281 - 0 + 0 43 1 JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 62ad9035..cb3e060a 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 10af2fd6..0349da6f 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -400,7 +400,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - 620.0683 @@ -412,7 +411,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 7 + 3 655.4820 @@ -438,7 +437,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 8 + 4 655.4820 @@ -453,138 +452,64 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - - 0 - - 4 - JET-A1 - 50 - - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - - 1520 - - 21 - - 2 - JET-A1 - 50 - - - - - 652.5591 - -236.2992 - -33.9470 - - 11982 - - 4480 - 31 - - 3 - JET-A1 - 50 - - - - - 522.0473 - 0 - -47.0 - - 14281 - - 0 - - 43 - - 1 - JET-A1 - 50 - - - - - 652.5591 - 236.2992 - -33.9470 - - 11982 - - 4480 - 31 - - 3 - JET-A1 - 50 - - - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - - 1520 - - 21 - - 2 - JET-A1 - 50 - - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - - 0 - 4 - JET-A1 - 50 - - + + + 652.5591 + -236.2992 + -33.9470 + + 13914 + 6000 + 31 + 1 + JET-A1 + 50 + + + + 522.0473 + 0 + -47.0 + + 14281 + 0 + 43 + 1 + JET-A1 + 50 + + + + 652.5591 + 236.2992 + -33.9470 + + 13914 + 6000 + 31 + 1 + JET-A1 + 50 + + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index b3254e10..632e8576 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 0 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 0 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A320-main.xml b/A320-main.xml index 027297a7..9bda2aa7 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -353,31 +353,19 @@ - Left Wing Surge + Left Wing - Left Wing Outer - - - Left Wing Inner - - Center + + Right Wing + + + Engine 1 Pipes + - Right Wing Inner - - - Right Wing Outer - - - Right Wing Surge - - - Left Pipes - - - Right Pipes + Engine 2 Pipes @@ -698,18 +686,18 @@ 0 + + 0 + 0 + + + 0 + 0 + 0 0 - - 0 - 0 - - - 0 - 0 - 0 diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index c1dc6844..a3492a72 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A320neo-PW.xml b/A320neo-PW.xml index 7599f1b5..15e73ad7 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml index 13d6b84e..054f41a2 100644 --- a/A321-200-CFM.xml +++ b/A321-200-CFM.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml index eae5bc31..d9dbd97d 100644 --- a/A321-200-IAE.xml +++ b/A321-200-IAE.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml index 9b140eca..edf85f67 100644 --- a/A321neo-CFM.xml +++ b/A321neo-CFM.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/A321neo-PW.xml b/A321neo-PW.xml index 917dde3e..13eb4c3c 100644 --- a/A321neo-PW.xml +++ b/A321neo-PW.xml @@ -400,100 +400,72 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - 620.0683 - -226.575 - -45.567 - - - 0.0 - 2.2 - 1 - - 7 - - 655.4820 - -226.575 - 0.000 + 620.0683 + -226.575 + -45.567 - 0.0 - 2.2 - 1 + 0.0 + 2.2 + 1 - + 3 + + + 655.4820 + -226.575 + 0.000 + + + 0.0 + 2.2 + 1 + + - - 620.0683 - 226.575 - -45.567 - - - 0.0 - 2.2 - -1 - - 8 - - 655.4820 - 226.575 - 0.000 + 620.0683 + 226.575 + -45.567 - 0.0 - 2.2 - -1 + 0.0 + 2.2 + -1 - + 4 + + + 655.4820 + 226.575 + 0.000 + + + 0.0 + 2.2 + -1 + + - - - - 783.0709 - -574.4148 - 3.1080 - - 412 - 0 - - 4 - JET-A1 - 50 - - - - 739.5669 - -457.4259 - -8.0898 - - 1520.00 - 1520 - 21 - 2 - JET-A1 - 50 - - + 652.5591 -236.2992 -33.9470 - 11982 - 4480 + 13914 + 6000 31 - 3 + 1 JET-A1 50 - + 522.0473 0 @@ -506,63 +478,38 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> JET-A1 50 - + 652.5591 236.2992 -33.9470 - 11982 - 4480 - 31 - 3 + 13914 + 6000 + 31 + 1 JET-A1 50 - - - 739.5669 - 457.4259 - -8.0898 - - 1520 - 1520 - 21 - 2 - JET-A1 - 50 - - - - 783.0709 - 574.4148 - 3.1080 - - 412 - 0 - 4 - JET-A1 - 50 - - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 - + 589.735 0 -45.567 - 100 - 0 + 1.00 + 0.00 1 JET-A1 diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 6defbc4c..14470004 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -66,12 +66,12 @@ var failReset = func { setprop("/systems/failures/pump-green", 0); setprop("/systems/failures/pump-yellow-eng", 0); setprop("/systems/failures/pump-yellow-elec", 0); + setprop("/systems/failures/tank0pump1", 0); + setprop("/systems/failures/tank0pump2", 0); + setprop("/systems/failures/tank1pump1", 0); + setprop("/systems/failures/tank1pump2", 0); setprop("/systems/failures/tank2pump1", 0); setprop("/systems/failures/tank2pump2", 0); - setprop("/systems/failures/tank3pump1", 0); - setprop("/systems/failures/tank3pump2", 0); - setprop("/systems/failures/tank4pump1", 0); - setprop("/systems/failures/tank4pump2", 0); setprop("/systems/failures/fuelmode", 0); setprop("/systems/failures/cargo-aft-fire", 0); setprop("/systems/failures/cargo-fwd-fire", 0); @@ -256,12 +256,12 @@ var beforestart = func { } var beforestart_b = func { # Continue with engine start prep. + setprop("/controls/fuel/tank0pump1", 1); + setprop("/controls/fuel/tank0pump2", 1); + setprop("/controls/fuel/tank1pump1", 1); + setprop("/controls/fuel/tank1pump2", 1); setprop("/controls/fuel/tank2pump1", 1); setprop("/controls/fuel/tank2pump2", 1); - setprop("/controls/fuel/tank3pump1", 1); - setprop("/controls/fuel/tank3pump2", 1); - setprop("/controls/fuel/tank4pump1", 1); - setprop("/controls/fuel/tank4pump2", 1); setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/gen1", 1); @@ -331,12 +331,12 @@ var taxi = func { } var taxi_b = func { # Continue with engine start prep, and start engine 2. + setprop("/controls/fuel/tank0pump1", 1); + setprop("/controls/fuel/tank0pump2", 1); + setprop("/controls/fuel/tank1pump1", 1); + setprop("/controls/fuel/tank1pump2", 1); setprop("/controls/fuel/tank2pump1", 1); setprop("/controls/fuel/tank2pump2", 1); - setprop("/controls/fuel/tank3pump1", 1); - setprop("/controls/fuel/tank3pump2", 1); - setprop("/controls/fuel/tank4pump1", 1); - setprop("/controls/fuel/tank4pump2", 1); setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/gen1", 1); diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index cd4a34ec..ca52e330 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -402,7 +402,7 @@ left - /systems/failures/tank2pump1 + /systems/failures/tank0pump1 dialog-apply @@ -412,7 +412,7 @@ left - /systems/failures/tank2pump2 + /systems/failures/tank0pump2 dialog-apply @@ -422,7 +422,7 @@ left - /systems/failures/tank3pump1 + /systems/failures/tank1pump1 dialog-apply @@ -432,7 +432,7 @@ left - /systems/failures/tank3pump2 + /systems/failures/tank1pump2 dialog-apply @@ -442,7 +442,7 @@ left - /systems/failures/tank4pump1 + /systems/failures/tank2pump1 dialog-apply @@ -452,7 +452,7 @@ left - /systems/failures/tank4pump2 + /systems/failures/tank2pump2 dialog-apply diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 40665e5c..d739d4e6 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -2398,7 +2398,7 @@ property-toggle - controls/fuel/tank2pump1 + controls/fuel/tank0pump1 nasal @@ -2414,11 +2414,11 @@ - systems/fuel/tank2pump1-fault + systems/fuel/tank0pump1-fault 1 - controls/fuel/tank2pump1 + controls/fuel/tank0pump1 1 @@ -2435,7 +2435,7 @@ - controls/fuel/tank2pump1 + controls/fuel/tank0pump1 0 @@ -2469,7 +2469,7 @@ property-toggle - controls/fuel/tank2pump2 + controls/fuel/tank0pump2 nasal @@ -2485,11 +2485,11 @@ - systems/fuel/tank2pump2-fault + systems/fuel/tank0pump2-fault 1 - controls/fuel/tank2pump2 + controls/fuel/tank0pump2 1 @@ -2506,7 +2506,7 @@ - controls/fuel/tank2pump2 + controls/fuel/tank0pump2 0 @@ -2540,7 +2540,7 @@ property-toggle - controls/fuel/tank3pump1 + controls/fuel/tank1pump1 nasal @@ -2556,11 +2556,11 @@ - systems/fuel/tank3pump1-fault + systems/fuel/tank1pump1-fault 1 - controls/fuel/tank3pump1 + controls/fuel/tank1pump1 1 @@ -2577,7 +2577,7 @@ - controls/fuel/tank3pump1 + controls/fuel/tank1pump1 0 @@ -2681,7 +2681,7 @@ property-toggle - controls/fuel/tank3pump2 + controls/fuel/tank1pump2 nasal @@ -2697,11 +2697,11 @@ - systems/fuel/tank3pump2-fault + systems/fuel/tank1pump2-fault 1 - controls/fuel/tank3pump2 + controls/fuel/tank1pump2 1 @@ -2718,7 +2718,7 @@ - controls/fuel/tank3pump2 + controls/fuel/tank1pump2 0 @@ -2752,7 +2752,7 @@ property-toggle - controls/fuel/tank4pump1 + controls/fuel/tank2pump1 nasal @@ -2768,11 +2768,11 @@ - systems/fuel/tank4pump1-fault + systems/fuel/tank2pump1-fault 1 - controls/fuel/tank4pump1 + controls/fuel/tank2pump1 1 @@ -2789,7 +2789,7 @@ - controls/fuel/tank4pump1 + controls/fuel/tank2pump1 0 @@ -2823,7 +2823,7 @@ property-toggle - controls/fuel/tank4pump2 + controls/fuel/tank2pump2 nasal @@ -2839,11 +2839,11 @@ - systems/fuel/tank4pump2-fault + systems/fuel/tank2pump2-fault 1 - controls/fuel/tank4pump2 + controls/fuel/tank2pump2 1 @@ -2860,7 +2860,7 @@ - controls/fuel/tank4pump2 + controls/fuel/tank2pump2 0 diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas index 29f21bdb..e2790c3e 100644 --- a/Nasal/fuel.nas +++ b/Nasal/fuel.nas @@ -11,12 +11,12 @@ setlistener("/sim/signals/fdm-initialized", func { var xfeed_sw = getprop("/controls/fuel/x-feed"); + var tank0pump1_sw = getprop("/controls/fuel/tank0pump1"); + var tank0pump2_sw = getprop("/controls/fuel/tank0pump2"); + var tank1pump1_sw = getprop("/controls/fuel/tank1pump1"); + var tank1pump2_sw = getprop("/controls/fuel/tank1pump2"); var tank2pump1_sw = getprop("/controls/fuel/tank2pump1"); var tank2pump2_sw = getprop("/controls/fuel/tank2pump2"); - var tank3pump1_sw = getprop("/controls/fuel/tank3pump1"); - var tank3pump2_sw = getprop("/controls/fuel/tank3pump2"); - var tank4pump1_sw = getprop("/controls/fuel/tank4pump1"); - var tank4pump2_sw = getprop("/controls/fuel/tank4pump2"); var mode_sw = getprop("/controls/fuel/mode"); var xfeed = getprop("/systems/fuel/x-feed"); var ac1 = getprop("/systems/electrical/bus/ac1"); @@ -26,20 +26,20 @@ setlistener("/sim/signals/fdm-initialized", func { var gload = getprop("/accelerations/pilot-gdamped"); var gravityfeedL_output = getprop("/systems/fuel/gravityfeedL-output"); var gravityfeedR_output = getprop("/systems/fuel/gravityfeedR-output"); + var tank0feed0 = getprop("/systems/fuel/tank[0]/feed0"); + var tank0feed1 = getprop("/systems/fuel/tank[0]/feed1"); + var tank1feed0 = getprop("/systems/fuel/tank[1]/feed0"); + var tank1feed1 = getprop("/systems/fuel/tank[1]/feed1"); var tank2feed0 = getprop("/systems/fuel/tank[2]/feed0"); var tank2feed1 = getprop("/systems/fuel/tank[2]/feed1"); - var tank3feed0 = getprop("/systems/fuel/tank[3]/feed0"); - var tank3feed1 = getprop("/systems/fuel/tank[3]/feed1"); - var tank4feed0 = getprop("/systems/fuel/tank[4]/feed0"); - var tank4feed1 = getprop("/systems/fuel/tank[4]/feed1"); var gravityfeedL = getprop("/systems/fuel/gravityfeedL"); var gravityfeedR = getprop("/systems/fuel/gravityfeedR"); + var tank0pump1_fail = getprop("/systems/failures/tank0pump1"); + var tank0pump2_fail = getprop("/systems/failures/tank0pump2"); + var tank1pump1_fail = getprop("/systems/failures/tank1pump1"); + var tank1pump2_fail = getprop("/systems/failures/tank1pump2"); var tank2pump1_fail = getprop("/systems/failures/tank2pump1"); var tank2pump2_fail = getprop("/systems/failures/tank2pump2"); - var tank3pump1_fail = getprop("/systems/failures/tank3pump1"); - var tank3pump2_fail = getprop("/systems/failures/tank3pump2"); - var tank4pump1_fail = getprop("/systems/failures/tank4pump1"); - var tank4pump2_fail = getprop("/systems/failures/tank4pump2"); }); var fuel_init = func { @@ -48,27 +48,27 @@ var fuel_init = func { setprop("/systems/fuel/gravityfeedL-output", 0); setprop("/systems/fuel/gravityfeedR-output", 0); setprop("/controls/fuel/x-feed", 0); + setprop("/controls/fuel/tank0pump1", 0); + setprop("/controls/fuel/tank0pump2", 0); + setprop("/controls/fuel/tank1pump1", 0); + setprop("/controls/fuel/tank1pump2", 0); setprop("/controls/fuel/tank2pump1", 0); setprop("/controls/fuel/tank2pump2", 0); - setprop("/controls/fuel/tank3pump1", 0); - setprop("/controls/fuel/tank3pump2", 0); - setprop("/controls/fuel/tank4pump1", 0); - setprop("/controls/fuel/tank4pump2", 0); setprop("/controls/fuel/mode", 1); setprop("/systems/fuel/x-feed", 0); + setprop("/systems/fuel/tank[0]/feed0", 0); + setprop("/systems/fuel/tank[0]/feed1", 0); + setprop("/systems/fuel/tank[1]/feed0", 0); + setprop("/systems/fuel/tank[1]/feed1", 0); setprop("/systems/fuel/tank[2]/feed0", 0); setprop("/systems/fuel/tank[2]/feed1", 0); - setprop("/systems/fuel/tank[3]/feed0", 0); - setprop("/systems/fuel/tank[3]/feed1", 0); - setprop("/systems/fuel/tank[4]/feed0", 0); - setprop("/systems/fuel/tank[4]/feed1", 0); setprop("/systems/fuel/only-use-ctr-tank", 0); + setprop("/systems/fuel/tank0pump1-fault", 0); + setprop("/systems/fuel/tank0pump2-fault", 0); + setprop("/systems/fuel/tank1pump1-fault", 0); + setprop("/systems/fuel/tank1pump2-fault", 0); setprop("/systems/fuel/tank2pump1-fault", 0); setprop("/systems/fuel/tank2pump2-fault", 0); - setprop("/systems/fuel/tank3pump1-fault", 0); - setprop("/systems/fuel/tank3pump2-fault", 0); - setprop("/systems/fuel/tank4pump1-fault", 0); - setprop("/systems/fuel/tank4pump2-fault", 0); setprop("/systems/fuel/mode-fault", 0); fuel_timer.start(); } @@ -78,12 +78,12 @@ var fuel_init = func { ############## var master_fuel = func { xfeed_sw = getprop("/controls/fuel/x-feed"); + tank0pump1_sw = getprop("/controls/fuel/tank0pump1"); + tank0pump2_sw = getprop("/controls/fuel/tank0pump2"); + tank1pump1_sw = getprop("/controls/fuel/tank1pump1"); + tank1pump2_sw = getprop("/controls/fuel/tank1pump2"); tank2pump1_sw = getprop("/controls/fuel/tank2pump1"); tank2pump2_sw = getprop("/controls/fuel/tank2pump2"); - tank3pump1_sw = getprop("/controls/fuel/tank3pump1"); - tank3pump2_sw = getprop("/controls/fuel/tank3pump2"); - tank4pump1_sw = getprop("/controls/fuel/tank4pump1"); - tank4pump2_sw = getprop("/controls/fuel/tank4pump2"); mode_sw = getprop("/controls/fuel/mode"); xfeed = getprop("/systems/fuel/x-feed"); ac1 = getprop("/systems/electrical/bus/ac1"); @@ -91,12 +91,12 @@ var master_fuel = func { gravityfeedL = getprop("/systems/fuel/gravityfeedL"); gravityfeedR = getprop("/systems/fuel/gravityfeedR"); gload = getprop("/accelerations/pilot-gdamped"); + tank0pump1_fail = getprop("/systems/failures/tank0pump1"); + tank0pump2_fail = getprop("/systems/failures/tank0pump2"); + tank1pump1_fail = getprop("/systems/failures/tank1pump1"); + tank1pump2_fail = getprop("/systems/failures/tank1pump2"); tank2pump1_fail = getprop("/systems/failures/tank2pump1"); tank2pump2_fail = getprop("/systems/failures/tank2pump2"); - tank3pump1_fail = getprop("/systems/failures/tank3pump1"); - tank3pump2_fail = getprop("/systems/failures/tank3pump2"); - tank4pump1_fail = getprop("/systems/failures/tank4pump1"); - tank4pump2_fail = getprop("/systems/failures/tank4pump2"); if (gload >= 0.7 and gravityfeedL) { setprop("/systems/fuel/gravityfeedL-output", 1); @@ -113,9 +113,37 @@ var master_fuel = func { gravityfeedL_output = getprop("/systems/fuel/gravityfeedL-output"); gravityfeedR_output = getprop("/systems/fuel/gravityfeedR-output"); + if ((ac1 >= 110 or ac2 >= 110) and tank0pump1_sw and !tank0pump1_fail) { + setprop("/systems/fuel/tank[0]/feed0", 1); + } else if (gravityfeedL_output) { + setprop("/systems/fuel/tank[0]/feed0", 1); + } else { + setprop("/systems/fuel/tank[0]/feed0", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank0pump2_sw and !tank0pump2_fail) { + setprop("/systems/fuel/tank[0]/feed1", 1); + } else if (gravityfeedL_output) { + setprop("/systems/fuel/tank[0]/feed1", 1); + } else { + setprop("/systems/fuel/tank[0]/feed1", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank1pump1_sw and !tank1pump1_fail) { + setprop("/systems/fuel/tank[1]/feed0", 1); + } else { + setprop("/systems/fuel/tank[1]/feed0", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank1pump2_sw and !tank1pump2_fail) { + setprop("/systems/fuel/tank[1]/feed1", 1); + } else { + setprop("/systems/fuel/tank[1]/feed1", 0); + } + if ((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw and !tank2pump1_fail) { setprop("/systems/fuel/tank[2]/feed0", 1); - } else if (gravityfeedL_output) { + } else if (gravityfeedR_output) { setprop("/systems/fuel/tank[2]/feed0", 1); } else { setprop("/systems/fuel/tank[2]/feed0", 0); @@ -123,60 +151,32 @@ var master_fuel = func { if ((ac1 >= 110 or ac2 >= 110) and tank2pump2_sw and !tank2pump2_fail) { setprop("/systems/fuel/tank[2]/feed1", 1); - } else if (gravityfeedL_output) { + } else if (gravityfeedR_output) { setprop("/systems/fuel/tank[2]/feed1", 1); } else { setprop("/systems/fuel/tank[2]/feed1", 0); } - if ((ac1 >= 110 or ac2 >= 110) and tank3pump1_sw and !tank3pump1_fail) { - setprop("/systems/fuel/tank[3]/feed0", 1); - } else { - setprop("/systems/fuel/tank[3]/feed0", 0); - } - - if ((ac1 >= 110 or ac2 >= 110) and tank3pump2_sw and !tank3pump2_fail) { - setprop("/systems/fuel/tank[3]/feed1", 1); - } else { - setprop("/systems/fuel/tank[3]/feed1", 0); - } - - if ((ac1 >= 110 or ac2 >= 110) and tank4pump1_sw and !tank4pump1_fail) { - setprop("/systems/fuel/tank[4]/feed0", 1); - } else if (gravityfeedR_output) { - setprop("/systems/fuel/tank[2]/feed0", 1); - } else { - setprop("/systems/fuel/tank[4]/feed0", 0); - } - - if ((ac1 >= 110 or ac2 >= 110) and tank4pump2_sw and !tank4pump2_fail) { - setprop("/systems/fuel/tank[4]/feed1", 1); - } else if (gravityfeedR_output) { - setprop("/systems/fuel/tank[2]/feed1", 1); - } else { - setprop("/systems/fuel/tank[4]/feed1", 0); - } - if ((ac1 >= 110 or ac2 >= 110) and xfeed_sw) { setprop("/systems/fuel/x-feed", 1); } else { setprop("/systems/fuel/x-feed", 0); } + tank0feed0 = getprop("/systems/fuel/tank[0]/feed0"); + tank0feed1 = getprop("/systems/fuel/tank[0]/feed1"); + tank1feed0 = getprop("/systems/fuel/tank[1]/feed0"); + tank1feed1 = getprop("/systems/fuel/tank[1]/feed1"); tank2feed0 = getprop("/systems/fuel/tank[2]/feed0"); tank2feed1 = getprop("/systems/fuel/tank[2]/feed1"); - tank3feed0 = getprop("/systems/fuel/tank[3]/feed0"); - tank3feed1 = getprop("/systems/fuel/tank[3]/feed1"); - tank4feed0 = getprop("/systems/fuel/tank[4]/feed0"); - tank4feed1 = getprop("/systems/fuel/tank[4]/feed1"); - if (((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw and tank2pump1_sw)) { + if (((ac1 >= 110 or ac2 >= 110) and tank0pump1_sw and tank0pump1_sw)) { setprop("/systems/fuel/gravityfeedL", 0); } else { setprop("/systems/fuel/gravityfeedL", 1); } - if (((ac1 >= 110 or ac2 >= 110) and tank4pump1_sw and tank4pump1_sw)) { + if (((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw and tank2pump1_sw)) { setprop("/systems/fuel/gravityfeedR", 0); } else { setprop("/systems/fuel/gravityfeedR", 1); @@ -185,13 +185,37 @@ var master_fuel = func { gravityfeedL = getprop("/systems/fuel/gravityfeedL"); gravityfeedR = getprop("/systems/fuel/gravityfeedR"); - if ((getprop("/fdm/jsbsim/propulsion/tank[3]/contents-lbs") >= 50) and tank3feed0 and tank3feed1 and !gravityfeedL and !gravityfeedR) { + if ((getprop("/fdm/jsbsim/propulsion/tank[1]/contents-lbs") >= 50) and tank1feed0 and tank1feed1 and !gravityfeedL and !gravityfeedR) { setprop("/systems/fuel/only-use-ctr-tank", 1); } else { setprop("/systems/fuel/only-use-ctr-tank", 0); } # Fault lights + if (tank0pump1_sw and tank0pump1_fail) { + setprop("/systems/fuel/tank0pump1-fault", 1); + } else { + setprop("/systems/fuel/tank0pump1-fault", 0); + } + + if (tank0pump2_sw and tank0pump2_fail) { + setprop("/systems/fuel/tank0pump2-fault", 1); + } else { + setprop("/systems/fuel/tank0pump2-fault", 0); + } + + if (tank1pump1_sw and tank1pump1_fail) { + setprop("/systems/fuel/tank1pump1-fault", 1); + } else { + setprop("/systems/fuel/tank1pump1-fault", 0); + } + + if (tank1pump2_sw and tank1pump2_fail) { + setprop("/systems/fuel/tank1pump2-fault", 1); + } else { + setprop("/systems/fuel/tank1pump2-fault", 0); + } + if (tank2pump1_sw and tank2pump1_fail) { setprop("/systems/fuel/tank2pump1-fault", 1); } else { @@ -203,30 +227,6 @@ var master_fuel = func { } else { setprop("/systems/fuel/tank2pump2-fault", 0); } - - if (tank3pump1_sw and tank3pump1_fail) { - setprop("/systems/fuel/tank3pump1-fault", 1); - } else { - setprop("/systems/fuel/tank3pump1-fault", 0); - } - - if (tank3pump2_sw and tank3pump2_fail) { - setprop("/systems/fuel/tank3pump2-fault", 1); - } else { - setprop("/systems/fuel/tank3pump2-fault", 0); - } - - if (tank4pump1_sw and tank4pump1_fail) { - setprop("/systems/fuel/tank4pump1-fault", 1); - } else { - setprop("/systems/fuel/tank4pump1-fault", 0); - } - - if (tank4pump2_sw and tank4pump2_fail) { - setprop("/systems/fuel/tank4pump2-fault", 1); - } else { - setprop("/systems/fuel/tank4pump2-fault", 0); - } } ################### diff --git a/Systems/fuel.xml b/Systems/fuel.xml index dfecc4ca..44881c16 100644 --- a/Systems/fuel.xml +++ b/Systems/fuel.xml @@ -1,197 +1,112 @@ + + + - - - - propulsion/tank[7]/external-flow-rate/jettison - propulsion/tank[8]/external-flow-rate/jettison - /systems/fuel/x-feed - - - + + - - /systems/fuel/x-feed == 1 - propulsion/tank[7]/contents-lbs gt propulsion/tank[8]/contents-lbs - propulsion/tank[7]/contents-lbs gt 0 - propulsion/tank[8]/contents-lbs lt 100 - - - - - - /systems/fuel/x-feed == 1 - propulsion/tank[8]/contents-lbs gt propulsion/tank[7]/contents-lbs - propulsion/tank[8]/contents-lbs gt 0 - propulsion/tank[7]/contents-lbs lt 100 - - - - - - + /systems/fuel/only-use-ctr-tank == 0 - propulsion/tank[1]/contents-lbs gt 0 - propulsion/tank[2]/contents-lbs lt 1650 + /systems/fuel/tank[0]/feed0 == 1 + propulsion/tank[0]/contents-lbs GT 0 + /consumables/fuel/tank[3]/level-lbs LT 0.9 - + - - /systems/fuel/only-use-ctr-tank == 0 - propulsion/tank[5]/contents-lbs gt 0 - propulsion/tank[4]/contents-lbs lt 1650 + + /systems/fuel/tank[1]/feed0 == 1 + propulsion/tank[1]/contents-lbs GT 0 + /consumables/fuel/tank[3]/level-lbs LT 0.9 - + - + + /systems/fuel/x-feed == 1 /systems/fuel/only-use-ctr-tank == 0 /systems/fuel/tank[2]/feed0 == 1 - propulsion/tank[2]/contents-lbs gt 0 - propulsion/tank[7]/contents-lbs lt 90 + propulsion/tank[2]/contents-lbs GT 0 + /consumables/fuel/tank[3]/level-lbs LT 0.9 + - + + - + /systems/fuel/only-use-ctr-tank == 0 - /systems/fuel/tank[2]/feed1 == 1 - propulsion/tank[2]/contents-lbs gt 0 - propulsion/tank[7]/contents-lbs lt 90 + /systems/fuel/tank[2]/feed0 == 1 + propulsion/tank[2]/contents-lbs GT 0 + /consumables/fuel/tank[4]/level-lbs LT 0.9 - + - + + /systems/fuel/tank[1]/feed0 == 1 + propulsion/tank[1]/contents-lbs GT 0 + /consumables/fuel/tank[4]/level-lbs LT 0.9 + + + + + + + /systems/fuel/x-feed == 1 /systems/fuel/only-use-ctr-tank == 0 - /systems/fuel/tank[4]/feed0 == 1 - propulsion/tank[4]/contents-lbs gt 0 - propulsion/tank[8]/contents-lbs lt 90 + /systems/fuel/tank[0]/feed0 == 1 + propulsion/tank[0]/contents-lbs GT 0 + /consumables/fuel/tank[4]/level-lbs LT 0.9 + - - - - /systems/fuel/only-use-ctr-tank == 0 - /systems/fuel/tank[4]/feed1 == 1 - propulsion/tank[4]/contents-lbs gt 0 - propulsion/tank[8]/contents-lbs lt 90 - - - - - - - /systems/fuel/tank[3]/feed0 == 1 - propulsion/tank[3]/contents-lbs gt 0 - propulsion/tank[7]/contents-lbs lt 95 - - - - - - - /systems/fuel/tank[3]/feed1 == 1 - propulsion/tank[3]/contents-lbs gt 0 - propulsion/tank[8]/contents-lbs lt 95 - - - - - - - propulsion/tank[4]/contents-lbs gt propulsion/tank[2]/contents-lbs - propulsion/tank[7]/contents-lbs gt 50 - propulsion/tank[2]/contents-lbs lt 12186 - - - - - - - propulsion/tank[2]/contents-lbs gt propulsion/tank[4]/contents-lbs - propulsion/tank[8]/contents-lbs gt 50 - propulsion/tank[4]/contents-lbs lt 12186 - - - - - -propulsion/tank[7]/external-flow-rate/jettison - -propulsion/tank[7]/external-flow-rate/recirculation - -propulsion/tank[7]/external-flow-rate/x-feed - - propulsion/tank[8]/external-flow-rate/x-feed - propulsion/tank[2]/external-flow-rate/pump[0] - propulsion/tank[2]/external-flow-rate/pump[1] - propulsion/tank[3]/external-flow-rate/pump[0] - - propulsion/tank[7]/external-flow-rate-pps - - - - -propulsion/tank[8]/external-flow-rate/jettison - -propulsion/tank[8]/external-flow-rate/recirculation - -propulsion/tank[8]/external-flow-rate/x-feed - - propulsion/tank[7]/external-flow-rate/x-feed - propulsion/tank[4]/external-flow-rate/pump[0] - propulsion/tank[4]/external-flow-rate/pump[1] - propulsion/tank[3]/external-flow-rate/pump[1] - - propulsion/tank[8]/external-flow-rate-pps - - - - -propulsion/tank[2]/external-flow-rate/pump[0] - -propulsion/tank[2]/external-flow-rate/pump[1] - - propulsion/tank[7]/external-flow-rate/recirculation - propulsion/tank[1]/external-flow-rate/transfer-valve - - propulsion/tank[2]/external-flow-rate-pps - - - - -propulsion/tank[4]/external-flow-rate/pump[0] - -propulsion/tank[4]/external-flow-rate/pump[1] - - propulsion/tank[8]/external-flow-rate/recirculation - propulsion/tank[5]/external-flow-rate/transfer-valve - - propulsion/tank[4]/external-flow-rate-pps - - - - -propulsion/tank[1]/external-flow-rate/transfer-valve - - propulsion/tank[1]/external-flow-rate-pps - - - - -propulsion/tank[5]/external-flow-rate/transfer-valve - - propulsion/tank[5]/external-flow-rate-pps - - - - -propulsion/tank[3]/external-flow-rate/pump[0] - -propulsion/tank[3]/external-flow-rate/pump[1] - + + + fuel/from-tank0-to-tank3 + fuel/from-tank1-to-tank3 propulsion/tank[3]/external-flow-rate-pps + + + + fuel/from-tank2-to-tank4 + fuel/from-tank1-to-tank4 + propulsion/tank[4]/external-flow-rate-pps + + + + + + -fuel/from-tank0-to-tank3 + propulsion/tank[0]/external-flow-rate-pps + + + + -fuel/from-tank1-to-tank3 + -fuel/from-tank1-to-tank4 + propulsion/tank[1]/external-flow-rate-pps + + + + -fuel/from-tank2-to-tank4 + propulsion/tank[2]/external-flow-rate-pps + + +