From 58eb3de1504a4aea6b2d6b7372658a19e5d17817 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 22 Oct 2019 17:24:51 +0100 Subject: [PATCH 1/8] Fuel: adjust capacities and tanks --- A320-100-CFM.xml | 52 +- A320-200-CFM.xml | 59 +- A320-200-IAE.xml | 59 +- A320-main.xml | 14 +- A320neo-CFM.xml | 59 +- A320neo-PW.xml | 59 +- Systems/a320-100-fuel.xml | 2158 +++++++++++++++++++++++++++++++++++++ Systems/a320-fuel.xml | 187 ++++ 8 files changed, 2560 insertions(+), 87 deletions(-) create mode 100644 Systems/a320-100-fuel.xml create mode 100644 Systems/a320-fuel.xml diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 414297a3..b3b04dc8 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -70,43 +70,56 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 18.9231 -5.1104 -0.61182 - 13914 - 6000 - 31 + 1552.00 + 1552.00 + 17.75 1 - JET-A1 + 6.67 50 - + - 18.9731 - 0 + 18.9231 + -5.1104 -0.61182 - 14281 - 0 - 43 + 12212.50 + 6000.00 + 11.70 1 - JET-A1 + 6.67 50 - + 18.9231 5.1104 -0.61182 - 13914 - 6000 - 31 + 12212.50 + 6000.00 + 11.70 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + 5.1104 + -0.61182 + + 1552.00 + 1552.00 + 17.75 + 1 + 6.67 50 @@ -118,7 +131,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 @@ -129,13 +142,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 75bd4d56..85ef0c4b 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -70,17 +70,30 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 18.9231 -5.1104 -0.61182 - 13914 - 6000 - 31 + 1552.00 + 1552.00 + 17.75 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + -5.1104 + -0.61182 + + 12520.50 + 6000.00 + 11.70 + 1 + 6.67 50 @@ -89,24 +102,37 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -0.61182 - 14281 - 0 - 43 + 14550.50 + 40.88 + 23.20 1 - JET-A1 + 6.67 50 - + 18.9231 5.1104 -0.61182 - 13914 - 6000 - 31 + 12520.50 + 6000.00 + 11.70 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + 5.1104 + -0.61182 + + 1552.00 + 1552.00 + 17.75 + 1 + 6.67 50 @@ -118,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 @@ -129,13 +155,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index c0d51b1a..747d0315 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -70,17 +70,30 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 18.9231 -5.1104 -0.61182 - 13914 - 6000 - 31 + 1552.00 + 1552.00 + 17.75 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + -5.1104 + -0.61182 + + 12212.50 + 6000.00 + 11.70 + 1 + 6.67 50 @@ -89,24 +102,37 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -0.61182 - 14281 - 0 - 43 + 14550.50 + 40.88 + 23.20 1 - JET-A1 + 6.67 50 - + 18.9231 5.1104 -0.61182 - 13914 - 6000 - 31 + 12212.50 + 6000.00 + 11.70 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + 5.1104 + -0.61182 + + 1552.00 + 1552.00 + 17.75 + 1 + 6.67 50 @@ -118,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 @@ -129,13 +155,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 + diff --git a/A320-main.xml b/A320-main.xml index 08e926e1..a9b4e9a0 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -424,18 +424,24 @@ - Left Wing + Outer Left Wing - Center + Inner Left Wing - Right Wing + Center - Engine 1 Pipes + Inner Right Wing + Outer Right Wing + + + Engine 1 Pipes + + Engine 2 Pipes diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 9c5b6724..86b39a86 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -70,17 +70,30 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 18.9231 -5.1104 -0.61182 - 13914 - 6000 - 31 + 1552.00 + 1552.00 + 17.75 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + -5.1104 + -0.61182 + + 12147.00 + 6000.00 + 11.70 + 1 + 6.67 50 @@ -89,24 +102,37 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -0.61182 - 14281 - 0 - 43 + 14601.44 + 40.88 + 23.20 1 - JET-A1 + 6.67 50 - + 18.9231 5.1104 -0.61182 - 13914 - 6000 - 31 + 12147.00 + 6000.00 + 11.70 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + 5.1104 + -0.61182 + + 1552.00 + 1552.00 + 17.75 + 1 + 6.67 50 @@ -118,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 @@ -129,13 +155,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 + diff --git a/A320neo-PW.xml b/A320neo-PW.xml index 39a8e469..3bb62cec 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -70,17 +70,30 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 18.9231 -5.1104 -0.61182 - 13914 - 6000 - 31 + 1552.00 + 1552.00 + 17.75 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + -5.1104 + -0.61182 + + 12147.00 + 6000.00 + 11.70 + 1 + 6.67 50 @@ -89,24 +102,37 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -0.61182 - 14281 - 0 - 43 + 14601.44 + 40.88 + 23.20 1 - JET-A1 + 6.67 50 - + 18.9231 5.1104 -0.61182 - 13914 - 6000 - 31 + 12147.00 + 6000.00 + 11.70 1 - JET-A1 + 6.67 + 50 + + + + 18.9231 + 5.1104 + -0.61182 + + 1552.00 + 1552.00 + 17.75 + 1 + 6.67 50 @@ -118,7 +144,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 @@ -129,13 +155,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 10 0 1 - JET-A1 + 6.67 + diff --git a/Systems/a320-100-fuel.xml b/Systems/a320-100-fuel.xml new file mode 100644 index 00000000..c84553c7 --- /dev/null +++ b/Systems/a320-100-fuel.xml @@ -0,0 +1,2158 @@ + + + + + + + fbw/roll/pid + fbw/pitch/g-pi + fbw/pitch/pid + fbw/yaw/tc-pd + fbw/spoiler-output + fbw/mixer/sidestick-gain-feedback + + + fbw/roll/p-gain + fbw/roll/i-gain + fbw/roll/d-gain + fbw/pitch/p-gain + fbw/pitch/i-gain + fbw/pitch/d-gain + fbw/yaw/yd-p-gain + fbw/yaw/tc-p-gain + fbw/yaw/tc-d-gain + + + fbw/fmgc/roll-cmd + fbw/fmgc/pitch-cmd + fbw/fmgc/yaw-cmd + + + + + + + gear/unit[0]/WOW eq 1 + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + position/wow eq 1 + /it-fbw/law ne 0 + + + + + + + position/wow eq 1 + /it-fbw/law eq 2 + /it-fbw/law eq 3 + + + + + + + position/wow eq 1 + /it-fbw/law eq 2 + /it-fbw/law eq 3 + + + + + + + /it-autoflight/output/ap1 eq 1 + /it-autoflight/output/ap2 eq 1 + + + + + + + velocities/vc-kts + fbw/roll/gain-switch + + 0 1 + 140 -20.0 0.0 + 350 -5.0 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/roll/gain-switch + + 0 1 + 140 -35.0 0.0 + 350 -10.0 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/roll/gain-switch + + 0 1 + 140 -2.5 0.0 + 350 -0.5 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/pitch/gain-switch + + 0 1 + 140 28 0 + 350 20 0 + +
+ + + + + + + velocities/vc-kts + fbw/pitch/gain-switch + + 0 1 + 140 60 0 + 350 40 0 + +
+ + + + + + + velocities/vc-kts + fbw/pitch/gain-switch + + 0 1 + 140 2.0 0.0 + 350 0.4 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/yaw/gain-switch + + 0 1 + 140 -7.0 0.0 + 350 -1.2 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/yaw/gain-switch + + 0 1 + 140 3.0 0.0 + 350 1.5 0.0 + +
+ + + + + + + velocities/vc-kts + fbw/yaw/gain-switch + + 0 1 + 140 6.0 0.0 + 350 3.0 0.0 + +
+ + + + + Use D only to calculate rate of IAS + velocities/vc-kts + 0.0 + 0.0 + 1.0 + + + + fbw/pitch/vc-kts-rate + 1.0 + + + + + + position/wow eq 1 + fbw/mixer/sidestick-gain-feedback eq 1 + + + position/wow eq 1 + fbw/mixer/sidestick-gain-feedback ne 1 + + + position/wow eq 0 + fbw/mixer/sidestick-gain-feedback eq 0 + + + + + position/wow + fbw/mixer/rate-limit + fbw/mixer/sidestick-gain-feedback + + + + + + fbw/mixer/sidestick-gain + + 0 1 + 1 0 + +
+ + + + + + + + + + + fbw/fmgc/enabled eq 1 + + + + + fbw/roll/a-i-f + + + -1 + + + + 1 + + + + /controls/flight/aileron-input-fast + + + + + + /controls/flight/aileron + + -1.00 -1 + -0.04 0 + 0.04 0 + 1.00 1 + +
+ + + + + + + fbw/fmgc/enabled eq 0 + + + position/wow eq 0 + fbw/fmgc/enabled eq 1 + + + + + fbw/roll/a-i-s + + + -1 + + + + 1 + + + + /controls/flight/aileron-input + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1 0 1 + -0.575959 0.261799 0.000000 0.000000 + -0.488692 0.000000 0.000000 0.000000 + 0.488692 0.000000 0.000000 0.000000 + 0.575959 0.000000 0.000000 -0.261799 + +
+ + attitude/roll-rad + + -0.750492 0.261799 + -0.575959 0.000000 + 0.575959 0.000000 + 0.750492 -0.261799 + +
+ + + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1.0 0.0 1.0 + -1.169370 0.261799 0.000000 0.000000 + -1.082100 0.000000 0.000000 0.000000 + 1.082100 0.000000 0.000000 0.000000 + 1.169370 0.000000 0.000000 -0.261799 + +
+ + attitude/roll-rad + + -1.343900 0.261799 + -1.169370 0.000000 + 1.169370 0.000000 + 1.343900 -0.261799 + +
+ + + + + + + + attitude/roll-rad + + -1.169370 0.436332 + -0.698132 0.174533 + -0.575959 0.000000 + 0.575959 0.000000 + 0.698132 -0.174533 + 1.169370 -0.436332 + +
+ + + + + + + attitude/roll-rad lt 0 + fbw/roll/r-r-33 ge fbw/roll/r-r-rb-f + + + attitude/roll-rad gt 0 + fbw/roll/r-r-33 le fbw/roll/r-r-rb-f + + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1 0 1 + -0.698132 0.261799 0.000000 0.000000 + -0.610865 0.000000 0.000000 0.000000 + 0.610865 0.000000 0.000000 0.000000 + 0.698132 0.000000 0.000000 -0.261799 + +
+ + + + + + + + attitude/roll-rad + + -0.698132 0.436332 + -0.261799 0.174533 + 0.000000 0.000000 + 0.261799 -0.174533 + 0.698132 -0.436332 + +
+ + + + + + + /it-fbw/roll-lim eq 33 + /it-fbw/roll-back ne 1 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/roll-lim eq 67 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/roll-back eq 1 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/protections/overspeed eq 1 + /it-fbw/protections/overspeed-roll-back ne 1 + + + /it-fbw/protections/overspeed eq 1 + /it-fbw/protections/overspeed-roll-back eq 1 + + + + + fbw/roll/rate-demand + 16.4 + + + + + + /orientation/roll-rate-degps + + + + + + + + gear/unit[0]/WOW eq 1 + + + + + fbw/roll/p-r_s-s + -fbw/roll/rate-demand-lag + + + + + + fbw/roll/gain-switch gt 0 + + + fbw/roll/pid le -0.999 + fbw/roll/pid ge 0.999 + + + + + fbw/roll/rate-error + fbw/roll/p-gain + fbw/roll/i-gain + fbw/roll/d-gain + fbw/roll/trigger + + -1.0 + 1.0 + + fbw/roll/pid + + + + + + position/wow eq 1 + /it-fbw/law eq 1 + /it-fbw/law eq 2 + + + + + + + + /orientation/roll-deg + + -30 -30 + -1 0 + 0 0 + 1 0 + 30 30 + +
+ -0.1 + + + + + + fbw/roll/pid + fbw/mixer/computer-gain + + + + fbw/roll/a-i-f + fbw/mixer/sidestick-gain + + + + fbw/mixer/roll/computer-demand + fbw/mixer/roll/sidestick-demand + + -1.0 + 1.0 + + + + + + + position/wow eq 0 + /it-fbw/law eq 0 + + + fbw/fmgc/enabled eq 0 + fbw/roll/gear-law-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + /it-fbw/law eq 0 + + + /it-fbw/law eq 3 + + + + + + + position/wow eq 0 + /it-fbw/law eq 0 + + + fbw/roll/gear-law-switch eq 1 + + + /it-fbw/law eq 3 + + + + + + + + fbw/roll/s-i-f-i + + -1.0 -1.0 + -0.2 0.0 + 0.2 0.0 + 1.0 1.0 + +
+ + velocities/vc-kts + position/wow + + 0 1 + 140 0.5 1.0 + 350 0.1 1.0 + +
+ + + + + + + + /it-fbw/roll-back eq 0 + + + + + + + /it-fbw/law ne 3 + /systems/failures/aileron-left eq 0 + + + /it-fbw/law ne 3 + /systems/failures/aileron-left eq 1 + + + + + + + /it-fbw/law ne 3 + /systems/failures/aileron-right eq 0 + + + /it-fbw/law ne 3 + /systems/failures/aileron-right eq 1 + + + + + /controls/flight/aileron + 20 + + + + + + + + + + /it-fbw/law eq 0 + /it-fbw/protections/overspeed eq 1 + + + + + + + fbw/fmgc/enabled eq 1 + + + -1.0 + fbw/pitch/elevator-max + + + + + fbw/pitch/e-i-f + + + -1 + + + + 1 + + + + /controls/flight/elevator-input-fast + + + + + + /controls/flight/elevator + + -1.00 -1 + -0.04 0 + 0.04 0 + 1.00 1 + +
+ + + + + + + fbw/pitch/elevator-nul + + /position/gear-agl-ft + + 5 0.2 + 30 0.1 + +
+ + + + + + + + fbw/pitch/elevator-nul + -0.15 + + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + fbw/fmgc/enabled eq 0 + /position/gear-agl-ft le 30 + /controls/flight/flap-pos ge 4 + /controls/engines/engine[0]/throttle lt 0.65 + /controls/engines/engine[1]/throttle lt 0.65 + /FMGC/status/to-state eq 0 + /it-fbw/law eq 0 + position/wow eq 0 + + + fbw/fmgc/enabled eq 0 + /position/gear-agl-ft le 30 + /controls/flight/flap-pos ge 4 + /controls/engines/engine[0]/throttle lt 0.65 + /controls/engines/engine[1]/throttle lt 0.65 + /FMGC/status/to-state eq 0 + /it-fbw/law eq 0 + gear/unit[0]/WOW eq 0 + fbw/pitch/flare-gear-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 0 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + + + -1.0 + fbw/pitch/elevator-max + + + + + fbw/pitch/e-i-s + + + -1 + + + + 1 + + + + /controls/flight/elevator-input + + + + + + /controls/flight/flap-pos ne 0 + + + + + + + /controls/flight/flap-pos ne 0 + + + + + + + fbw/pitch/e-i + + -1.0 2.5 + 0.0 1.0 + 1.0 -0.5 + +
+ + + fbw/pitch/g-min + fbw/pitch/g-max + + + + + /accelerations/pilot-g + 1.0 + + + + + + fbw/pitch/g-instrumented + + -1 + + attitude/roll-rad + + + 1 + + + + + + fbw/pitch/g-computed + -fbw/pitch/g-demand + + + + + + fbw/pitch/g-pi + -1.0 + + + + + + attitude/roll-rad lt -1.5708 + attitude/roll-rad gt 1.5708 + + + + + + + + + + fbw/pitch/g-pi-switched + -0.087266 + + + attitude/pitch-rad + fbw/pitch/g-pi-switched + + -1 0 1 + -0.261799 0.000000 0.000000 0.087266 + -0.174533 0.000000 0.000000 0.000000 + 0.436332 0.000000 0.000000 0.000000 + 0.523599 -0.087266 0.000000 0.000000 + +
+ + attitude/pitch-rad + + -0.436332 0.087266 + -0.261799 0.000000 + 0.523599 0.000000 + 0.698132 -0.087266 + +
+ + + + + + fbw/pitch/g-pi-switched + -0.087266 + + + + + + + fbw/pitch/g-pi-switched + fbw/pitch/vc-kts-rate-lag + + -2 -1 + -1.0 0.087266 0.087266 + 0.0 0.000000 0.026180 + +
+ + attitude/pitch-rad + fbw/pitch/g-pi-switched + + -1 0 + 0.436332 -0.026180 0.000000 + 0.523599 -0.087266 0.000000 + +
+ + attitude/pitch-rad + + 0.523599 0.000000 + 0.698132 -0.087266 + +
+ + + + + + + + fbw/pitch/g-pi-switched + fbw/pitch/vc-kts-rate-lag + + -2 -1 + -1.0 0.087266 0.087266 + 0.0 0.000000 0.026180 + 1.0 -0.061086 -0.087266 + +
+ + + + + + + /it-fbw/law eq 0 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/law ne 0 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/law eq 0 + /it-fbw/protections/overspeed eq 1 + + + /it-fbw/law ne 0 + /it-fbw/protections/overspeed eq 1 + + + + + fbw/pitch/rate-demand + 10.1 + + + + + + /orientation/pitch-rate-degps + + + + + + + + gear/unit[0]/WOW eq 1 + + + + + fbw/pitch/t-r_s-s + -fbw/pitch/rate-demand-lag + + + + + + fbw/pitch/gain-switch gt 0 + + + fbw/pitch/pid le -0.999 + fbw/pitch/pid ge 0.999 + + + + + fbw/pitch/rate-error + fbw/pitch/p-gain + fbw/pitch/i-gain + fbw/pitch/d-gain + fbw/pitch/trigger + + -1.0 + 1.0 + + fbw/pitch/pid + + + + fbw/pitch/pid + -1.0 + + + + + + attitude/roll-rad lt -1.5708 + attitude/roll-rad gt 1.5708 + + + + + + + /it-fbw/law eq 0 + /it-fbw/law eq 1 + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + /it-fbw/law eq 2 + + + + + fbw/pitch/pid-switched + fbw/mixer/computer-gain + + + + fbw/pitch/e-i-f + fbw/mixer/sidestick-gain + + + + fbw/mixer/pitch/computer-demand + fbw/mixer/pitch/sidestick-demand + + -1.0 + 1.0 + + + + + + + position/wow eq 0 + fbw/pitch/law-switch eq 1 + + + fbw/fmgc/enabled eq 0 + fbw/pitch/law-gear-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + gear/unit[0]/WOW eq 0 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + + + /it-fbw/law eq 3 + + + + + /controls/flight/elevator + 20 + + + + + + fbw/fmgc/enabled eq 1 + + + + + + + fbw/pitch/gain-switch eq 0 + /position/gear-agl-ft ge fbw/pitch/autotrim-height + attitude/roll-rad lt 0.628319 + attitude/roll-rad gt -0.628319 + fbw/pitch/pid-switched ge 0.01 + fbw/pitch/g-instrumented ge 0.5 + /it-fbw/protections/overspeed ne 1 + /controls/flight/elevator-trim le 0.32 + position/wow eq 0 + + + fbw/pitch/gain-switch eq 0 + /position/gear-agl-ft ge fbw/pitch/autotrim-height + attitude/roll-rad lt 0.628319 + attitude/roll-rad gt -0.628319 + fbw/pitch/pid-switched le -0.01 + fbw/pitch/g-instrumented ge 0.5 + /it-fbw/protections/overspeed ne 1 + /controls/flight/elevator-trim ge -1.0 + position/wow eq 0 + + + + + + + + + fbw/pitch/autotrim-switch + 1 + + + fbw/pitch/pid-switched + + 0.05 0.00001 + 0.30 0.00015 + +
+ 0.0 + + + + fbw/pitch/autotrim-switch + 2 + + + fbw/pitch/pid-switched + + -0.30 -0.00015 + -0.05 -0.00001 + +
+ 0.0 + + + + + + + + + /controls/flight/elevator-trim + fbw/pitch/autotrim-offset + + + + -1.0 + 0.32 + + /controls/flight/elevator-trim + + + + + + + + + + velocities/vc-kts + + 160.00 25.000 + 162.15 23.649 + 165.02 22.226 + 168.64 21.015 + 172.25 19.734 + 176.59 18.595 + 181.67 17.525 + 186.75 16.385 + 191.83 15.316 + 197.65 14.318 + 205.65 13.247 + 212.93 12.318 + 219.48 11.462 + 227.48 10.533 + 236.96 9.7450 + 246.43 8.8863 + 255.18 8.0990 + 266.12 7.4525 + 277.06 6.7704 + 288.00 6.0884 + 299.67 5.5124 + 311.35 5.0075 + 323.03 4.5736 + 335.44 4.2104 + 347.13 3.9186 + 358.81 3.6979 + 370.50 3.5482 + 380.00 3.4000 + +
+ + + + + + + /systems/fctl/fac1 eq 1 + /systems/fctl/fac2 eq 1 + /gear/gear[1]/wow eq 0 + /gear/gear[2]/wow eq 0 + + + /controls/flight/slats eq 0 + /gear/gear[1]/wow eq 0 + /gear/gear[2]/wow eq 0 + + + + + fbw/yaw/max-deg-switch + + -25 + 25 + + + -1 + 1 + + + + + fbw/yaw/max-deg-scale + -1.0 + + + + + + /controls/flight/rudder + fbw/fmgc/enabled + + 0 1 + -1.00 -1 0 + -0.04 0 0 + 0.04 0 0 + 1.00 1 0 + +
+ + + + + + + + fbw/yaw/rudder-nul + fbw/yaw/max-deg-switch + + 25.0 + + + + + + + + fbw/fmgc/enabled eq 1 + /it-autoflight/output/lat eq 4 + + + + + velocities/r-rad_sec + 0.5 + + + + + + position/wow eq 1 + /position/gear-agl-ft lt 50 + fbw/yaw/autoland-switch eq 1 + + + + + fbw/yaw/r-r_s-s + fbw/yaw/yd-p-gain + + -0.5 + 0.5 + + + + + + + position/wow eq 1 + fbw/yaw/rudder-nul gt 0 + fbw/yaw/rudder-nul lt 0 + + + + + fbw/yaw/slip-skid + fbw/yaw/tc-p-gain + 0.0 + fbw/yaw/tc-d-gain + + -0.4 + 0.4 + + fbw/yaw/tc-pd + + + + + + position/wow eq 1 + fbw/yaw/rudder-nul gt 0 + fbw/yaw/rudder-nul lt 0 + + + + + + + fbw/yaw/autoland-switch eq 1 + + + + + fbw/yaw/yd-f + fbw/yaw/tc-pd-s + fbw/yaw/fmgc-cmd + + + + + + /it-fbw/law eq 0 + /it-fbw/law eq 1 + + + + + + + fbw/yaw/law-switch eq 1 + fbw/yaw/rudder-nul eq 0 + + /controls/flight/rudder-fbw + + + + /controls/flight/rudder + 20 + + + + + + + + + + /velocities/airspeed-kt + + 62 1.0 + 116 0.0 + +
+ + + + + + + /velocities/airspeed-kt + + 72 1.0 + 121 0.0 + +
+ + + + + fbw/spoiler-output + 0.9 + 2.5 + + + + + + spoilers/anti-droop-cmd + + 0.5 0.0 + 1.0 1.0 + +
+ + + + + + + + + + + -1 + fbw/aileron-output + + + + + + + + fbw/aileron-output + + /fdm/jsbsim/fcs/flap-pos-deg + + 1 0.00 + 5 0.26 + +
+ + + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + + + + + + + hydraulics/aileron-l/pressure-switch-or eq 1 + spoilers/anti-droop-final ne 0 + /gear/gear[1]/wow eq 1 + /gear/gear[2]/wow eq 1 + /systems/failures/aileron-left eq 0 + + + hydraulics/aileron-l/pressure-switch-or eq 1 + /systems/failures/aileron-left eq 0 + + + -1.0 + 1.0 + + + + + hydraulics/aileron-l/switch + + -25 + 25 + + + + + hydraulics/aileron-l/cmd-deg + 82 + 26.5 + hydraulics/aileron-l/final-deg + + + + + + + + + + + 1 + fbw/aileron-output + + -1.0 + + + + + + + + + fbw/aileron-output + -1.0 + + + /fdm/jsbsim/fcs/flap-pos-deg + + 1 0.00 + 5 0.26 + +
+ + + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + + + + + + + hydraulics/aileron-r/pressure-switch-or eq 1 + spoilers/anti-droop-final ne 0 + /gear/gear[1]/wow eq 1 + /gear/gear[2]/wow eq 1 + /systems/failures/aileron-right eq 0 + + + hydraulics/aileron-r/pressure-switch-or eq 1 + /systems/failures/aileron-right eq 0 + + + -1.0 + 1.0 + + + + + hydraulics/aileron-r/switch + + -25 + 25 + + + + + hydraulics/aileron-r/cmd-deg + 82 + 26.5 + hydraulics/aileron-r/final-deg + + + + + + + + fbw/elevator-output + + -0.6666666666666666666666666666666 + 1.0 + + + + + + + /velocities/groundspeed-kt lt 75 + + + + + + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + + + + + + + hydraulics/elevator-l/pressure-switch-or eq 1 + /systems/failures/elevator-left eq 0 + + + -1.0 + 1.0 + + + + + hydraulics/elevator-l/switch + + -30 + 17 + + + + + hydraulics/elevator-l/cmd-deg + 82 + 26.5 + hydraulics/elevator-l/final-deg + + + + + + + + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + + + + + + + hydraulics/elevator-r/pressure-switch-or eq 1 + /systems/failures/elevator-right eq 0 + + + -1.0 + 1.0 + + + + + hydraulics/elevator-r/switch + + -30 + 17 + + + + + hydraulics/elevator-r/cmd-deg + 82 + 26.5 + hydraulics/elevator-r/final-deg + + + + + + + + + + /systems/hydraulic/green-psi ge 1500 + + + + + /controls/flight/elevator-trim + + -1.00 + 0.32 + + + -12.5 + 4.0 + + + + + hydraulics/elevator-trim/cmd-deg + hydraulics/elevator-trim/rate + 22.5 + hydraulics/elevator-trim/final-deg + + + + + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + /systems/hydraulic/yellow-psi ge 1500 + + + + + /controls/flight/rudder-trim + + -1.0 + 1.0 + + + -20.0 + 20.0 + + + + + /controls/flight/rudder-trim + + -0.8 + 0.8 + + + + + fbw/rudder-output + hydraulics/rudder/trim-norm + + -1 + 1 + + + + + + + hydraulics/rudder/pressure-switch-or eq 1 + /systems/failures/rudder eq 0 + + + fbw/yaw/max-deg-scale-neg + fbw/yaw/max-deg-scale + + + + + hydraulics/rudder/switch + + -25 + 25 + + + + + hydraulics/rudder/cmd-deg + 80 + 25.5 + hydraulics/rudder/final-deg + + + + + + + + /controls/engines/engine[0]/throttle-output + 0.95 + fcs/throttle-pos-norm[0] + + + + /controls/engines/engine[1]/throttle-output + 0.95 + fcs/throttle-pos-norm[1] + + + + /engines/engine[0]/n1 + 2.25 + /engines/engine[0]/n1-actual + /engines/engine[3]/n1 + + + + /engines/engine[1]/n1 + 2.25 + /engines/engine[1]/n1-actual + /engines/engine[4]/n1 + + + + /engines/engine[0]/n2 + 2.25 + /engines/engine[0]/n2-actual + /engines/engine[3]/n2 + + + + /engines/engine[1]/n2 + 2.25 + /engines/engine[1]/n2-actual + /engines/engine[4]/n2 + + + + /controls/engines/engine[0]/throttle-lever + 20 + + + + /controls/engines/engine[1]/throttle-lever + 20 + + + + /controls/engines/engine[0]/reverser + 20 + + + + /controls/engines/engine[1]/reverser + 20 + + + + /controls/engines/engine[0]/throttle-rev + 20 + + + + /controls/engines/engine[1]/throttle-rev + 20 + + + + /controls/engines/engine[0]/cutoff-switch + 20 + + + + /controls/engines/engine[1]/cutoff-switch + 20 + + + + + + + + /controls/flight/flap-lever + 20 + + + + + + /systems/electrical/bus/dc-ess ge 25 + + + + + + + /systems/electrical/bus/dc-2 ge 25 + + + + + + + + + /controls/flight/flaps + 35.0 + + + + + + /systems/acconfig/autoconfig-running eq 1 + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/yellow-psi ge 1500 + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 1 + + + /systems/hydraulic/green-psi ge 1500 + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 0 + + + /systems/hydraulic/yellow-psi ge 1500 + fcs/sfcc/unit1-avail eq 0 + fcs/sfcc/unit2-avail eq 1 + + + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/yellow-psi lt 1500 + + + /systems/hydraulic/green-psi lt 1500 + /systems/hydraulic/yellow-psi ge 1500 + + + + + fcs/flap-pos-gain + fcs/flap-pos-rate + fcs/flap-pos-deg + + + + fcs/flap-pos-deg + + 0 + 35 + + + 0 + 1 + + fcs/flap-pos-norm + + + + + + + + /controls/flight/slats + 27.0 + + + + + + /systems/acconfig/autoconfig-running eq 1 + + + /systems/hydraulic/blue-psi ge 1500 + /systems/hydraulic/green-psi ge 1500 + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 1 + + + /systems/hydraulic/blue-psi ge 1500 + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 0 + + + /systems/hydraulic/green-psi ge 1500 + fcs/sfcc/unit1-avail eq 0 + fcs/sfcc/unit2-avail eq 1 + + + /systems/hydraulic/blue-psi ge 1500 + /systems/hydraulic/green-psi lt 1500 + + + /systems/hydraulic/blue-psi lt 1500 + /systems/hydraulic/green-psi ge 1500 + + + + + fcs/slat-pos-gain + fcs/slat-pos-rate + fcs/slat-pos-deg + + + + fcs/slat-pos-deg + + 0 + 27 + + + 0 + 1 + + fcs/slat-pos-norm + + + + + + + + gear/gear-cmd-norm + + + 0 + + + + 1 + + + + gear/gear-pos-norm + + + + + + + + + + fbw/fmgc/enabled eq 0 + /controls/flight/aileron-drives-tiller eq 1 + + + fbw/fmgc/enabled eq 1 + + + + + + + /systems/electrical/bus/ac-1 ge 110 + /systems/electrical/bus/ac-2 ge 110 + /systems/electrical/bus/dc-1 ge 25 + /systems/electrical/bus/dc-2 ge 25 + + + + + + + position/wow eq 1 + hydraulics/tiller/elec-pwr eq 1 + /systems/hydraulic/yellow-psi ge 1500 + /sim/model/autopush/connected eq 0 + /controls/gear/nws-switch eq 1 + /engines/engine[0]/state eq 3 + + + position/wow eq 1 + hydraulics/tiller/elec-pwr eq 1 + /systems/hydraulic/yellow-psi ge 1500 + /sim/model/autopush/connected eq 0 + /controls/gear/nws-switch eq 1 + /engines/engine[1]/state eq 3 + + + + + + + + /sim/model/autopush/connected + 1 + + + hydraulics/tiller/autopush-cmd + 75 + + + /velocities/groundspeed-kt + hydraulics/tiller/switch + + -1 0 1 + 0.500 0 0 0 + 1.000 -75 0 75 + 30.000 -47 0 47 + 30.001 -6 0 6 + 135.000 0 0 0 + +
+ + + + + + + + hydraulics/tiller/hyd-pwr eq 1 + /sim/model/autopush/connected eq 1 + /systems/acconfig/autoconfig-running eq 1 + + + + + hydraulics/tiller/function + fcs/steer-rate + fcs/steer-pos-deg[0] + + + + + + /sim/model/autopush/connected eq 1 + + + + + + + + + /controls/gear/brake-parking + 20 + + + + /services/chocks/nose + 0.5 + + + + /controls/gear/brake-left + /controls/gear/brake-parking + /services/chocks/nose-half + /services/chocks/left + + 0 + 1 + + + + + + + /controls/autobrake/active eq 1 + + fcs/left-brake-cmd-norm + + + + /controls/gear/brake-right + /controls/gear/brake-parking + /services/chocks/nose-half + /services/chocks/right + + 0 + 1 + + + + + + + /controls/autobrake/active eq 1 + + fcs/right-brake-cmd-norm + + + + + diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml new file mode 100644 index 00000000..02eef2ee --- /dev/null +++ b/Systems/a320-fuel.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + /controls/switches/fuel/pump-left-1 eq 1 + + + /systems/electrical/sources/idg-1/pmg-volt ge 110 + /controls/electrical/switches/gen-1-line-contactor eq 1 + + /systems/electrical/bus/ac-1 ge 110 + + + + + + + + /controls/switches/fuel/pump-left-2 eq 1 + /systems/electrical/bus/ac-2 ge 110 + + + + + + + /controls/switches/fuel/pump-right-1 eq 1 + + + /systems/electrical/sources/idg-1/pmg-volt ge 110 + /controls/electrical/switches/gen-1-line-contactor eq 1 + + /systems/electrical/bus/ac-1 ge 110 + + + + + + + + /controls/switches/fuel/pump-right-2 eq 1 + /systems/electrical/bus/ac-2 ge 110 + + + + + + + /controls/switches/fuel/pump-center-1 eq 1 + + /controls/switches/fuel/center-mode eq 0 + + fcs/slat-pos-deg lt 16 + /systems/fuel/pumps/center-control-low-level ne 1 + propulsion/tank[1]/contents-lbs lt 11420 + + + /systems/electrical/bus/ac-1 ge 110 + + + + + + + /controls/switches/fuel/pump-center-3 eq 1 + + /controls/switches/fuel/center-mode eq 0 + + fcs/slat-pos-deg lt 16 + /systems/fuel/pumps/center-control-low-level ne 1 + propulsion/tank[3]/contents-lbs lt 11420 + + + /systems/electrical/bus/ac-2 ge 110 + + + + + Timer for the Fuel Center pumps + /systems/fuel/quantity/center-low + 100 + 0.00333 + + + + + + + /systems/fuel/valves/intercell-transfer-valve-1-cmd eq 1 + /systems/fuel/refuel/refuelling eq 0 + + + /systems/fuel/quantity/left-wing-inner-low eq 1 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/outer-inner-transfer-valve-1-cmd + /systems/fuel/valves/outer-inner-transfer-valve-1-power + + + + + + /systems/fuel/valves/intercell-transfer-valve-2-cmd eq 1 + /systems/fuel/refuel/refuelling eq 0 + + + /systems/fuel/quantity/right-wing-inner-low eq 1 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/outer-inner-transfer-valve-2-cmd + /systems/fuel/valves/outer-inner-transfer-valve-2-power + + + + + + + /controls/engines/engine[0]/fire-btn eq 0 + /controls/engines/engine[0]/cutoff-switch eq 0 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + /systems/electrical/bus/dc-2 ge 25 + + + + + /systems/fuel/valves/engine-1-lp-valve-cmd + /systems/fuel/valves/engine-1-lp-valve-power + + + + + + /controls/engines/engine[1]/fire-btn eq 0 + /controls/engines/engine[1]/cutoff-switch eq 0 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + /systems/electrical/bus/dc-2 ge 25 + + + + + /systems/fuel/valves/engine-2-lp-valve-cmd + /systems/fuel/valves/engine-2-lp-valve-power + + + + + + + + From 5e64b5a9a971ece07c126ed3edee479f7a28b5b7 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 7 Nov 2019 21:47:16 +0000 Subject: [PATCH 2/8] Fuel system: push completed system --- A320-100-CFM.xml | 18 +- A320-200-CFM.xml | 4 +- A320-200-IAE.xml | 4 +- A320-main.xml | 17 +- A320neo-CFM.xml | 4 +- A320neo-PW.xml | 4 +- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 58 +- Models/Instruments/OHpanel/OHpanel.xml | 64 +- Nasal/ECAM/ECAM-logic.nas | 2 +- Nasal/fuel.nas | 100 +- Nasal/property-tree-setup.nas | 2 + Systems/a320-100-fuel.xml | 2503 +++--------------- Systems/a320-fuel.xml | 419 ++- Systems/fuel.xml | 4 +- 14 files changed, 947 insertions(+), 2256 deletions(-) diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 77458036..89c4181e 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -29,7 +29,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 3 + 4 14.3962788 @@ -55,7 +55,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 4 + 5 14.3962788 @@ -96,6 +96,20 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 6.67 50 + + + + 18.9731 + 0 + -0.61182 + + 14550.50 + 40.88 + 23.20 + 1 + 6.67 + 50 + 18.9231 diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 1783a528..050dd7c9 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -29,7 +29,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 3 + 5 14.3962788 @@ -55,7 +55,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 4 + 6 14.3962788 diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index d5a6de5e..71893993 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -29,7 +29,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 3 + 5 14.3962788 @@ -55,7 +55,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 4 + 6 14.3962788 diff --git a/A320-main.xml b/A320-main.xml index c64e75df..acbcc818 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -640,6 +640,18 @@ 0 0 + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + 0 0 @@ -921,7 +933,10 @@ 0 - 0 + 0 + + 0 + 0 diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 8e13896d..8e5541a9 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -29,7 +29,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 3 + 5 14.3962788 @@ -55,7 +55,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 4 + 6 14.3962788 diff --git a/A320neo-PW.xml b/A320neo-PW.xml index 233ee8d5..6bfe1af2 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -29,7 +29,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 1 - 3 + 5 14.3962788 @@ -55,7 +55,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 2.2 -1 - 4 + 6 14.3962788 diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 896fb189..6659f78e 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -2265,11 +2265,10 @@ var canvas_lowerECAM_fuel = { me["FUEL-Flow-per-min"].setText("XX"); } - # this is now bound to the ENG master switch # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state # TODO fix amber/green at the same time when closed - if (cutoff_switch1.getValue() == 0) { + if (systems.FUEL.Valves.lpValve1.getValue()) == 0) { me["FUEL-ENG-Master-1"].setRotation(0); me["FUEL-ENG-Master-1"].setColor(0.0509,0.7529,0.2941); me["FUEL-ENG-1-pipe"].setColor(0.0509,0.7529,0.2941); @@ -2279,11 +2278,10 @@ var canvas_lowerECAM_fuel = { me["FUEL-ENG-1-pipe"].setColor(0.7333,0.3803,0); } - # this is now bound to the ENG master switch # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state # TODO fix amber/green at the same time when closed - if (cutoff_switch2.getValue() == 0) { + if (systems.FUEL.Valves.lpValve2.getValue() == 0) { me["FUEL-ENG-Master-2"].setRotation(0); me["FUEL-ENG-Master-2"].setColor(0.0509,0.7529,0.2941); me["FUEL-ENG-2-pipe"].setColor(0.0509,0.7529,0.2941); @@ -2297,7 +2295,7 @@ var canvas_lowerECAM_fuel = { # TODO use the valve prop # TODO add amber when disagree between switch and btn # TODO add transition state - if (fuel_xfeed.getValue() == 1) { + if (systems.FUEL.Valves.crossfeed.getValue() == 1) { me["FUEL-XFEED"].setRotation(0); me["FUEL-XFEED-pipes"].show(); } else { @@ -2307,7 +2305,7 @@ var canvas_lowerECAM_fuel = { # TODO add LO indication # TODO fix amber/green at the same time when closed - if (tank0pump1.getValue() == 1) { + if (systems.FUEL.Switches.pumpLeft1.getValue() == 1) { me["FUEL-Pump-Left-1-Open"].show(); me["FUEL-Pump-Left-1-Closed"].hide(); me["FUEL-Pump-Left-1"].setColor(0.0509,0.7529,0.2941); @@ -2319,7 +2317,7 @@ var canvas_lowerECAM_fuel = { # TODO add LO indication # TODO fix amber/green at the same time when closed - if (tank0pump2.getValue() == 1) { + if (systems.FUEL.Switches.pumpLeft2.getValue() == 1) { me["FUEL-Pump-Left-2-Open"].show(); me["FUEL-Pump-Left-2-Closed"].hide(); me["FUEL-Pump-Left-2"].setColor(0.0509,0.7529,0.2941); @@ -2331,7 +2329,7 @@ var canvas_lowerECAM_fuel = { # TODO fix amber/green at the same time when closed # TODO add functionality to match FCOM 1.28.20 "Amber: Transfer valve is open, whereas commanded closed in automatic or manual mode" - if (tank1pump1.getValue() == 1) { + if (systems.FUEL.Switches.pumpCenter1.getValue() == 1) { me["FUEL-Pump-Center-1-Open"].show(); me["FUEL-Pump-Center-1-Closed"].hide(); me["FUEL-Pump-Center-1"].setColor(0.0509,0.7529,0.2941); @@ -2343,7 +2341,7 @@ var canvas_lowerECAM_fuel = { # TODO add LO indication # TODO fix amber/green at the same time when closed - if (tank1pump2.getValue() == 1) { + if (systems.FUEL.Switches.pumpCenter2.getValue() == 1) { me["FUEL-Pump-Center-2-Open"].show(); me["FUEL-Pump-Center-2-Closed"].hide(); me["FUEL-Pump-Center-2"].setColor(0.0509,0.7529,0.2941); @@ -2355,7 +2353,7 @@ var canvas_lowerECAM_fuel = { # TODO add LO indication # TODO fix amber/green at the same time when closed - if (tank2pump1.getValue() == 1) { + if (systems.FUEL.Switches.pumpRight1.getValue() == 1) { me["FUEL-Pump-Right-1-Open"].show(); me["FUEL-Pump-Right-1-Closed"].hide(); me["FUEL-Pump-Right-1"].setColor(0.0509,0.7529,0.2941); @@ -2367,7 +2365,7 @@ var canvas_lowerECAM_fuel = { # TODO add LO indication # TODO fix amber/green at the same time when closed - if (tank2pump2.getValue() == 1) { + if (systems.FUEL.Switches.pumpRight2.getValue() == 1) { me["FUEL-Pump-Right-2-Open"].show(); me["FUEL-Pump-Right-2-Closed"].hide(); me["FUEL-Pump-Right-2"].setColor(0.0509,0.7529,0.2941); @@ -2390,35 +2388,27 @@ var canvas_lowerECAM_fuel = { # Fuel Quantity # TODO add LO indication - if (fuel_left_quantity.getValue() >= 3170) { - me["FUEL-Left-Inner-quantity"].setText(sprintf("%s", math.round(fuel_left_quantity.getValue() - 1520, 10))); - me["FUEL-Left-Outer-quantity"].setText(sprintf("%s", 1520)); + me["FUEL-Left-Outer-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.leftOuter.getValue(), 10))); + me["FUEL-Left-Inner-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.leftInner.getValue(), 10))); + me["FUEL-Center-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.center.getValue(), 10))); + me["FUEL-Right-Inner-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.rightInner.getValue(), 10))); + me["FUEL-Right-Outer-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.rightOuter.getValue(), 10))); + + if (!systems.FUEL.Valves.transfer1.getValue()) { me["FUEL-Left-Transfer"].hide(); - } else if (fuel_left_quantity.getValue() >= 1650) { - me["FUEL-Left-Inner-quantity"].setText(sprintf("%s", 1650)); - me["FUEL-Left-Outer-quantity"].setText(sprintf("%s", math.round(fuel_left_quantity.getValue() - 1650, 10))); + } else { me["FUEL-Left-Transfer"].setColor(0.7333,0.3803,0); me["FUEL-Left-Transfer"].show(); - } else { - me["FUEL-Left-Inner-quantity"].setText(sprintf("%s", math.round(fuel_left_quantity.getValue()))); - me["FUEL-Left-Outer-quantity"].setText(sprintf("%s", 0)); - me["FUEL-Left-Transfer"].hide(); } - me["FUEL-Center-quantity"].setText(sprintf("%s", math.round(fuel_center_quantity.getValue()))); - if (fuel_right_quantity.getValue() >= 3170) { - me["FUEL-Right-Inner-quantity"].setText(sprintf("%s", math.round(fuel_right_quantity.getValue() - 1520, 10))); - me["FUEL-Right-Outer-quantity"].setText(sprintf("%s", 1520)); + + if (!systems.FUEL.Valves.transfer2.getValue()) { me["FUEL-Right-Transfer"].hide(); - } else if (fuel_right_quantity.getValue() >= 1650) { - me["FUEL-Right-Inner-quantity"].setText(sprintf("%s", 1650)); - me["FUEL-Right-Outer-quantity"].setText(sprintf("%s", math.round(fuel_right_quantity.getValue() - 1650, 10))); - me["FUEL-Right-Transfer"].show(); - me["FUEL-Right-Transfer"].setColor(0.7333,0.3803,0); } else { - me["FUEL-Right-Inner-quantity"].setText(sprintf("%s", math.round(fuel_right_quantity.getValue(), 10))); - me["FUEL-Right-Outer-quantity"].setText(sprintf("%s", 0)); - me["FUEL-Right-Transfer"].hide(); - } + me["FUEL-Right-Transfer"].setColor(0.7333,0.3803,0); + me["FUEL-Right-Transfer"].show(); + } + + # Hide not yet implemented features # TODO add them diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 59064b80..59ac5dd0 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -2335,7 +2335,7 @@ property-toggle - controls/fuel/x-feed + controls/fuel/switches/crossfeed nasal @@ -2350,7 +2350,7 @@ - systems/fuel/x-feed + systems/fuel/valves/crossfeed-valve 1 @@ -2366,7 +2366,7 @@ - controls/fuel/x-feed + controls/fuel/switches/crossfeed 1 @@ -2389,12 +2389,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-1 25 property-toggle - controls/fuel/tank0pump1 + controls/fuel/switches/pump-left-1 nasal @@ -2414,7 +2414,7 @@ 1 - controls/fuel/tank0pump1 + controls/fuel/switches/pump-left-1 1 @@ -2431,7 +2431,7 @@ - controls/fuel/tank0pump1 + controls/fuel/switches/pump-left-1 0 @@ -2454,12 +2454,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-1 25 property-toggle - controls/fuel/tank0pump2 + controls/fuel/switches/pump-left-2 nasal @@ -2479,7 +2479,7 @@ 1 - controls/fuel/tank0pump2 + controls/fuel/switches/pump-left-2 1 @@ -2496,7 +2496,7 @@ - controls/fuel/tank0pump2 + controls/fuel/switches/pump-left-2 0 @@ -2519,12 +2519,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-1 25 property-toggle - controls/fuel/tank1pump1 + controls/fuel/switches/pump-center-1 nasal @@ -2544,7 +2544,7 @@ 1 - controls/fuel/tank1pump1 + controls/fuel/switches/pump-center-1 1 @@ -2561,7 +2561,7 @@ - controls/fuel/tank1pump1 + controls/fuel/switches/pump-center-1 0 @@ -2572,7 +2572,7 @@ - + select @@ -2608,7 +2608,7 @@ 1 - controls/fuel/mode + controls/fuel/switches/center-mode 1 @@ -2625,7 +2625,7 @@ - controls/fuel/mode + controls/fuel/switches/center-mode 0 @@ -2648,12 +2648,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-2 25 property-toggle - controls/fuel/tank1pump2 + controls/fuel/switches/pump-center-2 nasal @@ -2673,7 +2673,7 @@ 1 - controls/fuel/tank1pump2 + controls/fuel/switches/pump-center-2 1 @@ -2690,7 +2690,7 @@ - controls/fuel/tank1pump2 + controls/fuel/switches/pump-center-2 0 @@ -2713,12 +2713,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-2 25 property-toggle - controls/fuel/tank2pump1 + controls/fuel/switches/pump-right-1 nasal @@ -2738,7 +2738,7 @@ 1 - controls/fuel/tank2pump1 + controls/fuel/switches/pump-right-1 1 @@ -2755,7 +2755,7 @@ - controls/fuel/tank2pump1 + controls/fuel/switches/pump-right-1 0 @@ -2778,12 +2778,12 @@ - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-2 25 property-toggle - controls/fuel/tank2pump2 + controls/fuel/switches/pump-right-2 nasal @@ -2803,7 +2803,7 @@ 1 - controls/fuel/tank2pump2 + controls/fuel/switches/pump-right-2 1 @@ -2820,7 +2820,7 @@ - controls/fuel/tank2pump2 + controls/fuel/switches/pump-right-2 0 diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index bf44e4c9..b531b6a6 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -1542,7 +1542,7 @@ var messages_right_memo = func { auto_brk_max.active = 0; } - if (getprop("/systems/fuel/x-feed") == 1 and getprop("controls/fuel/x-feed") == 1) { + if (getprop("/systems/fuel/valves/crossfeed-valve") == 1 and getprop("/controls/fuel/switches/crossfeed") == 1) { fuelx.active = 1; } else { fuelx.active = 0; diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas index b7b92f5c..fd4a1ad8 100644 --- a/Nasal/fuel.nas +++ b/Nasal/fuel.nas @@ -3,35 +3,64 @@ # Copyright (c) 2019 Joshua Davidson (Octal450) -var xfeed_sw = getprop("/controls/fuel/x-feed"); -var tank0pump1_sw = 0; -var tank0pump2_sw = 0; -var tank1pump1_sw = 0; -var tank1pump2_sw = 0; -var tank2pump1_sw = 0; -var tank2pump2_sw = 0; -var mode_sw = 0; -var xfeed = 0; -var ac1 = 0; -var ac2 = 0; -var gravityfeedL = 0; -var gravityfeedR = 0; -var gload = 0; -var gravityfeedL_output = 0; -var gravityfeedR_output = 0; -var tank0 = 0; -var tank1 = 0; -var tank2 = 0; -var gravityfeedL = 0; -var gravityfeedR = 0; -var tank0pump1_fail = 0; -var tank0pump2_fail = 0; -var tank1pump1_fail = 0; -var tank1pump2_fail = 0; -var tank2pump1_fail = 0; -var tank2pump2_fail = 0; - var FUEL = { + timeEngStart: 0, + cmdCtrOn: props.globals.getNode("/systems/fuel/ctr-pump-cmd-on-eng-start"), + + Fail: { + }, + Switches: { + centerTkMode: props.globals.getNode("/controls/fuel/switches/center-mode"), + crossfeed: props.globals.getNode("/controls/fuel/switches/crossfeed"), + pumpLeft1: props.globals.getNode("/controls/fuel/switches/pump-left-1"), + pumpLeft2: props.globals.getNode("/controls/fuel/switches/pump-left-2"), + pumpCenter1: props.globals.getNode("/controls/fuel/switches/pump-center-1"), + pumpCenter2: props.globals.getNode("/controls/fuel/switches/pump-center-2"), + pumpRight1: props.globals.getNode("/controls/fuel/switches/pump-right-1"), + pumpRight2: props.globals.getNode("/controls/fuel/switches/pump-right-2"), + }, + Valves: { + crossfeed: props.globals.getNode("/systems/fuel/valves/crossfeed-valve"), + lpValve1: props.globals.getNode("/systems/fuel/valves/engine-1-lp-valve"), + 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"), + }, + Quantity: { + leftOuter: props.globals.getNode("/consumables/fuel/tank[0]/level-lbs"), + leftInner: props.globals.getNode("/consumables/fuel/tank[1]/level-lbs"), + center: props.globals.getNode("/consumables/fuel/tank[2]/level-lbs"), + rightInner: props.globals.getNode("/consumables/fuel/tank[3]/level-lbs"), + rightOuter: props.globals.getNode("/consumables/fuel/tank[4]/level-lbs"), + }, + resetFail: func() { + + }, + init: func() { + + }, + loop: func() { + + }, +}; + +setlistener("/engines/engine[0]/state", func() { + if (pts.Engines.Engine1.state.getValue() == 3) { + FUEL.timeEngStart = pts.Sim.Time.elapsedSec.getValue(); + FUEL.cmdCtrOn.setValue(1); + ctrTkTimer.start(); + } +}, 0, 0); + +setlistener("/engines/engine[1]/state", func() { + if (pts.Engines.Engine2.state.getValue() == 3) { + FUEL.timeEngStart = pts.Sim.Time.elapsedSec.getValue(); + FUEL.cmdCtrOn.setValue(1); + ctrTkTimer.start(); + } +}, 0, 0); + +var FUELx = { init: func() { setprop("/systems/fuel/gravityfeedL", 0); setprop("/systems/fuel/gravityfeedR", 0); @@ -45,7 +74,7 @@ var FUEL = { setprop("/controls/fuel/tank2pump1", 0); setprop("/controls/fuel/tank2pump2", 0); setprop("/controls/fuel/mode", 1); - setprop("/systems/fuel/x-feed", 0); + setprop("/systems/fuel/valves/crossfeed-valve", 0); setprop("/systems/fuel/tank[0]/feed", 0); setprop("/systems/fuel/tank[1]/feed", 0); setprop("/systems/fuel/tank[2]/feed", 0); @@ -67,7 +96,7 @@ var FUEL = { tank2pump1_sw = getprop("/controls/fuel/tank2pump1"); tank2pump2_sw = getprop("/controls/fuel/tank2pump2"); mode_sw = getprop("/controls/fuel/mode"); - xfeed = getprop("/systems/fuel/x-feed"); + xfeed = getprop("/systems/fuel/valves/crossfeed-valve"); ac1 = getprop("/systems/electrical/bus/ac-1"); ac2 = getprop("/systems/electrical/bus/ac-2"); gravityfeedL = getprop("/systems/fuel/gravityfeedL"); @@ -124,9 +153,9 @@ var FUEL = { } if ((ac1 >= 110 or ac2 >= 110) and xfeed_sw) { - setprop("/systems/fuel/x-feed", 1); + setprop("/systems/fuel/valves/crossfeed-valve", 1); } else { - setprop("/systems/fuel/x-feed", 0); + setprop("/systems/fuel/valves/crossfeed-valve", 0); } tank0 = getprop("/systems/fuel/tank[0]/feed"); @@ -192,3 +221,10 @@ var FUEL = { } }, }; + +var ctrTkTimer = maketimer(0.5, func() { + if (pts.Sim.Time.elapsedSec.getValue() > (FUEL.timeEngStart + 120)) { + FUEL.cmdCtrOn.setValue(0); + ctrTkTimer.stop() + } +}); \ No newline at end of file diff --git a/Nasal/property-tree-setup.nas b/Nasal/property-tree-setup.nas index bfd30e9c..6c901144 100644 --- a/Nasal/property-tree-setup.nas +++ b/Nasal/property-tree-setup.nas @@ -29,11 +29,13 @@ var Engines = { epractual: props.globals.getNode("/engines/engine[0]/epr-actual"), n1actual: props.globals.getNode("/engines/engine[0]/n1-actual"), n2actual: props.globals.getNode("/engines/engine[0]/n2-actual"), + state: props.globals.getNode("/engines/engine[0]/state"), }, Engine2: { epractual: props.globals.getNode("/engines/engine[1]/epr-actual"), n1actual: props.globals.getNode("/engines/engine[1]/n1-actual"), n2actual: props.globals.getNode("/engines/engine[1]/n2-actual"), + state: props.globals.getNode("/engines/engine[1]/state"), }, }; diff --git a/Systems/a320-100-fuel.xml b/Systems/a320-100-fuel.xml index c84553c7..4225d107 100644 --- a/Systems/a320-100-fuel.xml +++ b/Systems/a320-100-fuel.xml @@ -1,2158 +1,417 @@ - + - + - + - fbw/roll/pid - fbw/pitch/g-pi - fbw/pitch/pid - fbw/yaw/tc-pd - fbw/spoiler-output - fbw/mixer/sidestick-gain-feedback - - - fbw/roll/p-gain - fbw/roll/i-gain - fbw/roll/d-gain - fbw/pitch/p-gain - fbw/pitch/i-gain - fbw/pitch/d-gain - fbw/yaw/yd-p-gain - fbw/yaw/tc-p-gain - fbw/yaw/tc-d-gain - - - fbw/fmgc/roll-cmd - fbw/fmgc/pitch-cmd - fbw/fmgc/yaw-cmd - - + + - - - - gear/unit[0]/WOW eq 1 - gear/unit[1]/WOW eq 1 - gear/unit[2]/WOW eq 1 - - - - - - - position/wow eq 1 - /it-fbw/law ne 0 - - - - - - - position/wow eq 1 - /it-fbw/law eq 2 - /it-fbw/law eq 3 - - - - - - - position/wow eq 1 - /it-fbw/law eq 2 - /it-fbw/law eq 3 - - - - - - - /it-autoflight/output/ap1 eq 1 - /it-autoflight/output/ap2 eq 1 - - - - - - - velocities/vc-kts - fbw/roll/gain-switch - - 0 1 - 140 -20.0 0.0 - 350 -5.0 0.0 - -
- - - - - - - velocities/vc-kts - fbw/roll/gain-switch - - 0 1 - 140 -35.0 0.0 - 350 -10.0 0.0 - -
- - - - - - - velocities/vc-kts - fbw/roll/gain-switch - - 0 1 - 140 -2.5 0.0 - 350 -0.5 0.0 - -
- - - - - - - velocities/vc-kts - fbw/pitch/gain-switch - - 0 1 - 140 28 0 - 350 20 0 - -
- - - - - - - velocities/vc-kts - fbw/pitch/gain-switch - - 0 1 - 140 60 0 - 350 40 0 - -
- - - - - - - velocities/vc-kts - fbw/pitch/gain-switch - - 0 1 - 140 2.0 0.0 - 350 0.4 0.0 - -
- - - - - - - velocities/vc-kts - fbw/yaw/gain-switch - - 0 1 - 140 -7.0 0.0 - 350 -1.2 0.0 - -
- - - - - - - velocities/vc-kts - fbw/yaw/gain-switch - - 0 1 - 140 3.0 0.0 - 350 1.5 0.0 - -
- - - - - - - velocities/vc-kts - fbw/yaw/gain-switch - - 0 1 - 140 6.0 0.0 - 350 3.0 0.0 - -
- - - - - Use D only to calculate rate of IAS - velocities/vc-kts - 0.0 - 0.0 - 1.0 - - - - fbw/pitch/vc-kts-rate - 1.0 - - - - - - position/wow eq 1 - fbw/mixer/sidestick-gain-feedback eq 1 - - - position/wow eq 1 - fbw/mixer/sidestick-gain-feedback ne 1 - - - position/wow eq 0 - fbw/mixer/sidestick-gain-feedback eq 0 - - - - - position/wow - fbw/mixer/rate-limit - fbw/mixer/sidestick-gain-feedback - - - - - - fbw/mixer/sidestick-gain - - 0 1 - 1 0 - -
- - - - - - - - - - - fbw/fmgc/enabled eq 1 - - - - - fbw/roll/a-i-f - - - -1 - - - - 1 - - - - /controls/flight/aileron-input-fast - - - - - - /controls/flight/aileron - - -1.00 -1 - -0.04 0 - 0.04 0 - 1.00 1 - -
- - - - - - - fbw/fmgc/enabled eq 0 - - - position/wow eq 0 - fbw/fmgc/enabled eq 1 - - - - - fbw/roll/a-i-s - - - -1 - - - - 1 - - - - /controls/flight/aileron-input - - - - - - - fbw/roll/a-i - 0.261799 - - - attitude/roll-rad - fbw/roll/a-i - - -1 0 1 - -0.575959 0.261799 0.000000 0.000000 - -0.488692 0.000000 0.000000 0.000000 - 0.488692 0.000000 0.000000 0.000000 - 0.575959 0.000000 0.000000 -0.261799 - -
- - attitude/roll-rad - - -0.750492 0.261799 - -0.575959 0.000000 - 0.575959 0.000000 - 0.750492 -0.261799 - -
- - - - - - - - - fbw/roll/a-i - 0.261799 - - - attitude/roll-rad - fbw/roll/a-i - - -1.0 0.0 1.0 - -1.169370 0.261799 0.000000 0.000000 - -1.082100 0.000000 0.000000 0.000000 - 1.082100 0.000000 0.000000 0.000000 - 1.169370 0.000000 0.000000 -0.261799 - -
- - attitude/roll-rad - - -1.343900 0.261799 - -1.169370 0.000000 - 1.169370 0.000000 - 1.343900 -0.261799 - -
- - - - - - - - attitude/roll-rad - - -1.169370 0.436332 - -0.698132 0.174533 - -0.575959 0.000000 - 0.575959 0.000000 - 0.698132 -0.174533 - 1.169370 -0.436332 - -
- - - - - - - attitude/roll-rad lt 0 - fbw/roll/r-r-33 ge fbw/roll/r-r-rb-f - - - attitude/roll-rad gt 0 - fbw/roll/r-r-33 le fbw/roll/r-r-rb-f - - - - - - - - fbw/roll/a-i - 0.261799 - - - attitude/roll-rad - fbw/roll/a-i - - -1 0 1 - -0.698132 0.261799 0.000000 0.000000 - -0.610865 0.000000 0.000000 0.000000 - 0.610865 0.000000 0.000000 0.000000 - 0.698132 0.000000 0.000000 -0.261799 - -
- - - - - - - - attitude/roll-rad - - -0.698132 0.436332 - -0.261799 0.174533 - 0.000000 0.000000 - 0.261799 -0.174533 - 0.698132 -0.436332 - -
- - - - - - - /it-fbw/roll-lim eq 33 - /it-fbw/roll-back ne 1 - /it-fbw/protections/overspeed ne 1 - - - /it-fbw/roll-lim eq 67 - /it-fbw/protections/overspeed ne 1 - - - /it-fbw/roll-back eq 1 - /it-fbw/protections/overspeed ne 1 - - - /it-fbw/protections/overspeed eq 1 - /it-fbw/protections/overspeed-roll-back ne 1 - - - /it-fbw/protections/overspeed eq 1 - /it-fbw/protections/overspeed-roll-back eq 1 - - - - - fbw/roll/rate-demand - 16.4 - - - - - - /orientation/roll-rate-degps - - - - - - - - gear/unit[0]/WOW eq 1 - - - - - fbw/roll/p-r_s-s - -fbw/roll/rate-demand-lag - - - - - - fbw/roll/gain-switch gt 0 - - - fbw/roll/pid le -0.999 - fbw/roll/pid ge 0.999 - - - - - fbw/roll/rate-error - fbw/roll/p-gain - fbw/roll/i-gain - fbw/roll/d-gain - fbw/roll/trigger - - -1.0 - 1.0 - - fbw/roll/pid - - - - - - position/wow eq 1 - /it-fbw/law eq 1 - /it-fbw/law eq 2 - - - - - - - - /orientation/roll-deg - - -30 -30 - -1 0 - 0 0 - 1 0 - 30 30 - -
- -0.1 - - - - - - fbw/roll/pid - fbw/mixer/computer-gain - - - - fbw/roll/a-i-f - fbw/mixer/sidestick-gain - - - - fbw/mixer/roll/computer-demand - fbw/mixer/roll/sidestick-demand - - -1.0 - 1.0 - - - - - - - position/wow eq 0 - /it-fbw/law eq 0 - - - fbw/fmgc/enabled eq 0 - fbw/roll/gear-law-switch eq 1 - - - fbw/fmgc/enabled eq 1 - position/wow eq 1 - /it-fbw/law eq 0 - - - /it-fbw/law eq 3 - - - - - - - position/wow eq 0 - /it-fbw/law eq 0 - - - fbw/roll/gear-law-switch eq 1 - - - /it-fbw/law eq 3 - - - - - - - - fbw/roll/s-i-f-i - - -1.0 -1.0 - -0.2 0.0 - 0.2 0.0 - 1.0 1.0 - -
- - velocities/vc-kts - position/wow - - 0 1 - 140 0.5 1.0 - 350 0.1 1.0 - -
- - - - - - - - /it-fbw/roll-back eq 0 - - - - - - - /it-fbw/law ne 3 - /systems/failures/aileron-left eq 0 - - - /it-fbw/law ne 3 - /systems/failures/aileron-left eq 1 - - - - - - - /it-fbw/law ne 3 - /systems/failures/aileron-right eq 0 - - - /it-fbw/law ne 3 - /systems/failures/aileron-right eq 1 - - - - - /controls/flight/aileron - 20 - - - - - - - - - - /it-fbw/law eq 0 - /it-fbw/protections/overspeed eq 1 - - - - - - - fbw/fmgc/enabled eq 1 - - - -1.0 - fbw/pitch/elevator-max - - - - - fbw/pitch/e-i-f - - - -1 - - - - 1 - - - - /controls/flight/elevator-input-fast - - - - - - /controls/flight/elevator - - -1.00 -1 - -0.04 0 - 0.04 0 - 1.00 1 - -
- - - - - - - fbw/pitch/elevator-nul - - /position/gear-agl-ft - - 5 0.2 - 30 0.1 - -
- - - - - - - - fbw/pitch/elevator-nul - -0.15 - - - - - - - - gear/unit[1]/WOW eq 1 - gear/unit[2]/WOW eq 1 - - - - - - - fbw/fmgc/enabled eq 0 - /position/gear-agl-ft le 30 - /controls/flight/flap-pos ge 4 - /controls/engines/engine[0]/throttle lt 0.65 - /controls/engines/engine[1]/throttle lt 0.65 - /FMGC/status/to-state eq 0 - /it-fbw/law eq 0 - position/wow eq 0 - - - fbw/fmgc/enabled eq 0 - /position/gear-agl-ft le 30 - /controls/flight/flap-pos ge 4 - /controls/engines/engine[0]/throttle lt 0.65 - /controls/engines/engine[1]/throttle lt 0.65 - /FMGC/status/to-state eq 0 - /it-fbw/law eq 0 - gear/unit[0]/WOW eq 0 - fbw/pitch/flare-gear-switch eq 1 - - - fbw/fmgc/enabled eq 1 - position/wow eq 0 - - - fbw/fmgc/enabled eq 1 - position/wow eq 1 - - - -1.0 - fbw/pitch/elevator-max - - - - - fbw/pitch/e-i-s - - - -1 - - - - 1 - - - - /controls/flight/elevator-input - - - - - - /controls/flight/flap-pos ne 0 - - - - - - - /controls/flight/flap-pos ne 0 - - - - - - - fbw/pitch/e-i - - -1.0 2.5 - 0.0 1.0 - 1.0 -0.5 - -
- - - fbw/pitch/g-min - fbw/pitch/g-max - - - - - /accelerations/pilot-g - 1.0 - - - - - - fbw/pitch/g-instrumented - - -1 - - attitude/roll-rad - - - 1 - - - - - - fbw/pitch/g-computed - -fbw/pitch/g-demand - - - - - - fbw/pitch/g-pi - -1.0 - - - - - - attitude/roll-rad lt -1.5708 - attitude/roll-rad gt 1.5708 - - - - - - - - - - fbw/pitch/g-pi-switched - -0.087266 - - - attitude/pitch-rad - fbw/pitch/g-pi-switched - - -1 0 1 - -0.261799 0.000000 0.000000 0.087266 - -0.174533 0.000000 0.000000 0.000000 - 0.436332 0.000000 0.000000 0.000000 - 0.523599 -0.087266 0.000000 0.000000 - -
- - attitude/pitch-rad - - -0.436332 0.087266 - -0.261799 0.000000 - 0.523599 0.000000 - 0.698132 -0.087266 - -
- - - - - - fbw/pitch/g-pi-switched - -0.087266 - - - - - - - fbw/pitch/g-pi-switched - fbw/pitch/vc-kts-rate-lag - - -2 -1 - -1.0 0.087266 0.087266 - 0.0 0.000000 0.026180 - -
- - attitude/pitch-rad - fbw/pitch/g-pi-switched - - -1 0 - 0.436332 -0.026180 0.000000 - 0.523599 -0.087266 0.000000 - -
- - attitude/pitch-rad - - 0.523599 0.000000 - 0.698132 -0.087266 - -
- - - - - - - - fbw/pitch/g-pi-switched - fbw/pitch/vc-kts-rate-lag - - -2 -1 - -1.0 0.087266 0.087266 - 0.0 0.000000 0.026180 - 1.0 -0.061086 -0.087266 - -
- - - - - - - /it-fbw/law eq 0 - /it-fbw/protections/overspeed ne 1 - - - /it-fbw/law ne 0 - /it-fbw/protections/overspeed ne 1 - - - /it-fbw/law eq 0 - /it-fbw/protections/overspeed eq 1 - - - /it-fbw/law ne 0 - /it-fbw/protections/overspeed eq 1 - - - - - fbw/pitch/rate-demand - 10.1 - - - - - - /orientation/pitch-rate-degps - - - - - - - - gear/unit[0]/WOW eq 1 - - - - - fbw/pitch/t-r_s-s - -fbw/pitch/rate-demand-lag - - - - - - fbw/pitch/gain-switch gt 0 - - - fbw/pitch/pid le -0.999 - fbw/pitch/pid ge 0.999 - - - - - fbw/pitch/rate-error - fbw/pitch/p-gain - fbw/pitch/i-gain - fbw/pitch/d-gain - fbw/pitch/trigger - - -1.0 - 1.0 - - fbw/pitch/pid - - - - fbw/pitch/pid - -1.0 - - - - - - attitude/roll-rad lt -1.5708 - attitude/roll-rad gt 1.5708 - - - - - - - /it-fbw/law eq 0 - /it-fbw/law eq 1 - - - - - - - gear/unit[1]/WOW eq 1 - gear/unit[2]/WOW eq 1 - /it-fbw/law eq 2 - - - - - fbw/pitch/pid-switched - fbw/mixer/computer-gain - - - - fbw/pitch/e-i-f - fbw/mixer/sidestick-gain - - - - fbw/mixer/pitch/computer-demand - fbw/mixer/pitch/sidestick-demand - - -1.0 - 1.0 - - - - - - - position/wow eq 0 - fbw/pitch/law-switch eq 1 - - - fbw/fmgc/enabled eq 0 - fbw/pitch/law-gear-switch eq 1 - - - fbw/fmgc/enabled eq 1 - position/wow eq 1 - gear/unit[0]/WOW eq 0 - - - fbw/fmgc/enabled eq 1 - position/wow eq 1 - - - /it-fbw/law eq 3 - - - - - /controls/flight/elevator - 20 - - - - - - fbw/fmgc/enabled eq 1 - - - - + - fbw/pitch/gain-switch eq 0 - /position/gear-agl-ft ge fbw/pitch/autotrim-height - attitude/roll-rad lt 0.628319 - attitude/roll-rad gt -0.628319 - fbw/pitch/pid-switched ge 0.01 - fbw/pitch/g-instrumented ge 0.5 - /it-fbw/protections/overspeed ne 1 - /controls/flight/elevator-trim le 0.32 - position/wow eq 0 - - - fbw/pitch/gain-switch eq 0 - /position/gear-agl-ft ge fbw/pitch/autotrim-height - attitude/roll-rad lt 0.628319 - attitude/roll-rad gt -0.628319 - fbw/pitch/pid-switched le -0.01 - fbw/pitch/g-instrumented ge 0.5 - /it-fbw/protections/overspeed ne 1 - /controls/flight/elevator-trim ge -1.0 - position/wow eq 0 + /systems/fuel/pumps/all-eng-pump-off eq 1 + + /systems/electrical/bus/ac-ess-shed ge 110 + /systems/electrical/bus/ac-si-bus ge 110 + - - - - - - fbw/pitch/autotrim-switch - 1 - - - fbw/pitch/pid-switched - - 0.05 0.00001 - 0.30 0.00015 - -
- 0.0 - - - - fbw/pitch/autotrim-switch - 2 - - - fbw/pitch/pid-switched - - -0.30 -0.00015 - -0.05 -0.00001 - -
- 0.0 - - - - - - - - - /controls/flight/elevator-trim - fbw/pitch/autotrim-offset - - - - -1.0 - 0.32 - - /controls/flight/elevator-trim - - - - - - - - - - velocities/vc-kts - - 160.00 25.000 - 162.15 23.649 - 165.02 22.226 - 168.64 21.015 - 172.25 19.734 - 176.59 18.595 - 181.67 17.525 - 186.75 16.385 - 191.83 15.316 - 197.65 14.318 - 205.65 13.247 - 212.93 12.318 - 219.48 11.462 - 227.48 10.533 - 236.96 9.7450 - 246.43 8.8863 - 255.18 8.0990 - 266.12 7.4525 - 277.06 6.7704 - 288.00 6.0884 - 299.67 5.5124 - 311.35 5.0075 - 323.03 4.5736 - 335.44 4.2104 - 347.13 3.9186 - 358.81 3.6979 - 370.50 3.5482 - 380.00 3.4000 - -
- - - - - - - /systems/fctl/fac1 eq 1 - /systems/fctl/fac2 eq 1 - /gear/gear[1]/wow eq 0 - /gear/gear[2]/wow eq 0 - - - /controls/flight/slats eq 0 - /gear/gear[1]/wow eq 0 - /gear/gear[2]/wow eq 0 - - - - - fbw/yaw/max-deg-switch - - -25 - 25 - - - -1 - 1 - - - - - fbw/yaw/max-deg-scale - -1.0 - - - - - - /controls/flight/rudder - fbw/fmgc/enabled - - 0 1 - -1.00 -1 0 - -0.04 0 0 - 0.04 0 0 - 1.00 1 0 - -
- - - - - - - - fbw/yaw/rudder-nul - fbw/yaw/max-deg-switch - - 25.0 - - - - - + - fbw/fmgc/enabled eq 1 - /it-autoflight/output/lat eq 4 + /controls/fuel/switches/pump-left-1 eq 1 + + + /systems/electrical/sources/idg-1/pmg-volt ge 110 + /controls/electrical/switches/gen-1-line-contactor eq 1 + + /systems/electrical/bus/ac-1 ge 110 + - - velocities/r-rad_sec - 0.5 - - - - - - position/wow eq 1 - /position/gear-agl-ft lt 50 - fbw/yaw/autoland-switch eq 1 - - - - - fbw/yaw/r-r_s-s - fbw/yaw/yd-p-gain - - -0.5 - 0.5 - - - - - - - position/wow eq 1 - fbw/yaw/rudder-nul gt 0 - fbw/yaw/rudder-nul lt 0 - - - - - fbw/yaw/slip-skid - fbw/yaw/tc-p-gain - 0.0 - fbw/yaw/tc-d-gain - - -0.4 - 0.4 - - fbw/yaw/tc-pd - - - - - - position/wow eq 1 - fbw/yaw/rudder-nul gt 0 - fbw/yaw/rudder-nul lt 0 - - - - + - - fbw/yaw/autoland-switch eq 1 - - - - - fbw/yaw/yd-f - fbw/yaw/tc-pd-s - fbw/yaw/fmgc-cmd - - - - - - /it-fbw/law eq 0 - /it-fbw/law eq 1 - - - - - - - fbw/yaw/law-switch eq 1 - fbw/yaw/rudder-nul eq 0 - - /controls/flight/rudder-fbw - - - - /controls/flight/rudder - 20 - - - - - - - - - - /velocities/airspeed-kt - - 62 1.0 - 116 0.0 - -
- - - - - - - /velocities/airspeed-kt - - 72 1.0 - 121 0.0 - -
- - - - - fbw/spoiler-output - 0.9 - 2.5 - - - - - - spoilers/anti-droop-cmd - - 0.5 0.0 - 1.0 1.0 - -
- - - - - - - - - - - -1 - fbw/aileron-output - - - - - - - - fbw/aileron-output - - /fdm/jsbsim/fcs/flap-pos-deg - - 1 0.00 - 5 0.26 - -
- - - - - - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/blue-psi ge 1500 - - - - - - - hydraulics/aileron-l/pressure-switch-or eq 1 - spoilers/anti-droop-final ne 0 - /gear/gear[1]/wow eq 1 - /gear/gear[2]/wow eq 1 - /systems/failures/aileron-left eq 0 - - - hydraulics/aileron-l/pressure-switch-or eq 1 - /systems/failures/aileron-left eq 0 - - - -1.0 - 1.0 - - - - - hydraulics/aileron-l/switch - - -25 - 25 - - - - - hydraulics/aileron-l/cmd-deg - 82 - 26.5 - hydraulics/aileron-l/final-deg - - - - - - - - - - - 1 - fbw/aileron-output - - -1.0 - - - - - - - - - fbw/aileron-output - -1.0 - - - /fdm/jsbsim/fcs/flap-pos-deg - - 1 0.00 - 5 0.26 - -
- - - - - - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/blue-psi ge 1500 - - - - - - - hydraulics/aileron-r/pressure-switch-or eq 1 - spoilers/anti-droop-final ne 0 - /gear/gear[1]/wow eq 1 - /gear/gear[2]/wow eq 1 - /systems/failures/aileron-right eq 0 - - - hydraulics/aileron-r/pressure-switch-or eq 1 - /systems/failures/aileron-right eq 0 - - - -1.0 - 1.0 - - - - - hydraulics/aileron-r/switch - - -25 - 25 - - - - - hydraulics/aileron-r/cmd-deg - 82 - 26.5 - hydraulics/aileron-r/final-deg - - - - - - - - fbw/elevator-output - - -0.6666666666666666666666666666666 - 1.0 - - - - - - - /velocities/groundspeed-kt lt 75 - - - - - - - - - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/blue-psi ge 1500 - - - - - - - hydraulics/elevator-l/pressure-switch-or eq 1 - /systems/failures/elevator-left eq 0 - - - -1.0 - 1.0 - - - - - hydraulics/elevator-l/switch - - -30 - 17 - - - - - hydraulics/elevator-l/cmd-deg - 82 - 26.5 - hydraulics/elevator-l/final-deg - - - - - - - - - - /systems/hydraulic/yellow-psi ge 1500 - /systems/hydraulic/blue-psi ge 1500 - - - - - - - hydraulics/elevator-r/pressure-switch-or eq 1 - /systems/failures/elevator-right eq 0 - - - -1.0 - 1.0 - - - - - hydraulics/elevator-r/switch - - -30 - 17 - - - - - hydraulics/elevator-r/cmd-deg - 82 - 26.5 - hydraulics/elevator-r/final-deg - - - - - - - - - - /systems/hydraulic/green-psi ge 1500 - - - - - /controls/flight/elevator-trim - - -1.00 - 0.32 - - - -12.5 - 4.0 - - - - - hydraulics/elevator-trim/cmd-deg - hydraulics/elevator-trim/rate - 22.5 - hydraulics/elevator-trim/final-deg - - - - - - - - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/blue-psi ge 1500 - /systems/hydraulic/yellow-psi ge 1500 - - - - - /controls/flight/rudder-trim - - -1.0 - 1.0 - - - -20.0 - 20.0 - - - - - /controls/flight/rudder-trim - - -0.8 - 0.8 - - - - - fbw/rudder-output - hydraulics/rudder/trim-norm - - -1 - 1 - - - - - - - hydraulics/rudder/pressure-switch-or eq 1 - /systems/failures/rudder eq 0 - - - fbw/yaw/max-deg-scale-neg - fbw/yaw/max-deg-scale - - - - - hydraulics/rudder/switch - - -25 - 25 - - - - - hydraulics/rudder/cmd-deg - 80 - 25.5 - hydraulics/rudder/final-deg - - - - - - - - /controls/engines/engine[0]/throttle-output - 0.95 - fcs/throttle-pos-norm[0] - - - - /controls/engines/engine[1]/throttle-output - 0.95 - fcs/throttle-pos-norm[1] - - - - /engines/engine[0]/n1 - 2.25 - /engines/engine[0]/n1-actual - /engines/engine[3]/n1 - - - - /engines/engine[1]/n1 - 2.25 - /engines/engine[1]/n1-actual - /engines/engine[4]/n1 - - - - /engines/engine[0]/n2 - 2.25 - /engines/engine[0]/n2-actual - /engines/engine[3]/n2 - - - - /engines/engine[1]/n2 - 2.25 - /engines/engine[1]/n2-actual - /engines/engine[4]/n2 - - - - /controls/engines/engine[0]/throttle-lever - 20 - - - - /controls/engines/engine[1]/throttle-lever - 20 - - - - /controls/engines/engine[0]/reverser - 20 - - - - /controls/engines/engine[1]/reverser - 20 - - - - /controls/engines/engine[0]/throttle-rev - 20 - - - - /controls/engines/engine[1]/throttle-rev - 20 - - - - /controls/engines/engine[0]/cutoff-switch - 20 - - - - /controls/engines/engine[1]/cutoff-switch - 20 - - - - - - - - /controls/flight/flap-lever - 20 - - - - - - /systems/electrical/bus/dc-ess ge 25 - - - - - - - /systems/electrical/bus/dc-2 ge 25 - - - - - - - - - /controls/flight/flaps - 35.0 - - - - - - /systems/acconfig/autoconfig-running eq 1 - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/yellow-psi ge 1500 - fcs/sfcc/unit1-avail eq 1 - fcs/sfcc/unit2-avail eq 1 - - - /systems/hydraulic/green-psi ge 1500 - fcs/sfcc/unit1-avail eq 1 - fcs/sfcc/unit2-avail eq 0 - - - /systems/hydraulic/yellow-psi ge 1500 - fcs/sfcc/unit1-avail eq 0 - fcs/sfcc/unit2-avail eq 1 - - - /systems/hydraulic/green-psi ge 1500 - /systems/hydraulic/yellow-psi lt 1500 - - - /systems/hydraulic/green-psi lt 1500 - /systems/hydraulic/yellow-psi ge 1500 - - - - - fcs/flap-pos-gain - fcs/flap-pos-rate - fcs/flap-pos-deg - - - - fcs/flap-pos-deg - - 0 - 35 - - - 0 - 1 - - fcs/flap-pos-norm - - - - - - - - /controls/flight/slats - 27.0 - - - - - - /systems/acconfig/autoconfig-running eq 1 - - - /systems/hydraulic/blue-psi ge 1500 - /systems/hydraulic/green-psi ge 1500 - fcs/sfcc/unit1-avail eq 1 - fcs/sfcc/unit2-avail eq 1 - - - /systems/hydraulic/blue-psi ge 1500 - fcs/sfcc/unit1-avail eq 1 - fcs/sfcc/unit2-avail eq 0 - - - /systems/hydraulic/green-psi ge 1500 - fcs/sfcc/unit1-avail eq 0 - fcs/sfcc/unit2-avail eq 1 - - - /systems/hydraulic/blue-psi ge 1500 - /systems/hydraulic/green-psi lt 1500 - - - /systems/hydraulic/blue-psi lt 1500 - /systems/hydraulic/green-psi ge 1500 - - - - - fcs/slat-pos-gain - fcs/slat-pos-rate - fcs/slat-pos-deg - - - - fcs/slat-pos-deg - - 0 - 27 - - - 0 - 1 - - fcs/slat-pos-norm - - - - - - - - gear/gear-cmd-norm - - - 0 - - - - 1 - - - - gear/gear-pos-norm - - - - - - - - - - fbw/fmgc/enabled eq 0 - /controls/flight/aileron-drives-tiller eq 1 - - - fbw/fmgc/enabled eq 1 - - - - - - - /systems/electrical/bus/ac-1 ge 110 + + /controls/fuel/switches/pump-left-2 eq 1 /systems/electrical/bus/ac-2 ge 110 - /systems/electrical/bus/dc-1 ge 25 + + + + + + + /controls/fuel/switches/pump-right-1 eq 1 + + + /systems/electrical/sources/idg-1/pmg-volt ge 110 + /controls/electrical/switches/gen-1-line-contactor eq 1 + + /systems/electrical/bus/ac-1 ge 110 + + + + + + + + /controls/fuel/switches/pump-right-2 eq 1 + /systems/electrical/bus/ac-2 ge 110 + + + + + + + /systems/fuel/left-inner-full eq 1 + propulsion/tank[1]/contents-lbs lt 11420 + propulsion/tank[1]/contents-lbs ge 10300 + + + propulsion/tank[1]/contents-lbs eq 11420 + + + + + + + /systems/fuel/right-inner-full eq 1 + propulsion/tank[2]/contents-lbs lt 11420 + propulsion/tank[2]/contents-lbs ge 10300 + + + propulsion/tank[2]/contents-lbs eq 11420 + + + + + + + /systems/fuel/pumps/wing-pump-left-1-operate eq 0 + /systems/fuel/pumps/wing-pump-left-2-operate eq 0 + /systems/fuel/pumps/wing-pump-right-1-operate eq 0 + /systems/fuel/pumps/wing-pump-right-2-operate eq 0 + + + + + + + propulsion/tank[1]/contents-lbs le 1650 + + + + + + + propulsion/tank[2]/contents-lbs le 1650 + + + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-1-cmd eq 1 + /systems/fuel/refuel/refuelling eq 0 + + + /systems/fuel/quantity/left-wing-inner-low eq 1 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/outer-inner-transfer-valve-1-cmd + /systems/fuel/valves/outer-inner-transfer-valve-1-power + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-2-cmd eq 1 + /systems/fuel/refuel/refuelling eq 0 + + + /systems/fuel/quantity/right-wing-inner-low eq 1 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/outer-inner-transfer-valve-2-cmd + /systems/fuel/valves/outer-inner-transfer-valve-2-power + + + + + + + /controls/fuel/switches/crossfeed eq 1 + + + + + + + /systems/electrical/bus/dc-2 ge 25 + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/crossfeed-valve-cmd + /systems/fuel/valves/crossfeed-valve-power + + + + + + + /controls/engines/engine[0]/fire-btn eq 0 + /controls/engines/engine[0]/cutoff-switch eq 0 + + + + + + + /systems/electrical/bus/dc-ess-shed ge 25 /systems/electrical/bus/dc-2 ge 25 - - - - position/wow eq 1 - hydraulics/tiller/elec-pwr eq 1 - /systems/hydraulic/yellow-psi ge 1500 - /sim/model/autopush/connected eq 0 - /controls/gear/nws-switch eq 1 - /engines/engine[0]/state eq 3 - - - position/wow eq 1 - hydraulics/tiller/elec-pwr eq 1 - /systems/hydraulic/yellow-psi ge 1500 - /sim/model/autopush/connected eq 0 - /controls/gear/nws-switch eq 1 - /engines/engine[1]/state eq 3 - - - - - - - - /sim/model/autopush/connected - 1 - - - hydraulics/tiller/autopush-cmd - 75 - - - /velocities/groundspeed-kt - hydraulics/tiller/switch - - -1 0 1 - 0.500 0 0 0 - 1.000 -75 0 75 - 30.000 -47 0 47 - 30.001 -6 0 6 - 135.000 0 0 0 - -
- - - - - - - - hydraulics/tiller/hyd-pwr eq 1 - /sim/model/autopush/connected eq 1 - /systems/acconfig/autoconfig-running eq 1 - - - - - hydraulics/tiller/function - fcs/steer-rate - fcs/steer-pos-deg[0] + + /systems/fuel/valves/engine-1-lp-valve-cmd + /systems/fuel/valves/engine-1-lp-valve-power - + - - /sim/model/autopush/connected eq 1 + + /controls/engines/engine[1]/fire-btn eq 0 + /controls/engines/engine[1]/cutoff-switch eq 0 - - - - - - /controls/gear/brake-parking - 20 - + + + + /systems/electrical/bus/dc-ess-shed ge 25 + /systems/electrical/bus/dc-2 ge 25 + + - - /services/chocks/nose - 0.5 + + /systems/fuel/valves/engine-2-lp-valve-cmd + /systems/fuel/valves/engine-2-lp-valve-power + + + + + + /controls/APU/master eq 1 + /controls/APU/fire-btn eq 0 + + + + + + + /systems/electrical/bus/dc-bat ge 25 + /systems/electrical/bus/dc-hot-1 ge 25 + + + + + /systems/fuel/valves/apu-lp-valve-cmd + /systems/fuel/valves/apu-lp-valve-power + + + + + + /systems/fuel/pumps/apu-operate + 25.3 - - /controls/gear/brake-left - /controls/gear/brake-parking - /services/chocks/nose-half - /services/chocks/left - - 0 - 1 - - + + /systems/fuel/pumps/apu-psi-cmd + 5 + 10 + - - - - /controls/autobrake/active eq 1 - - fcs/left-brake-cmd-norm - + + /systems/fuel/pumps/wing-pump-left-1-operate + 25.3 + - - /controls/gear/brake-right - /controls/gear/brake-parking - /services/chocks/nose-half - /services/chocks/right - - 0 - 1 - - + + /systems/fuel/pumps/wing-pump-left-1-psi-cmd + 5 + 10 + - - - - /controls/autobrake/active eq 1 - - fcs/right-brake-cmd-norm - + + /systems/fuel/pumps/wing-pump-left-2-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-left-2-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-right-1-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-right-1-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-right-2-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-right-2-psi-cmd + 5 + 10 + + + + + + + + /systems/fuel/pumps/wing-pump-left-1-operate eq 1 + /systems/fuel/pumps/wing-pump-left-2-operate eq 1 + + + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/pumps/wing-pump-right-1-operate eq 1 + /systems/fuel/pumps/wing-pump-right-2-operate eq 1 + + + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/feed-left-inner eq 1 + propulsion/tank[1]/contents-lbs gt 31.24 + propulsion/tank[4]/contents-lbs lt 9 + + + + + + + /systems/fuel/valves/crossfeed-valve eq 1 + propulsion/tank[2]/contents-lbs gt 31.24 + propulsion/tank[4]/contents-lbs lt 9 + + + + + + + /systems/fuel/valves/crossfeed-valve eq 1 + /systems/fuel/feed-left-inner eq 1 + propulsion/tank[1]/contents-lbs gt 31.24 + propulsion/tank[5]/contents-lbs lt 9 + + + + + + + /systems/fuel/feed-right-inner eq 1 + propulsion/tank[2]/contents-lbs gt 31.24 + propulsion/tank[5]/contents-lbs lt 9 + + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-1 eq 1 + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-2 eq 1 + /accelerations/pilot-gdamped ge 0.5 + + + + + -/systems/fuel/internal/left-wing-outer-to-inner-tank + propulsion/tank[0]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-outer-to-inner-tank + -/systems/fuel/internal/left-wing-tank-eng-1 + -/systems/fuel/internal/left-wing-tank-eng-2 + propulsion/tank[1]/external-flow-rate-pps + + + + /systems/fuel/internal/right-wing-outer-to-inner-tank + -/systems/fuel/internal/right-wing-tank-eng-1 + -/systems/fuel/internal/right-wing-tank-eng-2 + propulsion/tank[2]/external-flow-rate-pps + + + + -/systems/fuel/internal/right-wing-outer-to-inner-tank + propulsion/tank[3]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-tank-eng-1 + /systems/fuel/internal/right-wing-tank-eng-1 + propulsion/tank[4]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-tank-eng-2 + /systems/fuel/internal/right-wing-tank-eng-2 + propulsion/tank[5]/external-flow-rate-pps + diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml index 02eef2ee..8200282d 100644 --- a/Systems/a320-fuel.xml +++ b/Systems/a320-fuel.xml @@ -6,10 +6,22 @@ + + + + + /systems/fuel/pumps/all-eng-pump-off eq 1 + + /systems/electrical/bus/ac-ess-shed ge 110 + /systems/electrical/bus/ac-si-bus ge 110 + + + + - /controls/switches/fuel/pump-left-1 eq 1 + /controls/fuel/switches/pump-left-1 eq 1 /systems/electrical/sources/idg-1/pmg-volt ge 110 @@ -23,7 +35,7 @@ - /controls/switches/fuel/pump-left-2 eq 1 + /controls/fuel/switches/pump-left-2 eq 1 /systems/electrical/bus/ac-2 ge 110 @@ -31,7 +43,7 @@ - /controls/switches/fuel/pump-right-1 eq 1 + /controls/fuel/switches/pump-right-1 eq 1 /systems/electrical/sources/idg-1/pmg-volt ge 110 @@ -45,21 +57,48 @@ - /controls/switches/fuel/pump-right-2 eq 1 + /controls/fuel/switches/pump-right-2 eq 1 /systems/electrical/bus/ac-2 ge 110 + + + + /systems/fuel/left-inner-full eq 1 + propulsion/tank[1]/contents-lbs lt 11420 + propulsion/tank[1]/contents-lbs ge 10300 + + + propulsion/tank[1]/contents-lbs eq 11420 + + + + + + + /systems/fuel/right-inner-full eq 1 + propulsion/tank[3]/contents-lbs lt 11420 + propulsion/tank[3]/contents-lbs ge 10300 + + + propulsion/tank[3]/contents-lbs eq 11420 + + + - /controls/switches/fuel/pump-center-1 eq 1 + /controls/fuel/switches/pump-center-1 eq 1 - /controls/switches/fuel/center-mode eq 0 - - fcs/slat-pos-deg lt 16 - /systems/fuel/pumps/center-control-low-level ne 1 - propulsion/tank[1]/contents-lbs lt 11420 + /controls/fuel/switches/center-mode eq 0 + + /systems/fuel/ctr-pump-cmd-on-eng-start eq 1 + + fcs/slat-pos-deg lt 16 + /systems/fuel/pumps/center-control-low-level ne 1 + /systems/fuel/left-inner-full ne 1 + /systems/electrical/bus/ac-1 ge 110 @@ -69,19 +108,55 @@ - /controls/switches/fuel/pump-center-3 eq 1 + /controls/fuel/switches/pump-center-2 eq 1 - /controls/switches/fuel/center-mode eq 0 - - fcs/slat-pos-deg lt 16 - /systems/fuel/pumps/center-control-low-level ne 1 - propulsion/tank[3]/contents-lbs lt 11420 + /controls/fuel/switches/center-mode eq 0 + + /systems/fuel/ctr-pump-cmd-on-eng-start eq 1 + + fcs/slat-pos-deg lt 16 + /systems/fuel/pumps/center-control-low-level ne 1 + /systems/fuel/right-inner-full ne 1 + /systems/electrical/bus/ac-2 ge 110 + + + + /systems/fuel/pumps/wing-pump-left-1-operate eq 0 + /systems/fuel/pumps/wing-pump-left-2-operate eq 0 + /systems/fuel/pumps/wing-pump-right-1-operate eq 0 + /systems/fuel/pumps/wing-pump-right-2-operate eq 0 + /systems/fuel/pumps/center-pump-1-operate eq 0 + /systems/fuel/pumps/center-pump-2-operate eq 0 + + + + + + + propulsion/tank[1]/contents-lbs le 1650 + + + + + + + propulsion/tank[2]/contents-lbs le 220 + + + + + + + propulsion/tank[3]/contents-lbs le 1650 + + + Timer for the Fuel Center pumps /systems/fuel/quantity/center-low @@ -93,7 +168,7 @@ - /systems/fuel/valves/intercell-transfer-valve-1-cmd eq 1 + /systems/fuel/valves/outer-inner-transfer-valve-1-cmd eq 1 /systems/fuel/refuel/refuelling eq 0 @@ -110,13 +185,13 @@ /systems/fuel/valves/outer-inner-transfer-valve-1-cmd - /systems/fuel/valves/outer-inner-transfer-valve-1-power + /systems/fuel/valves/outer-inner-transfer-valve-1-power - /systems/fuel/valves/intercell-transfer-valve-2-cmd eq 1 + /systems/fuel/valves/outer-inner-transfer-valve-2-cmd eq 1 /systems/fuel/refuel/refuelling eq 0 @@ -133,7 +208,28 @@ /systems/fuel/valves/outer-inner-transfer-valve-2-cmd - /systems/fuel/valves/outer-inner-transfer-valve-2-power + /systems/fuel/valves/outer-inner-transfer-valve-2-power + + + + + + + /controls/fuel/switches/crossfeed eq 1 + + + + + + + /systems/electrical/bus/dc-2 ge 25 + /systems/electrical/bus/dc-ess-shed ge 25 + + + + + /systems/fuel/valves/crossfeed-valve-cmd + /systems/fuel/valves/crossfeed-valve-power @@ -155,7 +251,7 @@ /systems/fuel/valves/engine-1-lp-valve-cmd - /systems/fuel/valves/engine-1-lp-valve-power + /systems/fuel/valves/engine-1-lp-valve-power @@ -176,12 +272,291 @@ /systems/fuel/valves/engine-2-lp-valve-cmd - /systems/fuel/valves/engine-2-lp-valve-power + /systems/fuel/valves/engine-2-lp-valve-power + + + + + + /controls/APU/master eq 1 + /controls/APU/fire-btn eq 0 + + + + + + + /systems/electrical/bus/dc-bat ge 25 + /systems/electrical/bus/dc-hot-1 ge 25 + + + + + /systems/fuel/valves/apu-lp-valve-cmd + /systems/fuel/valves/apu-lp-valve-power + + + + + + /systems/fuel/pumps/apu-operate + 25.3 + + + + /systems/fuel/pumps/apu-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-left-1-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-left-1-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-left-2-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-left-2-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/center-pump-1-operate + 30 + + + + /systems/fuel/pumps/center-pump-1-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/center-pump-2-operate + 30 + + + + /systems/fuel/pumps/center-pump-2-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-right-1-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-right-1-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-right-2-operate + 25.3 + + + + /systems/fuel/pumps/wing-pump-right-2-psi-cmd + 5 + 10 + + + + /systems/fuel/pumps/wing-pump-left-1-operate eq 1 + /systems/fuel/pumps/wing-pump-left-2-operate eq 1 + + + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/pumps/wing-pump-right-1-operate eq 1 + /systems/fuel/pumps/wing-pump-right-2-operate eq 1 + + + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/pumps/center-pump-1-operate eq 1 + + + + + + + /systems/fuel/pumps/center-pump-2-operate eq 1 + + + + + + + + /systems/fuel/quantity/center-low eq 1 + /systems/fuel/feed-center-1 eq 0 + + /systems/fuel/feed-left-inner eq 1 + propulsion/tank[1]/contents-lbs gt 31.24 + propulsion/tank[5]/contents-lbs lt 9 + + + + + + + + /systems/fuel/feed-center-1 eq 1 + + /systems/fuel/feed-center-2 eq 1 + /systems/fuel/valves/crossfeed-valve eq 1 + + + propulsion/tank[3]/contents-lbs gt 31.24 + propulsion/tank[5]/contents-lbs lt 9 + + + + + + + /systems/fuel/feed-right-inner eq 1 + + /systems/fuel/quantity/center-low eq 1 + /systems/fuel/feed-center-2 eq 0 + + /systems/fuel/valves/crossfeed-valve eq 1 + propulsion/tank[3]/contents-lbs gt 31.24 + propulsion/tank[5]/contents-lbs lt 9 + + + + + + + /systems/fuel/valves/crossfeed-valve eq 1 + + /systems/fuel/quantity/center-low eq 1 + /systems/fuel/feed-center-1 eq 0 + + /systems/fuel/feed-left-inner eq 1 + propulsion/tank[1]/contents-lbs gt 31.24 + propulsion/tank[6]/contents-lbs lt 9 + + + + + + + + /systems/fuel/feed-center-2 eq 1 + + /systems/fuel/feed-center-1 eq 1 + /systems/fuel/valves/crossfeed-valve eq 1 + + + propulsion/tank[3]/contents-lbs gt 31.24 + propulsion/tank[6]/contents-lbs lt 9 + + + + + + + + /systems/fuel/quantity/center-low eq 1 + /systems/fuel/feed-center-2 eq 0 + + /systems/fuel/feed-right-inner eq 1 + propulsion/tank[3]/contents-lbs gt 31.24 + propulsion/tank[6]/contents-lbs lt 9 + + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-1 eq 1 + /accelerations/pilot-gdamped ge 0.5 + + + + + + + /systems/fuel/valves/outer-inner-transfer-valve-2 eq 1 + /accelerations/pilot-gdamped ge 0.5 + + + + + -/systems/fuel/internal/left-wing-outer-to-inner-tank + propulsion/tank[0]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-outer-to-inner-tank + -/systems/fuel/internal/left-wing-tank-eng-1 + -/systems/fuel/internal/left-wing-tank-eng-2 + propulsion/tank[1]/external-flow-rate-pps + + + + -/systems/fuel/internal/center-tank-eng-1 + -/systems/fuel/internal/center-tank-eng-2 + propulsion/tank[2]/external-flow-rate-pps + + + + /systems/fuel/internal/right-wing-outer-to-inner-tank + -/systems/fuel/internal/right-wing-tank-eng-1 + -/systems/fuel/internal/right-wing-tank-eng-2 + propulsion/tank[3]/external-flow-rate-pps + + + + -/systems/fuel/internal/right-wing-outer-to-inner-tank + propulsion/tank[4]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-tank-eng-1 + /systems/fuel/internal/center-tank-eng-1 + /systems/fuel/internal/right-wing-tank-eng-1 + propulsion/tank[5]/external-flow-rate-pps + + + + /systems/fuel/internal/left-wing-tank-eng-2 + /systems/fuel/internal/center-tank-eng-2 + /systems/fuel/internal/right-wing-tank-eng-2 + propulsion/tank[6]/external-flow-rate-pps + diff --git a/Systems/fuel.xml b/Systems/fuel.xml index 1c72894f..355007f6 100644 --- a/Systems/fuel.xml +++ b/Systems/fuel.xml @@ -29,7 +29,7 @@ - /systems/fuel/x-feed == 1 + /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 @@ -62,7 +62,7 @@ - /systems/fuel/x-feed == 1 + /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 From 6da2a261477664b9a09851046a632c141ade1ca4 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 7 Nov 2019 21:53:32 +0000 Subject: [PATCH 3/8] Fix center tanks --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 2 +- Systems/a320-fuel.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 6659f78e..a89f9478 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -2268,7 +2268,7 @@ var canvas_lowerECAM_fuel = { # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state # TODO fix amber/green at the same time when closed - if (systems.FUEL.Valves.lpValve1.getValue()) == 0) { + if (systems.FUEL.Valves.lpValve1.getValue() == 0) { me["FUEL-ENG-Master-1"].setRotation(0); me["FUEL-ENG-Master-1"].setColor(0.0509,0.7529,0.2941); me["FUEL-ENG-1-pipe"].setColor(0.0509,0.7529,0.2941); diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml index 8200282d..3c10ab6c 100644 --- a/Systems/a320-fuel.xml +++ b/Systems/a320-fuel.xml @@ -427,7 +427,7 @@ - + @@ -470,7 +470,7 @@ - + @@ -521,6 +521,7 @@ /systems/fuel/internal/left-wing-outer-to-inner-tank + /systems/fuel/internal/center-tank-left -/systems/fuel/internal/left-wing-tank-eng-1 -/systems/fuel/internal/left-wing-tank-eng-2 propulsion/tank[1]/external-flow-rate-pps @@ -534,6 +535,7 @@ /systems/fuel/internal/right-wing-outer-to-inner-tank + /systems/fuel/internal/center-tank-right -/systems/fuel/internal/right-wing-tank-eng-1 -/systems/fuel/internal/right-wing-tank-eng-2 propulsion/tank[3]/external-flow-rate-pps @@ -546,14 +548,12 @@ /systems/fuel/internal/left-wing-tank-eng-1 - /systems/fuel/internal/center-tank-eng-1 /systems/fuel/internal/right-wing-tank-eng-1 propulsion/tank[5]/external-flow-rate-pps /systems/fuel/internal/left-wing-tank-eng-2 - /systems/fuel/internal/center-tank-eng-2 /systems/fuel/internal/right-wing-tank-eng-2 propulsion/tank[6]/external-flow-rate-pps From 6d1ddcbd4be968348a83cb9cc9181c70341f7342 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 8 Nov 2019 17:16:55 +0000 Subject: [PATCH 4/8] Bugfix, restore A320 center fuel pumps --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 4 ++-- Systems/a320-fuel.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index a89f9478..2b8f7d45 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -2268,7 +2268,7 @@ var canvas_lowerECAM_fuel = { # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state # TODO fix amber/green at the same time when closed - if (systems.FUEL.Valves.lpValve1.getValue() == 0) { + if (systems.FUEL.Valves.lpValve1.getValue() == 1) { me["FUEL-ENG-Master-1"].setRotation(0); me["FUEL-ENG-Master-1"].setColor(0.0509,0.7529,0.2941); me["FUEL-ENG-1-pipe"].setColor(0.0509,0.7529,0.2941); @@ -2281,7 +2281,7 @@ var canvas_lowerECAM_fuel = { # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state # TODO fix amber/green at the same time when closed - if (systems.FUEL.Valves.lpValve2.getValue() == 0) { + if (systems.FUEL.Valves.lpValve2.getValue() == 1) { me["FUEL-ENG-Master-2"].setRotation(0); me["FUEL-ENG-Master-2"].setColor(0.0509,0.7529,0.2941); me["FUEL-ENG-2-pipe"].setColor(0.0509,0.7529,0.2941); diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml index 3c10ab6c..0dd7042d 100644 --- a/Systems/a320-fuel.xml +++ b/Systems/a320-fuel.xml @@ -427,7 +427,7 @@ - + @@ -470,7 +470,7 @@ - + @@ -521,21 +521,19 @@ /systems/fuel/internal/left-wing-outer-to-inner-tank - /systems/fuel/internal/center-tank-left -/systems/fuel/internal/left-wing-tank-eng-1 -/systems/fuel/internal/left-wing-tank-eng-2 propulsion/tank[1]/external-flow-rate-pps - -/systems/fuel/internal/center-tank-eng-1 - -/systems/fuel/internal/center-tank-eng-2 + -/systems/fuel/internal/center-tank-left + -/systems/fuel/internal/center-tank-right propulsion/tank[2]/external-flow-rate-pps /systems/fuel/internal/right-wing-outer-to-inner-tank - /systems/fuel/internal/center-tank-right -/systems/fuel/internal/right-wing-tank-eng-1 -/systems/fuel/internal/right-wing-tank-eng-2 propulsion/tank[3]/external-flow-rate-pps @@ -549,12 +547,14 @@ /systems/fuel/internal/left-wing-tank-eng-1 /systems/fuel/internal/right-wing-tank-eng-1 + /systems/fuel/internal/center-tank-eng-2 propulsion/tank[5]/external-flow-rate-pps /systems/fuel/internal/left-wing-tank-eng-2 /systems/fuel/internal/right-wing-tank-eng-2 + /systems/fuel/internal/center-tank-eng-2 propulsion/tank[6]/external-flow-rate-pps From ff70da0438b09cc66dda875a3af742b823e097e8 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 8 Nov 2019 18:22:29 +0000 Subject: [PATCH 5/8] Bugfix + improve --- A320-main.xml | 2 + Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 62 +++++++++++++------- Models/Instruments/Lower-ECAM/res/fuel.svg | 13 ++-- Nasal/fuel.nas | 11 +++- Nasal/property-tree-setup.nas | 11 ++++ Systems/a320-fuel.xml | 10 ++-- 6 files changed, 77 insertions(+), 32 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index acbcc818..bdb38a2c 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -937,6 +937,8 @@ 0 + 0 + 0 0 diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 2b8f7d45..63b03d7a 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -111,11 +111,8 @@ var switch_pack1 = props.globals.getNode("/controls/pneumatic/switches/pack1", 1 var switch_pack2 = props.globals.getNode("/controls/pneumatic/switches/pack2", 1); var oil_qt1_actual = props.globals.getNode("/engines/engine[0]/oil-qt-actual", 1); var oil_qt2_actual = props.globals.getNode("/engines/engine[1]/oil-qt-actual", 1); -var fuel_used_lbs1 = props.globals.getNode("/fdm/jsbsim/propulsion/engine[0]/fuel-used-lbs", 1); -var fuel_used_lbs2 = props.globals.getNode("/fdm/jsbsim/propulsion/engine[1]/fuel-used-lbs", 1); -var fuel_left_quantity = props.globals.getNode("/consumables/fuel/tank[0]/level-lbs", 1); -var fuel_center_quantity = props.globals.getNode("/consumables/fuel/tank[1]/level-lbs", 1); -var fuel_right_quantity = props.globals.getNode("/consumables/fuel/tank[2]/level-lbs", 1); +var fuel_used_lbs1 = props.globals.getNode("/systems/fuel/fuel-used-1", 1); +var fuel_used_lbs2 = props.globals.getNode("/systems/fuel/fuel-used-2", 1); var doorL1_pos = props.globals.getNode("sim/model/door-positions/doorl1/position-norm", 1); var doorR1_pos = props.globals.getNode("sim/model/door-positions/doorr1/position-norm", 1); var doorL4_pos = props.globals.getNode("sim/model/door-positions/doorl4/position-norm", 1); @@ -2241,17 +2238,21 @@ var canvas_lowerECAM_fuel = { update: func() { # if (getprop("engines/engine[0]/n1-actual") < getprop("/controls/engines/idle-limit")) { - if (eng1_n1.getValue() <= 18.9) { + if (eng1_n1.getValue() <= 18.8) { me["ENG1idFFlow"].setColor(0.7333,0.3803,0); + me["FUEL-ENG-1-label"].setColor(0.7333,0.3803,0); } else { me["ENG1idFFlow"].setColor(0.8078,0.8039,0.8078); + me["FUEL-ENG-1-label"].setColor(0.8078,0.8039,0.8078); } # if (getprop("engines/engine[1]/n1-actual") < getprop("/controls/engines/idle-limit")) { - if (eng2_n1.getValue() <= 18.9) { + if (eng2_n1.getValue() <= 18.5) { me["ENG2idFFlow"].setColor(0.7333,0.3803,0); + me["FUEL-ENG-2-label"].setColor(0.7333,0.3803,0); } else { me["ENG2idFFlow"].setColor(0.8078,0.8039,0.8078); + me["FUEL-ENG-2-label"].setColor(0.8078,0.8039,0.8078); } # TODO add FOB half-boxed amber if some fuel is blocked @@ -2267,27 +2268,29 @@ var canvas_lowerECAM_fuel = { # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state - # TODO fix amber/green at the same time when closed if (systems.FUEL.Valves.lpValve1.getValue() == 1) { me["FUEL-ENG-Master-1"].setRotation(0); me["FUEL-ENG-Master-1"].setColor(0.0509,0.7529,0.2941); + me["FUEL-ENG-Master-1"].setColorFill(0.0509,0.7529,0.2941); me["FUEL-ENG-1-pipe"].setColor(0.0509,0.7529,0.2941); } else { me["FUEL-ENG-Master-1"].setRotation(90 * D2R); me["FUEL-ENG-Master-1"].setColor(0.7333,0.3803,0); + me["FUEL-ENG-Master-1"].setColorFill(0.7333,0.3803,0); me["FUEL-ENG-1-pipe"].setColor(0.7333,0.3803,0); } # TODO use the valve prop and add amber if difference between eng master and valve # TODO add transition state - # TODO fix amber/green at the same time when closed if (systems.FUEL.Valves.lpValve2.getValue() == 1) { me["FUEL-ENG-Master-2"].setRotation(0); me["FUEL-ENG-Master-2"].setColor(0.0509,0.7529,0.2941); + me["FUEL-ENG-Master-2"].setColorFill(0.0509,0.7529,0.2941); me["FUEL-ENG-2-pipe"].setColor(0.0509,0.7529,0.2941); } else { me["FUEL-ENG-Master-2"].setRotation(90 * D2R); me["FUEL-ENG-Master-2"].setColor(0.7333,0.3803,0); + me["FUEL-ENG-Master-2"].setColorFill(0.7333,0.3803,0); me["FUEL-ENG-2-pipe"].setColor(0.7333,0.3803,0); } @@ -2304,75 +2307,81 @@ var canvas_lowerECAM_fuel = { } # TODO add LO indication - # TODO fix amber/green at the same time when closed if (systems.FUEL.Switches.pumpLeft1.getValue() == 1) { me["FUEL-Pump-Left-1-Open"].show(); me["FUEL-Pump-Left-1-Closed"].hide(); me["FUEL-Pump-Left-1"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Left-1"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Left-1-Open"].hide(); me["FUEL-Pump-Left-1-Closed"].show(); me["FUEL-Pump-Left-1"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Left-1"].setColorFill(0.7333,0.3803,0); } # TODO add LO indication - # TODO fix amber/green at the same time when closed if (systems.FUEL.Switches.pumpLeft2.getValue() == 1) { me["FUEL-Pump-Left-2-Open"].show(); me["FUEL-Pump-Left-2-Closed"].hide(); me["FUEL-Pump-Left-2"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Left-2"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Left-2-Open"].hide(); me["FUEL-Pump-Left-2-Closed"].show(); me["FUEL-Pump-Left-2"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Left-2"].setColorFill(0.7333,0.3803,0); } - # TODO fix amber/green at the same time when closed # TODO add functionality to match FCOM 1.28.20 "Amber: Transfer valve is open, whereas commanded closed in automatic or manual mode" if (systems.FUEL.Switches.pumpCenter1.getValue() == 1) { me["FUEL-Pump-Center-1-Open"].show(); me["FUEL-Pump-Center-1-Closed"].hide(); me["FUEL-Pump-Center-1"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Center-1"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Center-1-Open"].hide(); me["FUEL-Pump-Center-1-Closed"].show(); me["FUEL-Pump-Center-1"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Center-1"].setColorFill(0.7333,0.3803,0); } # TODO add LO indication - # TODO fix amber/green at the same time when closed if (systems.FUEL.Switches.pumpCenter2.getValue() == 1) { me["FUEL-Pump-Center-2-Open"].show(); me["FUEL-Pump-Center-2-Closed"].hide(); me["FUEL-Pump-Center-2"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Center-2"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Center-2-Open"].hide(); me["FUEL-Pump-Center-2-Closed"].show(); me["FUEL-Pump-Center-2"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Center-2"].setColorFill(0.7333,0.3803,0); } # TODO add LO indication - # TODO fix amber/green at the same time when closed if (systems.FUEL.Switches.pumpRight1.getValue() == 1) { me["FUEL-Pump-Right-1-Open"].show(); me["FUEL-Pump-Right-1-Closed"].hide(); me["FUEL-Pump-Right-1"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Right-1"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Right-1-Open"].hide(); me["FUEL-Pump-Right-1-Closed"].show(); me["FUEL-Pump-Right-1"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Right-1"].setColorFill(0.7333,0.3803,0); } # TODO add LO indication - # TODO fix amber/green at the same time when closed if (systems.FUEL.Switches.pumpRight2.getValue() == 1) { me["FUEL-Pump-Right-2-Open"].show(); me["FUEL-Pump-Right-2-Closed"].hide(); me["FUEL-Pump-Right-2"].setColor(0.0509,0.7529,0.2941); + me["FUEL-Pump-Right-2"].setColorFill(0.0509,0.7529,0.2941); } else { me["FUEL-Pump-Right-2-Open"].hide(); me["FUEL-Pump-Right-2-Closed"].show(); me["FUEL-Pump-Right-2"].setColor(0.7333,0.3803,0); + me["FUEL-Pump-Right-2"].setColorFill(0.7333,0.3803,0); } # Fuel Used @@ -2394,27 +2403,38 @@ var canvas_lowerECAM_fuel = { me["FUEL-Right-Inner-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.rightInner.getValue(), 10))); me["FUEL-Right-Outer-quantity"].setText(sprintf("%s", math.round(systems.FUEL.Quantity.rightOuter.getValue(), 10))); - if (!systems.FUEL.Valves.transfer1.getValue()) { + if (systems.FUEL.Valves.transfer1.getValue() == 0) { me["FUEL-Left-Transfer"].hide(); } else { - me["FUEL-Left-Transfer"].setColor(0.7333,0.3803,0); + if (systems.FUEL.Valves.transfer1.getValue() == 1) { + me["FUEL-Left-Transfer"].setColor(0.0509,0.7529,0.2941); + } else { + me["FUEL-Left-Transfer"].setColor(0.7333,0.3803,0); + } me["FUEL-Left-Transfer"].show(); } - if (!systems.FUEL.Valves.transfer2.getValue()) { + if (systems.FUEL.Valves.transfer2.getValue() == 0) { me["FUEL-Right-Transfer"].hide(); } else { - me["FUEL-Right-Transfer"].setColor(0.7333,0.3803,0); + if (systems.FUEL.Valves.transfer2.getValue() == 1) { + me["FUEL-Right-Transfer"].setColor(0.0509,0.7529,0.2941); + } else { + me["FUEL-Right-Transfer"].setColor(0.7333,0.3803,0); + } me["FUEL-Right-Transfer"].show(); } - + if (!systems.FUEL.Switches.pumpCenter1.getValue() and !systems.FUEL.Switches.pumpCenter2.getValue()) { + me["FUEL-Center-blocked"].show(); + } else { + me["FUEL-Center-blocked"].hide(); + } # Hide not yet implemented features # TODO add them me["FUEL-Left-blocked"].hide(); me["FUEL-Right-blocked"].hide(); - me["FUEL-Center-blocked"].hide(); me["FUEL-Left-Outer-Inacc"].hide(); me["FUEL-Left-Inner-Inacc"].hide(); me["FUEL-Right-Outer-Inacc"].hide(); diff --git a/Models/Instruments/Lower-ECAM/res/fuel.svg b/Models/Instruments/Lower-ECAM/res/fuel.svg index 2b90e88b..4ebd8e8b 100644 --- a/Models/Instruments/Lower-ECAM/res/fuel.svg +++ b/Models/Instruments/Lower-ECAM/res/fuel.svg @@ -12,7 +12,7 @@ viewBox="0 0 1024 1024" version="1.1" id="svg2" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="fuel.svg"> @@ -49,9 +49,9 @@ inkscape:window-height="705" id="namedview371" showgrid="false" - inkscape:zoom="2.0852713" - inkscape:cx="56" - inkscape:cy="255" + inkscape:zoom="0.68" + inkscape:cx="817.73616" + inkscape:cy="1022.6281" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -413,8 +413,9 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:1.12171543" x="768.26727" y="57.18037" - id="text5073-0" - transform="scale(0.95537765,1.0467065)"> - + /systems/fuel/quantity/left-wing-inner-low eq 1 + /systems/fuel/quantity/right-wing-inner-low eq 1 @@ -194,7 +195,8 @@ /systems/fuel/valves/outer-inner-transfer-valve-2-cmd eq 1 /systems/fuel/refuel/refuelling eq 0 - + + /systems/fuel/quantity/left-wing-inner-low eq 1 /systems/fuel/quantity/right-wing-inner-low eq 1 @@ -527,8 +529,8 @@ - -/systems/fuel/internal/center-tank-left - -/systems/fuel/internal/center-tank-right + -/systems/fuel/internal/center-tank-eng-1 + -/systems/fuel/internal/center-tank-eng-2 propulsion/tank[2]/external-flow-rate-pps From 317120d3191f962e169fc39869373d105be91a14 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 8 Nov 2019 18:33:31 +0000 Subject: [PATCH 6/8] ECAM memos about fuel --- Nasal/ECAM/ECAM-logic.nas | 24 +++++++++++++++--------- Nasal/ECAM/ECAM-messages.nas | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index b531b6a6..4f87bdac 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -1335,43 +1335,49 @@ var messages_config_memo = func { var messages_memo = func { phaseVar = phaseNode.getValue(); - if (getprop("/services/fuel-truck/enable") == 1) { + if (getprop("/services/fuel-truck/enable") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { refuelg.active = 1; } else { refuelg.active = 0; } - if (getprop("/controls/flight/speedbrake-arm") == 1) { + if (getprop("/controls/flight/speedbrake-arm") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { gnd_splrs.active = 1; } else { gnd_splrs.active = 0; } - if (getprop("/controls/lighting/seatbelt-sign") == 1) { + if (getprop("/controls/lighting/seatbelt-sign") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { seatbelts.active = 1; } else { seatbelts.active = 0; } - if (getprop("/controls/lighting/no-smoking-sign") == 1) { # should go off after takeoff assuming switch is in auto due to old logic from the days when smoking was allowed! + if (getprop("/controls/lighting/no-smoking-sign") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { # should go off after takeoff assuming switch is in auto due to old logic from the days when smoking was allowed! nosmoke.active = 1; } else { nosmoke.active = 0; } - if (getprop("/controls/lighting/strobe") == 0 and getprop("/gear/gear[1]/wow") == 0) { # todo: use gear branch properties + if (getprop("/controls/lighting/strobe") == 0 and getprop("/gear/gear[1]/wow") == 0 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { # todo: use gear branch properties strobe_lt_off.active = 1; } else { strobe_lt_off.active = 0; } + + if (systems.FUEL.Valves.transfer1.getValue() == 1 or systems.FUEL.Valves.transfer2.getValue() == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { + outr_tk_fuel_xfrd.active = 1; + } else { + outr_tk_fuel_xfrd.active = 0; + } - if (getprop("/consumables/fuel/total-fuel-lbs") < 6000) { # assuming US short ton 2000lb + if (getprop("/consumables/fuel/total-fuel-lbs") < 6000 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { # assuming US short ton 2000lb fob_3T.active = 1; } else { fob_3T.active = 0; } - if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1) { + if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) { gpws_flap_mode_off.active = 1; } else { gpws_flap_mode_off.active = 0; @@ -1542,7 +1548,7 @@ var messages_right_memo = func { auto_brk_max.active = 0; } - if (getprop("/systems/fuel/valves/crossfeed-valve") == 1 and getprop("/controls/fuel/switches/crossfeed") == 1) { + if (getprop("/systems/fuel/valves/crossfeed-valve") != 0 and getprop("/controls/fuel/switches/crossfeed") == 1) { fuelx.active = 1; } else { fuelx.active = 0; @@ -1560,7 +1566,7 @@ var messages_right_memo = func { gpws_flap3.active = 0; } - if (phaseVar >= 2 and phaseVar <= 9 and getprop("/systems/fuel/only-use-ctr-tank") == 1 and getprop("/systems/electrical/bus/ac-1") >= 115 and getprop("/systems/electrical/bus/ac-2") >= 115) { + if (phaseVar >= 2 and phaseVar <= 9 and systems.electrical.Bus.ac1.getValue() >= 110 and systems.electrical.Bus.ac2.getValue() >= 110 and (getprop("/systems/fuel/feed-center-1") or getprop("/systems/fuel/feed-center-2"))) { ctr_tk_feedg.active = 1; } else { ctr_tk_feedg.active = 0; diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas index 5f69f8cf..54832420 100644 --- a/Nasal/ECAM/ECAM-messages.nas +++ b/Nasal/ECAM/ECAM-messages.nas @@ -267,7 +267,7 @@ var leftmemos = std.Vector.new([ var seatbelts = warning.new(msg: "SEAT BELTS" ), var nosmoke = warning.new(msg: "NO SMOKING" ), var strobe_lt_off = warning.new(msg: "STROBE LT OFF" ), - var outr_tk_fuel_xfrd = warning.new(msg: "OUTR TK FUEL XFRD" ), # Not yet implemented + var outr_tk_fuel_xfrd = warning.new(msg: "OUTR TK FUEL XFRD" ), var fob_3T = warning.new(msg: "FOB BELOW 3T" ), var gpws_flap_mode_off = warning.new(msg: "GPWS FLAP MODE OFF" ), var atc_datalink_stby = warning.new(msg: "ATC DATALINK STBY" ), # Not yet implemented From 79ea1aa24d0c1ccb627d1bd85038bb7b6caae2ea Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 8 Nov 2019 18:42:38 +0000 Subject: [PATCH 7/8] ECAM messages --- Nasal/ECAM/ECAM-logic.nas | 2 +- Systems/a320-fuel.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index 4f87bdac..96e88e48 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -1566,7 +1566,7 @@ var messages_right_memo = func { gpws_flap3.active = 0; } - if (phaseVar >= 2 and phaseVar <= 9 and systems.electrical.Bus.ac1.getValue() >= 110 and systems.electrical.Bus.ac2.getValue() >= 110 and (getprop("/systems/fuel/feed-center-1") or getprop("/systems/fuel/feed-center-2"))) { + if (phaseVar >= 2 and phaseVar <= 9 and systems.ELEC.Bus.ac1.getValue() >= 110 and systems.ELEC.Bus.ac2.getValue() >= 110 and (getprop("/systems/fuel/feed-center-1") or getprop("/systems/fuel/feed-center-2"))) { ctr_tk_feedg.active = 1; } else { ctr_tk_feedg.active = 0; diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml index 6f41cea3..fc318185 100644 --- a/Systems/a320-fuel.xml +++ b/Systems/a320-fuel.xml @@ -93,10 +93,10 @@ /controls/fuel/switches/center-mode eq 0 + /systems/fuel/pumps/center-control-low-level ne 1 /systems/fuel/ctr-pump-cmd-on-eng-start eq 1 fcs/slat-pos-deg lt 16 - /systems/fuel/pumps/center-control-low-level ne 1 /systems/fuel/left-inner-full ne 1 @@ -112,6 +112,7 @@ /controls/fuel/switches/center-mode eq 0 + /systems/fuel/pumps/center-control-low-level ne 1 /systems/fuel/ctr-pump-cmd-on-eng-start eq 1 fcs/slat-pos-deg lt 16 From 8537a201814babf3d1a4ffccb2cfd6970bd400cf Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 8 Nov 2019 18:43:51 +0000 Subject: [PATCH 8/8] Revision --- revision.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.txt b/revision.txt index c7930257..301160a9 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file