From 14993d2c04bcefc87c06101e4df0718c089964bb Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Tue, 16 Jun 2020 18:51:43 +0100
Subject: [PATCH] Fixes to bleed page, also crossbleed (thanks pinto!)

---
 Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 10 +--
 Models/Instruments/Lower-ECAM/res/bleed.svg  | 36 +++++-----
 Systems/a320-pneumatic.xml                   | 72 ++++++++++----------
 3 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index 51e400a0..d2670eaa 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -727,7 +727,7 @@ var canvas_lowerECAM_bleed = {
 		return m;
 	},
 	getKeys: func() {
-		return ["TAT","SAT","GW","UTCh","UTCm","GW-weight-unit", "BLEED-XFEED", "BLEED-Ram-Air", "BLEED-APU", "BLEED-HP-Valve-1",
+		return ["TAT","SAT","GW","UTCh","UTCm","GW-weight-unit", "BLEED-XFEED", "BLEED-Ram-Air", "BLEED-APU-CIRCLE", "BLEED-HP-Valve-1",
 		"BLEED-APU-LINES","BLEED-ENG-1", "BLEED-HP-Valve-2", "BLEED-ENG-2", "BLEED-Precooler-1-Inlet-Press", "BLEED-Precooler-1-Outlet-Temp",
 		"BLEED-Precooler-2-Inlet-Press", "BLEED-Precooler-2-Outlet-Temp", "BLEED-ENG-1-label", "BLEED-ENG-2-label",
 		"BLEED-GND", "BLEED-Pack-1-Flow-Valve", "BLEED-Pack-2-Flow-Valve", "BLEED-Pack-1-Out-Temp","BLEED-APU-connectionTop",
@@ -818,11 +818,11 @@ var canvas_lowerECAM_bleed = {
 		if (apu_master.getValue()) {
 			me["BLEED-APU-LINES"].show();
 			if (apu_valve_state2 == 1) {
-				me["BLEED-APU"].setRotation(0);
+				me["BLEED-APU-CIRCLE"].setRotation(0);
 				me["BLEED-APU-connectionTop"].show();
 				me["BLEED-xbleedLeft"].show();
 			} else {
-				me["BLEED-APU"].setRotation(90 * D2R);
+				me["BLEED-APU-CIRCLE"].setRotation(90 * D2R);
 				me["BLEED-APU-connectionTop"].hide();
 				if (xbleed.getValue() != 1) {
 					me["BLEED-xbleedLeft"].hide();
@@ -831,9 +831,9 @@ var canvas_lowerECAM_bleed = {
 				}
 			}
 			if (apuBleedNotOn.getValue() != 1) {
-				me["BLEED-APU"].setColor(0.0509,0.7529,0.2941);
+				me["BLEED-APU-CIRCLE"].setColor(0.0509,0.7529,0.2941);
 			} else {
-				me["BLEED-APU"].setColor(0.7333,0.3803,0);
+				me["BLEED-APU-CIRCLE"].setColor(0.7333,0.3803,0);
 			}
 		} else {
 			if (xbleed.getValue() != 1) {
diff --git a/Models/Instruments/Lower-ECAM/res/bleed.svg b/Models/Instruments/Lower-ECAM/res/bleed.svg
index d10fe3f9..e6533a05 100644
--- a/Models/Instruments/Lower-ECAM/res/bleed.svg
+++ b/Models/Instruments/Lower-ECAM/res/bleed.svg
@@ -42,7 +42,7 @@
      id="namedview371"
      showgrid="true"
      inkscape:zoom="0.73868665"
-     inkscape:cx="492.21406"
+     inkscape:cx="272.22904"
      inkscape:cy="280.96379"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -299,21 +299,25 @@
   <g
      id="BLEED-APU-LINES"
      inkscape:label="#g1035">
-    <path
-       style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:4.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 872.14551,172.28989 c 0,15.58192 -12.63164,28.21356 -28.21356,28.21356 -15.58192,0 -28.21356,-12.63164 -28.21356,-28.21356 0,-15.58192 12.63164,-28.21356 28.21356,-28.21356 15.58192,0 28.21356,12.63164 28.21356,28.21356 z"
-       id="path5107-1-44-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzzzz"
-       transform="rotate(-90,880.67777,539.21767)" />
-    <rect
-       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5105-2-5-3-6"
-       width="53.195583"
-       height="5.1203089"
-       x="817.61298"
-       y="169.28328"
-       transform="rotate(-90,880.67777,539.21767)" />
+    <g
+       id="BLEED-APU-CIRCLE"
+       inkscape:label="#g1015">
+      <path
+         transform="rotate(-90,880.67777,539.21767)"
+         sodipodi:nodetypes="zzzzz"
+         inkscape:connector-curvature="0"
+         id="path5107-1-44-0"
+         d="m 872.14551,172.28989 c 0,15.58192 -12.63164,28.21356 -28.21356,28.21356 -15.58192,0 -28.21356,-12.63164 -28.21356,-28.21356 0,-15.58192 12.63164,-28.21356 28.21356,-28.21356 15.58192,0 28.21356,12.63164 28.21356,28.21356 z"
+         style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:4.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         transform="rotate(-90,880.67777,539.21767)"
+         y="169.28328"
+         x="817.61298"
+         height="5.1203089"
+         width="53.195583"
+         id="rect5105-2-5-3-6"
+         style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
     <rect
        y="602.28253"
        x="510.74338"
diff --git a/Systems/a320-pneumatic.xml b/Systems/a320-pneumatic.xml
index 006e994a..9502fb69 100644
--- a/Systems/a320-pneumatic.xml
+++ b/Systems/a320-pneumatic.xml
@@ -247,7 +247,7 @@
 			<test logic="OR" value="0">
 				/controls/engines/engine[0]/fire-btn eq 1
 				/controls/pneumatics/switches/bleed-1 eq 0
-				/systems/pneumatics/valves/apu-bleed-valve ne 0
+				/systems/pneumatics/valves/apu-bleed-valve eq 1
 				/systems/pneumatics/valves/starter-valve-1 ne 0
 				/systems/pneumatics/psi/engine-1-upstream-src lt 8
 				/systems/pneumatics/valves/engine-1-prv-valve-autoclose-cmd eq 1
@@ -328,7 +328,7 @@
 				/controls/engines/engine[1]/fire-btn eq 1
 				/controls/pneumatics/switches/bleed-2 eq 0
 				<test logic="AND">
-					/systems/pneumatics/valves/apu-bleed-valve ne 0
+					/systems/pneumatics/valves/apu-bleed-valve eq 1
 					/systems/pneumatics/valves/crossbleed-valve ne 0
 				</test>
 				/systems/pneumatics/valves/starter-valve-2 ne 0
@@ -835,7 +835,7 @@
 			<default value="/systems/pneumatics/psi/engine-left-src"/>
 			<test logic="AND" value="1"> <!-- apu -->
 				/systems/pneumatics/source/apu-psi ne 0
-				/systems/pneumatics/valves/apu-bleed-valve eq 1
+				/systems/pneumatics/valves/apu-bleed-valve ge 0.5
 			</test>
 			<test logic="AND" value="2"> <!-- left engine -->
 				<test logic="OR">
@@ -863,7 +863,7 @@
 			<default value="/systems/pneumatics/psi/engine-right-src"/>
 			<test logic="AND" value="1"> <!-- apu -->
 				/systems/pneumatics/source/apu-psi ne 0
-				/systems/pneumatics/valves/apu-bleed-valve ne 0
+				/systems/pneumatics/valves/apu-bleed-valve ge 0.5
 				/systems/pneumatics/valves/crossbleed-valve ne 0
 			</test>
 			<test logic="AND" value="2"> <!-- right engine -->
@@ -889,37 +889,39 @@
 			</test>
 		</switch>
 		
-		<switch name="/systems/pneumatics/psi/engine-1-psi">
-			<default value="0"/>
-			<test value="/systems/pneumatics/source/apu-psi">
-				/systems/pneumatics/psi/engine-left-src eq 1
-			</test>
-			<test value="/systems/pneumatics/psi/engine-1-downstream-opv">
-				/systems/pneumatics/psi/engine-left-src eq 2
-			</test>
-			<test value="/systems/pneumatics/psi/engine-2-psi">
-				/systems/pneumatics/psi/engine-left-src eq 3
-			</test>
-			<test value="/systems/pneumatics/source/gnd-psi">
-				/systems/pneumatics/psi/engine-left-src eq 4
-			</test>
-		</switch>
+		<fcs_function name="/systems/pneumatics/psi/engine-1-psi">
+			<function>
+				<switch>
+					<p>/systems/pneumatics/psi/engine-left-src</p>
+					<v>0</v>
+					<product>
+						<property>/systems/pneumatics/valves/apu-bleed-valve</property>
+						<property>/systems/pneumatics/source/apu-psi</property>
+					</product>
+					<property>/systems/pneumatics/psi/engine-1-downstream-opv</property>
+					<property>/systems/pneumatics/psi/engine-2-psi</property>
+					<property>/systems/pneumatics/source/gnd-psi</property>
+				</switch>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/systems/pneumatics/psi/engine-2-psi">
+			<function>
+				<switch>
+					<p>/systems/pneumatics/psi/engine-right-src</p>
+					<v>0</v>
+					<product>
+						<property>/systems/pneumatics/valves/apu-bleed-valve</property>
+						<property>/systems/pneumatics/valves/crossbleed-valve</property>
+						<property>/systems/pneumatics/source/apu-psi</property>
+					</product>
+					<property>/systems/pneumatics/psi/engine-2-downstream-opv</property>
+					<property>/systems/pneumatics/psi/engine-1-psi</property>
+					<property>/systems/pneumatics/source/gnd-psi</property>
+				</switch>
+			</function>
+		</fcs_function>
 		
-		<switch name="/systems/pneumatics/psi/engine-2-psi">
-			<default value="0"/>
-			<test value="/systems/pneumatics/source/apu-psi">
-				/systems/pneumatics/psi/engine-right-src eq 1
-			</test>
-			<test value="/systems/pneumatics/psi/engine-2-downstream-opv">
-				/systems/pneumatics/psi/engine-right-src eq 2
-			</test>
-			<test value="/systems/pneumatics/psi/engine-1-psi">
-				/systems/pneumatics/psi/engine-right-src eq 3
-			</test>
-			<test value="/systems/pneumatics/source/gnd-psi">
-				/systems/pneumatics/psi/engine-right-src eq 4
-			</test>
-		</switch>
 	</channel>
 	
 	<channel name="Precooler Left" execute="/systems/pneumatics/indicating/bmc1-working"> <!-- These values come from BMC, so makes sense to not have them when BMC lacks power -->
@@ -1169,7 +1171,7 @@
 		<switch name="/systems/pneumatics/warnings/apu-bleed-not-on-cmd">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				/systems/pneumatics/valves/apu-bleed-valve eq 0
+				/systems/pneumatics/valves/apu-bleed-valve ne 1
 				/controls/apu/master eq 1
 				/controls/pneumatics/switches/apu eq 1
 			</test>