Merge pull request #14 from merspieler/Lower-ECAM

More changes to the LECAM display functionality

.gitignore

@@ -1,6 +1,9 @@
-#ignore generated backup files
+# ignore generated backup files
 *.*~
 .*~
 MyDevWIP
 SHS
 AKV.*
+# ignore swap files
+*.swp
+*.swo

Models/Instruments/Lower-ECAM/Lower-ECAM.nas

@@ -15,6 +15,7 @@ var lowerECAM_fctl = nil;
 var lowerECAM_fuel = nil;
 var lowerECAM_hyd = nil;
 var lowerECAM_press = nil;
+var lowerECAM_status = nil;
 var lowerECAM_wheel = nil;
 var lowerECAM_test = nil;
 var lowerECAM_display = nil;
@@ -124,6 +125,7 @@ var canvas_lowerECAM_base = {
 				lowerECAM_fctl.page.hide();
 				lowerECAM_fuel.page.hide();
 				lowerECAM_press.page.hide();
+				lowerECAM_status.page.hide();
 				lowerECAM_wheel.page.hide();
 				lowerECAM_test.page.show();
 				lowerECAM_test.update();
@@ -140,6 +142,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_apu.update();
@@ -153,6 +156,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_bleed.update();
@@ -166,6 +170,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_cond.update();
@@ -179,6 +184,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_door.update();
@@ -192,6 +198,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_elec.update();
@@ -205,6 +212,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_eng.update();
@@ -218,6 +226,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.show();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_fctl.update();
@@ -231,6 +240,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.show();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_fuel.update();
@@ -244,9 +254,24 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.show();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_press.update();
+				} else if (page == "sts") {
+					lowerECAM_apu.page.hide();
+					lowerECAM_bleed.page.hide();
+					lowerECAM_cond.page.hide();
+					lowerECAM_door.page.hide();
+					lowerECAM_elec.page.hide();
+					lowerECAM_eng.page.hide();
+					lowerECAM_fctl.page.hide();
+					lowerECAM_fuel.page.hide();
+					lowerECAM_press.page.hide();
+					lowerECAM_status.page.show();
+					lowerECAM_hyd.page.hide();
+					lowerECAM_wheel.page.hide();
+					lowerECAM_status.update();
 				} else if (page == "hyd") {
 					lowerECAM_apu.page.hide();
 					lowerECAM_bleed.page.hide();
@@ -257,6 +282,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.show();
 					lowerECAM_wheel.page.hide();
 					lowerECAM_hyd.update();
@@ -270,6 +296,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.show();
 					lowerECAM_wheel.update();
@@ -283,6 +310,7 @@ var canvas_lowerECAM_base = {
 					lowerECAM_fctl.page.hide();
 					lowerECAM_fuel.page.hide();
 					lowerECAM_press.page.hide();
+					lowerECAM_status.page.hide();
 					lowerECAM_hyd.page.hide();
 					lowerECAM_wheel.page.hide();
 				}
@@ -298,6 +326,7 @@ var canvas_lowerECAM_base = {
 			lowerECAM_fctl.page.hide();
 			lowerECAM_fuel.page.hide();
 			lowerECAM_press.page.hide();
+			lowerECAM_status.page.hide();
 			lowerECAM_hyd.page.hide();
 			lowerECAM_wheel.page.hide();
 		}
@@ -440,9 +469,266 @@ var canvas_lowerECAM_bleed = {
 		return m;
 	},
 	getKeys: func() {
-		return ["TAT","SAT","GW","UTCh","UTCm"];
+		return ["TAT","SAT","GW","UTCh","UTCm", "BLEED-XFEED", "BLEED-Ram-Air", "BLEED-APU", "BLEED-HP-Valve-1",
+		"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-Pack-1-Comp-Out-Temp", "BLEED-Pack-1-Packflow-needel", "BLEED-Pack-1-Bypass-needel", "BLEED-Pack-2-Out-Temp",
+		"BLEED-Pack-2-Bypass-needel", "BLEED-Pack-2-Comp-Out-Temp", "BLEED-Pack-2-Packflow-needel", "BLEED-Anti-Ice-Left",
+		"BLEED-Anti-Ice-Right", "BLEED-HP-2-connection", "BLEED-HP-1-connection", "BLEED-ANTI-ICE-ARROW-LEFT", "BLEED-ANTI-ICE-ARROW-RIGHT"];
 	},
 	update: func() {
+		# X BLEED
+		if (getprop("/systems/pneumatic/xbleed-state") == "transit") {
+			me["BLEED-XFEED"].setColor(0.7333,0.3803,0);
+			me["BLEED-XFEED"].setRotation(45 * D2R);
+		} else {
+			if (getprop("/systems/pneumatic/xbleed-state") == "open") {
+				var xbleed_state = 1;
+			} else {
+				var xbleed_state = 0;
+			}
+
+			if (xbleed_state == 1) {
+				me["BLEED-XFEED"].setRotation(0);
+			} else {
+				me["BLEED-XFEED"].setRotation(90 * D2R);
+			}
+			if (xbleed_state == getprop("/systems/pneumatic/xbleed")) {
+				me["BLEED-XFEED"].setColor(0.0509,0.7529,0.2941);
+			} else {
+				me["BLEED-XFEED"].setColor(0.7333,0.3803,0);
+			}
+		}
+
+		# HP valve 1
+		var hp_valve_state = getprop("/systems/pneumatic/hp-valve-1-state");
+
+		if (hp_valve_state == 1) {
+			me["BLEED-HP-Valve-1"].setRotation(90 * D2R);
+		} else {
+			me["BLEED-HP-Valve-1"].setRotation(0);
+		}
+		if (hp_valve_state == getprop("/systems/pneumatic/hp-valve-1")) {
+			me["BLEED-HP-Valve-1"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-HP-Valve-1"].setColor(0.7333,0.3803,0);
+		}
+
+		# HP valve 2
+		var hp_valve_state = getprop("/systems/pneumatic/hp-valve-2-state");
+
+		if (hp_valve_state == 1) {
+			me["BLEED-HP-Valve-2"].setRotation(90 * D2R);
+		} else {
+			me["BLEED-HP-Valve-2"].setRotation(0);
+		}
+		if (hp_valve_state == getprop("/systems/pneumatic/hp-valve-2")) {
+			me["BLEED-HP-Valve-2"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-HP-Valve-2"].setColor(0.7333,0.3803,0);
+		}
+
+		# ENG BLEED valve 1
+		var eng_valve_state = getprop("/systems/pneumatic/eng-valve-1-state");
+
+		if (eng_valve_state == 1) {
+			me["BLEED-ENG-1"].setRotation(90 * D2R);
+		} else {
+			me["BLEED-ENG-1"].setRotation(0);
+		}
+		if (eng_valve_state == getprop("/systems/pneumatic/eng-valve-1")) {
+			me["BLEED-ENG-1"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-ENG-1"].setColor(0.7333,0.3803,0);
+		}
+
+		# ENG BLEED valve 2
+		var eng_valve_state = getprop("/systems/pneumatic/eng-valve-2-state");
+
+		if (eng_valve_state == 1) {
+			me["BLEED-ENG-2"].setRotation(90 * D2R);
+		} else {
+			me["BLEED-ENG-2"].setRotation(0);
+		}
+		if (eng_valve_state == getprop("/systems/pneumatic/eng-valve-2")) {
+			me["BLEED-ENG-2"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-ENG-2"].setColor(0.7333,0.3803,0);
+		}
+
+		# Precooler inlet 1
+		var precooler_psi = getprop("/systems/pneumatic/precooler-1-psi");
+		me["BLEED-Precooler-1-Inlet-Press"].setText(sprintf("%s", math.round(precooler_psi)));
+		if (precooler_psi < 4 or precooler_psi > 57) {
+			me["BLEED-Precooler-1-Inlet-Press"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Precooler-1-Inlet-Press"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		# Precooler inlet 2
+		var precooler_psi = getprop("/systems/pneumatic/precooler-2-psi");
+		me["BLEED-Precooler-2-Inlet-Press"].setText(sprintf("%s", math.round(precooler_psi)));
+		if (precooler_psi < 4 or precooler_psi > 57) {
+			me["BLEED-Precooler-2-Inlet-Press"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Precooler-2-Inlet-Press"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		# Precooler outlet 1
+		var precooler_temp = getprop("/systems/pneumatic/precooler-1-temp");
+		me["BLEED-Precooler-1-Outlet-Temp"].setText(sprintf("%s", math.round(precooler_temp)));
+		if (precooler_temp < 150 or getprop("/systems/pneumatic/precooler-1-ovht")) {
+			me["BLEED-Precooler-1-Outlet-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Precooler-1-Outlet-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		# Precooler outlet 2
+		var precooler_temp = getprop("/systems/pneumatic/precooler-2-temp");
+		me["BLEED-Precooler-2-Outlet-Temp"].setText(sprintf("%s", math.round(precooler_temp)));
+		if (precooler_temp < 150 or getprop("/systems/pneumatic/precooler-2-ovht") == 1) {
+			me["BLEED-Precooler-2-Outlet-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Precooler-2-Outlet-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		# GND air
+		if (getprop("/velocities/groundspeed-kt") < 1) {
+			me["BLEED-GND"].show();
+		} else {
+			me["BLEED-GND"].hide();
+		}
+
+		# WING ANTI ICE
+		if (getprop("/controls/switches/wing") == 1) {
+			me["BLEED-Anti-Ice-Left"].show();
+			me["BLEED-Anti-Ice-Right"].show();
+			# TODO when seperated valves for left and right wing are implemented, do the following `if` and `else` clause for each wing.
+			if (getprop("/controls/deice/wing")) {
+				me["BLEED-ANTI-ICE-ARROW-LEFT"].show();
+				me["BLEED-ANTI-ICE-ARROW-RIGHT"].show();
+				if (getprop("/systems/pneumatic/total-psi") < 4 or getprop("/systems/pneumatic/total-psi") > 57) {
+					me["BLEED-ANTI-ICE-ARROW-LEFT"].setColor(0.7333,0.3803,0);
+					me["BLEED-ANTI-ICE-ARROW-RIGHT"].setColor(0.7333,0.3803,0);
+				} else {
+					me["BLEED-ANTI-ICE-ARROW-LEFT"].setColor(0.0509,0.7529,0.2941);
+					me["BLEED-ANTI-ICE-ARROW-RIGHT"].setColor(0.0509,0.7529,0.2941);
+				}
+			} else {
+				me["BLEED-ANTI-ICE-ARROW-LEFT"].hide();
+				me["BLEED-ANTI-ICE-ARROW-RIGHT"].hide();
+			}
+		} else {
+			me["BLEED-Anti-Ice-Left"].hide();
+			me["BLEED-Anti-Ice-Right"].hide();
+		}
+
+		# ENG 1 label
+		if (getprop("/engines/engine[0]/n2-actual") >= 59) {
+			me["BLEED-ENG-1-label"].setColor(0.8078,0.8039,0.8078);
+		} else {
+			me["BLEED-ENG-1-label"].setColor(0.7333,0.3803,0);
+		}
+
+		# ENG 2 label
+		if (getprop("/engines/engine[1]/n2-actual") >= 59) {
+			me["BLEED-ENG-2-label"].setColor(0.8078,0.8039,0.8078);
+		} else {
+			me["BLEED-ENG-2-label"].setColor(0.7333,0.3803,0);
+		}
+
+		# PACK 1 -----------------------------------------
+		me["BLEED-Pack-1-Out-Temp"].setText(sprintf("%s", getprop("/systems/pressurization/pack-1-out-temp")));
+		me["BLEED-Pack-1-Comp-Out-Temp"].setText(sprintf("%s", getprop("/systems/pressurization/pack-1-comp-out-temp")));
+
+		if (getprop("/systems/pressurization/pack-1-out-temp") > 90) {
+			me["BLEED-Pack-1-Out-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-1-Out-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		var bypass_pos = getprop("/systems/pressurization/pack-1-bypass") - 50; # `-50` cause the middel position from where we move the needel is at 50
+		bypass_pos = bypass_pos * D2R;
+		me["BLEED-Pack-1-Bypass-needel"].setRotation(bypass_pos);
+
+		if (getprop("/systems/pressurization/pack-1-comp-out-temp") > 230) {
+			me["BLEED-Pack-1-Comp-Out-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-1-Comp-Out-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		var flow_pos = getprop("/systems/pressurization/pack-1-flow") - 50; # `-50` cause the middel position from where we move the needel is at 50
+		flow_pos = flow_pos * D2R;
+		me["BLEED-Pack-1-Packflow-needel"].setRotation(flow_pos);
+
+		if (getprop("/systems/pressurization/pack-1-valve") == 0) {
+			me["BLEED-Pack-1-Packflow-needel"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-1-Packflow-needel"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		if (getprop("/systems/pressurization/pack-1-valve") == 1) {
+			me["BLEED-Pack-1-Flow-Valve"].setRotation(0);
+		} else {
+			me["BLEED-Pack-1-Flow-Valve"].setRotation(90 * D2R);
+		}
+
+		var pack_state = getprop("/systems/pressurization/pack-1-valve");
+		if (pack_state == 1) {
+			me["BLEED-Pack-1-Flow-Valve"].setRotation(0);
+		} else {
+			me["BLEED-Pack-2-Flow-Valve"].setRotation(90 * D2R);
+		}
+
+		if (pack_state == getprop("/controls/pneumatic/switches/pack1")) {
+			me["BLEED-Pack-1-Flow-Valve"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-Pack-1-Flow-Valve"].setColor(0.7333,0.3803,0);
+		}
+
+		# PACK 2 -----------------------------------------
+		me["BLEED-Pack-2-Out-Temp"].setText(sprintf("%s", getprop("/systems/pressurization/pack-2-out-temp")));
+		me["BLEED-Pack-2-Comp-Out-Temp"].setText(sprintf("%s", getprop("/systems/pressurization/pack-2-comp-out-temp")));
+
+		if (getprop("/systems/pressurization/pack-2-out-temp") > 90) {
+			me["BLEED-Pack-2-Out-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-2-Out-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		var bypass_pos = getprop("/systems/pressurization/pack-2-bypass") - 50; # `-50` cause the middel position from where we move the needel is at 50
+		bypass_pos = bypass_pos * D2R;
+		me["BLEED-Pack-2-Bypass-needel"].setRotation(bypass_pos);
+
+		if (getprop("/systems/pressurization/pack-2-comp-out-temp") > 230) {
+			me["BLEED-Pack-2-Comp-Out-Temp"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-2-Comp-Out-Temp"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		var flow_pos = getprop("/systems/pressurization/pack-2-flow") - 50; # `-50` cause the middel position from where we move the needel is at 50
+		flow_pos = flow_pos * D2R;
+		me["BLEED-Pack-2-Packflow-needel"].setRotation(flow_pos);
+
+		if (getprop("/systems/pressurization/pack-2-valve") == 0) {
+			me["BLEED-Pack-2-Packflow-needel"].setColor(0.7333,0.3803,0);
+		} else {
+			me["BLEED-Pack-2-Packflow-needel"].setColor(0.0509,0.7529,0.2941);
+		}
+
+		var pack_state = getprop("/systems/pressurization/pack-2-valve");
+		if (pack_state == 1) {
+			me["BLEED-Pack-2-Flow-Valve"].setRotation(0);
+		} else {
+			me["BLEED-Pack-2-Flow-Valve"].setRotation(90 * D2R);
+		}
+
+		if (pack_state == getprop("/controls/pneumatic/switches/pack2")) {
+			me["BLEED-Pack-2-Flow-Valve"].setColor(0.0509,0.7529,0.2941);
+		} else {
+			me["BLEED-Pack-2-Flow-Valve"].setColor(0.7333,0.3803,0);
+		}
 
 		me.updateBottomStatus();
 	},
@@ -1781,6 +2067,22 @@ var canvas_lowerECAM_press = {
 	},
 };
 
+var canvas_lowerECAM_status = {
+	new: func(canvas_group, file) {
+		var m = {parents: [canvas_lowerECAM_status, canvas_lowerECAM_base]};
+		m.init(canvas_group, file);
+		
+		return m;
+	},
+	getKeys: func() {
+		return ["TAT","SAT","GW","UTCh","UTCm"];
+	},
+	update: func() {
+		
+		me.updateBottomStatus();
+	},
+};
+
 var canvas_lowerECAM_hyd = {
 	new: func(canvas_group, file) {
 		var m = {parents: [canvas_lowerECAM_hyd, canvas_lowerECAM_base]};
@@ -1847,10 +2149,35 @@ var canvas_lowerECAM_hyd = {
 
 		if (getprop("/controls/hydraulic/ptu") == 1 and getprop("/systems/hydraulic/ptu-fault") == 0) {
 			me["PTU-connection"].setColor(0.0509,0.7529,0.2941);
-			me["PTU-Auto-or-off"].setColor(0.0509,0.7529,0.2941);
+
+			if (getprop("/systems/hydraulic/ptu-active") == 1) {
+				if (getprop("/systems/hydraulic/ptu-supplies") == "yellow") {
+					print("if");
+					me["PTU-Supply-Line"].show();
+					me["PTU-supply-yellow"].show();
+					me["PTU-supply-green"].hide();
+					me["PTU-Auto-or-off"].hide();
+				} else if (getprop("/systems/hydraulic/ptu-supplies") == "green") {
+					print("else if");
+					me["PTU-Supply-Line"].show();
+					me["PTU-supply-yellow"].hide();
+					me["PTU-supply-green"].show();
+					me["PTU-Auto-or-off"].hide();
+				}
+			} else {
+				me["PTU-Auto-or-off"].setColor(0.0509,0.7529,0.2941);
+				me["PTU-Supply-Line"].hide();
+				me["PTU-supply-yellow"].hide();
+				me["PTU-supply-green"].hide();
+				me["PTU-Auto-or-off"].show();
+			}
 		} else {
 			me["PTU-connection"].setColor(0.7333,0.3803,0);
 			me["PTU-Auto-or-off"].setColor(0.7333,0.3803,0);
+			me["PTU-Supply-Line"].hide();
+			me["PTU-supply-yellow"].hide();
+			me["PTU-supply-green"].hide();
+			me["PTU-Auto-or-off"].show();
 		}
 
 		if (getprop("/engines/engine[0]/n2-actual") >= 59) {
@@ -1927,22 +2254,96 @@ var canvas_lowerECAM_hyd = {
 		} else {
 			me["ELEC-Yellow-on"].show();
 			me["ELEC-Yellow-off"].hide();
+			if (getprop("/systems/hydraulic/yellow-psi") >= 1500) {
+				me["ELEC-Yellow-on"].setColor(0.0509,0.7529,0.2941);
+			} else {
+				me["ELEC-Yellow-on"].setColor(0.7333,0.3803,0);
+			}
 		}
 
-		# hiding elements which have no props in the tree yet and doesn't suite in in normal ops
+		if (getprop("/systems/hydraulic/yellow-resv-lo-air-press") == 1) {
-		# TODO add these when they are in the prop tree
+			me["LO-AIR-PRESS-Yellow"].show();
-		me["LO-AIR-PRESS-Green"].hide();
+		} else {
-		me["LO-AIR-PRESS-Blue"].hide();
+			me["LO-AIR-PRESS-Yellow"].hide();
-		me["LO-AIR-PRESS-Yellow"].hide();
+		}
-		me["ELEC-OVHT-Yellow"].hide();
+
-		me["ELEC-OVHT-Blue"].hide();
+		if (getprop("/systems/hydraulic/blue-resv-lo-air-press") == 1) {
-		me["RAT-not-stowed"].hide();
+			me["LO-AIR-PRESS-Blue"].show();
-		me["PTU-Supply-Line"].hide();
+		} else {
-		me["PTU-supply-yellow"].hide();
+			me["LO-AIR-PRESS-Blue"].hide();
-		me["PTU-supply-green"].hide();
+		}
-		me["OVHT-Yellow"].hide();
+
-		me["OVHT-Green"].hide();
+		if (getprop("/systems/hydraulic/green-resv-lo-air-press") == 1) {
-		me["OVHT-Blue"].hide();
+			me["LO-AIR-PRESS-Green"].show();
+		} else {
+			me["LO-AIR-PRESS-Green"].hide();
+		}
+
+		if (getprop("/systems/hydraulic/elec-pump-yellow-ovht") == 1) {
+			me["ELEC-OVHT-Yellow"].show();
+		} else {
+			me["ELEC-OVHT-Yellow"].hide();
+		}
+
+		if (getprop("/systems/hydraulic/elec-pump-blue-ovht") == 1) {
+			me["ELEC-OVHT-Blue"].show();
+		} else {
+			me["ELEC-OVHT-Blue"].hide();
+		}
+
+		if (getprop("/controls/hydraulic/rat-deployed") == 1) {
+			me["RAT-stowed"].hide();
+			me["RAT-not-stowed"].show();
+		} else {
+			me["RAT-stowed"].show();
+			me["RAT-not-stowed"].hide();
+		}
+
+		if (getprop("/systems/hydraulic/yellow-resv-ovht") == 1) {
+			me["OVHT-Yellow"].show();
+		} else {
+			me["OVHT-Yellow"].hide();
+		}
+
+		if (getprop("/systems/hydraulic/blue-resv-ovht") == 1) {
+			me["OVHT-Green"].show();
+		} else {
+			me["OVHT-Green"].hide();
+		}
+
+		if (getprop("/systems/hydraulic/green-resv-ovht") == 1) {
+			me["OVHT-Blue"].show();
+		} else {
+			me["OVHT-Blue"].hide();
+		}
+
+		if (getprop("/systems/electrical/bus/ac1") > 110) {
+			me["ELEC-Blue-label"].setColor(0.8078,0.8039,0.8078);
+		} else {
+			me["ELEC-Blue-label"].setColor(0.7333,0.3803,0);
+		}
+
+		if (getprop("/systems/electrical/bus/ac2") > 110) {
+			me["ELEC-Yellow-label"].setColor(0.8078,0.8039,0.8078);
+		} else {
+			me["ELEC-Yellow-label"].setColor(0.7333,0.3803,0);
+		}
+
+		if (getprop("/systems/hydraulic/yellow-fire-valve") == 1) {
+			me["Fire-Valve-Yellow"].setColor(0.7333,0.3803,0);
+			me["Fire-Valve-Yellow"].setRotation(90 * D2R)
+		} else {
+			me["Fire-Valve-Yellow"].setColor(0.0509,0.7529,0.2941);
+			me["Fire-Valve-Yellow"].setRotation(0)
+		}
+		
+		if (getprop("/systems/hydraulic/green-fire-valve") == 1) {
+			me["Fire-Valve-Green"].setColor(0.7333,0.3803,0);
+			me["Fire-Valve-Green"].setRotation(90 * D2R)
+		} else {
+			me["Fire-Valve-Green"].setColor(0.0509,0.7529,0.2941);
+			me["Fire-Valve-Green"].setRotation(0)
+		}
 		
 		me.updateBottomStatus();
 	},
@@ -2452,6 +2853,7 @@ setlistener("sim/signals/fdm-initialized", func {
 	var groupFctl = lowerECAM_display.createGroup();
 	var groupFuel = lowerECAM_display.createGroup();
 	var groupPress = lowerECAM_display.createGroup();
+	var groupStatus = lowerECAM_display.createGroup();
 	var groupHyd = lowerECAM_display.createGroup();
 	var groupWheel = lowerECAM_display.createGroup();
 	var group_test = lowerECAM_display.createGroup();
@@ -2465,6 +2867,7 @@ setlistener("sim/signals/fdm-initialized", func {
 	lowerECAM_fctl = canvas_lowerECAM_fctl.new(groupFctl, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/fctl.svg");
 	lowerECAM_fuel = canvas_lowerECAM_fuel.new(groupFuel, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/fuel.svg");
 	lowerECAM_press = canvas_lowerECAM_press.new(groupPress, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/press.svg");
+	lowerECAM_status = canvas_lowerECAM_status.new(groupStatus, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/status.svg");
 	lowerECAM_hyd = canvas_lowerECAM_hyd.new(groupHyd, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/hyd.svg");
 	lowerECAM_wheel = canvas_lowerECAM_wheel.new(groupWheel, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/wheel.svg");
 	lowerECAM_test = canvas_lowerECAM_test.new(group_test, "Aircraft/IDG-A32X/Models/Instruments/Common/res/du-test.svg");

Models/Instruments/Lower-ECAM/res/bleed.svg

@@ -12,7 +12,7 @@
    viewBox="0 0 1024 1024"
    version="1.1"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.1 r15371"
    sodipodi:docname="bleed.svg">
   <metadata
      id="metadata375">
@@ -38,15 +38,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1027"
+     inkscape:window-height="1047"
      id="namedview371"
      showgrid="true"
-     inkscape:zoom="0.47"
+     inkscape:zoom="0.94"
-     inkscape:cx="575.50811"
+     inkscape:cx="538.35254"
-     inkscape:cy="214.10909"
+     inkscape:cy="985.87416"
-     inkscape:window-x="1592"
+     inkscape:window-x="0"
-     inkscape:window-y="-8"
+     inkscape:window-y="33"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
@@ -252,18 +252,21 @@
   <path
      style="fill:none;stroke:#0dc04b;stroke-width:4.39356995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 326.24999,109 h 36.16075 v 0 L 344.99999,63.999998 v 0 z"
-     id="path5062"
+     id="BLEED-cond-1"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     inkscape:label="#path5062" />
   <path
      style="fill:none;stroke:#0dc04b;stroke-width:4.39356995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 496.33923,109 h 36.16075 v 0 L 515.08923,63.999997 v 0 z"
-     id="path5062-5"
+     id="BLEED-cond-2"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     inkscape:label="#path5062-5" />
   <path
      style="fill:none;stroke:#0dc04b;stroke-width:4.39356995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 671.24998,109 h 36.16075 v 0 L 689.99998,63.999998 v 0 z"
-     id="path5062-5-0"
+     id="BLEED-cond-3"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     inkscape:label="#path5062-5-0" />
   <rect
      style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.3079536;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="BLEED-Ram-Air-connection"
@@ -290,45 +293,50 @@
      inkscape:label="#rect5105-6-4-5-6" />
   <rect
      style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:5.25465345;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect5105-6-4-5-0"
+     id="BLEED-Pack-connection"
      width="5.3955846"
      height="605.25"
      x="124"
      y="-817.5"
-     transform="rotate(90)" />
+     transform="rotate(90)"
+     inkscape:label="#rect5105-6-4-5-0" />
   <g
-     id="BLEED-APU"
+     id="BLEED-APU-LINES"
-     inkscape:label="#g3445"
+     inkscape:label="#g4686">
-     transform="rotate(-90,880.67779,539.2177)">
+    <g
-    <path
+       transform="rotate(-90,880.67779,539.2177)"
-       sodipodi:nodetypes="zzzzz"
+       inkscape:label="#g3445"
-       inkscape:connector-curvature="0"
+       id="BLEED-APU">
-       id="path5107-1-44-0"
+      <path
-       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"
-       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" />
+      <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" />
+    </g>
     <rect
-       y="169.28328"
+       y="602.28253"
-       x="817.61298"
+       x="510.74338"
-       height="5.1203089"
+       height="35.467422"
-       width="53.195583"
+       width="5.3955846"
-       id="rect5105-2-5-3-6"
+       id="rect5105-6-4-5-1"
-       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" />
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.27201295;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       inkscape:label="#rect5105-6-4-5-3"
+       y="465.25"
+       x="510.46811"
+       height="83.83696"
+       width="5.3955846"
+       id="BLEED-APU-connection"
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.95566499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
-  <rect
-     style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.27201295;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect5105-6-4-5-1"
-     width="5.3955846"
-     height="35.467422"
-     x="510.74338"
-     y="602.28253" />
-  <rect
-     style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.95566499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="BLEED-APU-connection"
-     width="5.3955846"
-     height="83.83696"
-     x="510.46811"
-     y="465.25"
-     inkscape:label="#rect5105-6-4-5-3" />
   <g
      id="BLEED-GND"
      inkscape:label="#g5215">
@@ -411,15 +419,6 @@
   <g
      id="BLEED-Pack1"
      inkscape:label="#g5245">
-    <rect
-       inkscape:label="#rect5105"
-       transform="matrix(-0.8129605,0.58231883,-0.4979849,-0.8671857,0,0)"
-       y="-333.89496"
-       x="-50.146469"
-       height="47.56768"
-       width="4.1253848"
-       id="BLEED-Pack-1-Bypass-needel"
-       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        transform="scale(1.0441515,0.95771539)"
        inkscape:label="#text5149"
@@ -498,15 +497,6 @@
          id="tspan4662-3-3"
          sodipodi:role="line"
          style="stroke-width:2.52312994px">° C</tspan></text>
-    <rect
-       inkscape:label="#rect5105"
-       transform="matrix(0.81296051,0.58231882,0.49798491,-0.86718569,0,0)"
-       y="-166.59816"
-       x="379.3045"
-       height="47.567677"
-       width="4.1253848"
-       id="BLEED-Pack-1-Packflow-needel"
-       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
        y="172.75"
        x="279.6044"
@@ -601,20 +591,33 @@
        id="1234-9-9-89"
        d="M 159.43646,279.37601 C 165,206.49999 266.24999,206.49999 271.55149,279.59259"
        style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       inkscape:label="#rect5105"
+       transform="matrix(0.99519712,0.09789121,-0.00225636,-0.99999745,0,0)"
+       y="-342.01422"
+       x="213.37225"
+       height="47.567677"
+       width="4.1253848"
+       id="BLEED-Pack-1-Packflow-needel"
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-0.061169884"
+       inkscape:transform-center-y="-50.536476" />
+    <rect
+       inkscape:label="#rect5105"
+       transform="matrix(-0.99500558,0.0998193,3.18808e-4,-0.99999995,0,0)"
+       y="-280.8252"
+       x="-218.66647"
+       height="47.56768"
+       width="4.1253848"
+       id="BLEED-Pack-1-Bypass-needel"
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-0.13399521"
+       inkscape:transform-center-y="-40.817808" />
   </g>
   <g
      transform="translate(598.59718,-0.52016854)"
      id="BLEED-Pack2"
      inkscape:label="#g5245">
-    <rect
-       inkscape:label="#rect5105"
-       transform="matrix(-0.8129605,0.58231883,-0.4979849,-0.8671857,0,0)"
-       y="-333.89496"
-       x="-50.146469"
-       height="47.56768"
-       width="4.1253848"
-       id="BLEED-Pack-2-Bypass-needel"
-       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        transform="scale(1.0441515,0.95771539)"
        inkscape:label="#text5149"
@@ -693,15 +696,6 @@
          id="tspan4662-3-3-2"
          sodipodi:role="line"
          style="stroke-width:2.52312994px">° C</tspan></text>
-    <rect
-       inkscape:label="#rect5105"
-       transform="matrix(0.81296051,0.58231882,0.49798491,-0.86718569,0,0)"
-       y="-166.59816"
-       x="379.3045"
-       height="47.567677"
-       width="4.1253848"
-       id="BLEED-Pack-2-Packflow-needel"
-       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
        y="172.75"
        x="279.6044"
@@ -800,6 +794,28 @@
        id="1234-9-9-89-1"
        d="M 159.43646,279.37601 C 165,206.49999 266.24999,206.49999 271.55149,279.59259"
        style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       inkscape:label="#rect5105"
+       transform="matrix(0.99564851,0.09318823,-0.0069809,-0.99997563,0,0)"
+       y="-345.59869"
+       x="211.82704"
+       height="47.567677"
+       width="4.1253848"
+       id="BLEED-Pack-2-Packflow-needel"
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="1.3492445"
+       inkscape:transform-center-y="-52.316358" />
+    <rect
+       inkscape:label="#rect5105"
+       transform="matrix(-0.993603,0.11292952,-0.01286596,-0.99991723,0,0)"
+       y="-282.72272"
+       x="-215.75751"
+       height="47.56768"
+       width="4.1253848"
+       id="BLEED-Pack-2-Bypass-needel"
+       style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.2880882;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="0.24541913"
+       inkscape:transform-center-y="-40.924984" />
   </g>
   <text
      transform="scale(0.90069521,1.1102535)"
@@ -1096,9 +1112,10 @@
          sodipodi:role="line">ANTI</tspan></text>
     <path
        inkscape:connector-curvature="0"
-       id="path5062-54-1"
+       id="BLEED-ANTI-ICE-ARROW-LEFT"
        d="m 202.49999,480.1111 v -28.66075 0 l -30,13.79964 v 0 z"
-       style="fill:none;stroke:#cecdce;stroke-width:3.19372106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:none;stroke:#cecdce;stroke-width:3.19372106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:label="#path5062-54-1" />
     <text
        transform="scale(0.94655352,1.0564643)"
        inkscape:label="#text3720"
@@ -1113,42 +1130,39 @@
          sodipodi:role="line">ICE</tspan></text>
   </g>
   <g
-     transform="translate(719.99998,7.4999959)"
+     inkscape:label="#g5888"
-     id="BLEED-Anti-Ice-Left-2"
+     id="BLEED-Anti-Ice-Right"
-     inkscape:label="#g5843">
+     transform="translate(719.99998,7.4999959)">
-    <g
+    <text
-       id="BLEED-Anti-Ice-Right"
+       transform="scale(0.94655352,1.0564643)"
-       inkscape:label="#g5888">
+       inkscape:label="#text3720"
-      <text
+       id="APUGentext-7-2-1-3-6-1"
-         xml:space="preserve"
+       y="426.34195"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.18700027px;line-height:0%;font-family:'Liberation Sans';-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:2.68228602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="148.62262"
-         x="148.62262"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.18700027px;line-height:0%;font-family:'Liberation Sans';-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:2.68228602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
          y="426.34195"
-         id="APUGentext-7-2-1-3-6-1"
+         x="148.62262"
-         inkscape:label="#text3720"
+         id="tspan5816-7"
-         transform="scale(0.94655352,1.0564643)"><tspan
+         sodipodi:role="line">ANTI</tspan></text>
-           sodipodi:role="line"
+    <path
-           id="tspan5816-7"
+       inkscape:connector-curvature="0"
-           x="148.62262"
+       id="BLEED-ANTI-ICE-ARROW-RIGHT"
-           y="426.34195">ANTI</tspan></text>
+       d="m 108.75,472.74999 v -28.66075 0 l 30,13.79964 v 0 z"
-      <path
+       style="fill:none;stroke:#cecdce;stroke-width:3.19372106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         style="fill:none;stroke:#cecdce;stroke-width:3.19372106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:label="#path5062-54-1-8" />
-         d="m 108.75,472.74999 v -28.66075 0 l 30,13.79964 v 0 z"
+    <text
-         id="path5062-54-1-8"
+       transform="scale(0.94655352,1.0564643)"
-         inkscape:connector-curvature="0" />
+       inkscape:label="#text3720"
-      <text
+       id="APUGentext-7-2-1-3-6-7-5"
-         xml:space="preserve"
+       y="457.41693"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.18700027px;line-height:0%;font-family:'Liberation Sans';-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:2.68228602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="171.19373"
-         x="171.19373"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.18700027px;line-height:0%;font-family:'Liberation Sans';-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:2.68228602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
          y="457.41693"
-         id="APUGentext-7-2-1-3-6-7-5"
+         x="171.19373"
-         inkscape:label="#text3720"
+         id="tspan5836-7"
-         transform="scale(0.94655352,1.0564643)"><tspan
+         sodipodi:role="line">ICE</tspan></text>
-           sodipodi:role="line"
-           id="tspan5836-7"
-           x="171.19373"
-           y="457.41693">ICE</tspan></text>
-    </g>
   </g>
   <text
      xml:space="preserve"
@@ -1156,8 +1170,7 @@
      x="99.96891"
      y="52.393005"
      id="PageTitle"
-     inkscape:label="#text3714"
+     inkscape:label="#text3714"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3716"
        x="99.96891"
@@ -1200,8 +1213,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="500.75214"
      y="977.31793"
-     id="text6232"
+     id="text6232"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-7"
        x="500.75214"
@@ -1212,8 +1224,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="254.86758"
      y="938.9859"
-     id="text6233"
+     id="text6233"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-3"
        x="254.86758"
@@ -1224,8 +1235,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="940.17981"
      y="939.82428"
-     id="text6234"
+     id="text6234"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-7-7"
        x="940.17981"
@@ -1236,8 +1246,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="695.24951"
      y="939.8045"
-     id="text3912"
+     id="text3912"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914"
        x="695.24951"
@@ -1248,8 +1257,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="48.73233"
      y="939.2984"
-     id="text6235"
+     id="text6235"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914-9"
        x="48.73233"
@@ -1260,8 +1268,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="47.952412"
      y="975.40332"
-     id="text6236"
+     id="text6236"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914-9-4"
        x="47.952412"
@@ -1273,8 +1280,7 @@
      x="212.32626"
      y="938.96637"
      id="TAT"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1"
        x="212.32626"
@@ -1286,8 +1292,7 @@
      x="212.3264"
      y="975.40363"
      id="SAT"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1-0"
        x="212.3264"
@@ -1299,15 +1304,13 @@
      x="925.0899"
      y="939.78522"
      id="GW"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1-9"
        x="925.0899"
        y="939.78522"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b">120000</tspan></text>
   <text
-     sodipodi:linespacing="0%"
      id="text4170"
      y="975.42352"
      x="254.86758"
@@ -1319,7 +1322,6 @@
        id="tspan4172"
        sodipodi:role="line">°C</tspan></text>
   <text
-     sodipodi:linespacing="0%"
      inkscape:label="#text5149"
      id="UTCh"
      y="976.25214"
@@ -1337,8 +1339,7 @@
      x="560.88452"
      y="976.25214"
      id="UTCm"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan4180"
        x="560.88452"

Nasal/hydraulics.nas

@@ -78,6 +78,17 @@ var HYD = {
 		setprop("/systems/hydraulic/elec-pump-b-fault", 0);
 		setprop("/systems/hydraulic/elec-pump-y-fault", 0);
 		setprop("/systems/hydraulic/ptu-fault", 0);
+		setprop("/systems/hydraulic/ptu-supplies", "XX");
+		setprop("/systems/hydraulic/yellow-resv-lo-air-press", 0);
+		setprop("/systems/hydraulic/blue-resv-lo-air-press", 0);
+		setprop("/systems/hydraulic/green-resv-lo-air-press", 0);
+		setprop("/systems/hydraulic/yellow-resv-ovht", 0);
+		setprop("/systems/hydraulic/blue-resv-ovht", 0);
+		setprop("/systems/hydraulic/green-resv-ovht", 0);
+		setprop("/systems/hydraulic/elec-pump-yellow-ovht", 0);
+		setprop("/systems/hydraulic/elec-pump-blue-ovht", 0);
+		setprop("/systems/hydraulic/yellow-fire-valve", 0);
+		setprop("/systems/hydraulic/green-fire-valve", 0);
 	},
 	loop: func() {
 		eng1_pump_sw = getprop("/controls/hydraulic/eng1-pump");

Nasal/pneumatics.nas

@@ -107,6 +107,7 @@ var PNEU = {
 		setprop("/systems/pneumatic/pack1-fault", 0);
 		setprop("/systems/pneumatic/pack2-fault", 0);
 		setprop("/systems/pneumatic/xbleed", 0);
+		setprop("/systems/pneumatic/xbleed-state", "closed");
 		setprop("/systems/pneumatic/starting", 0);
 		setprop("/FMGC/internal/dep-arpt", "");
 		altitude = getprop("/instrumentation/altimeter/indicated-altitude-ft");
@@ -130,6 +131,16 @@ var PNEU = {
 		setprop("/systems/pressurization/ambientpsi", "0");
 		setprop("/systems/pressurization/cabinpsi", "0");
 		setprop("/systems/pressurization/manvs-cmd", "0");
+		setprop("/systems/pressurization/pack-1-out-temp", 0);
+		setprop("/systems/pressurization/pack-2-out-temp", 0);
+		setprop("/systems/pressurization/pack-1-bypass", 0);
+		setprop("/systems/pressurization/pack-2-bypass", 0);
+		setprop("/systems/pressurization/pack-1-flow", 0);
+		setprop("/systems/pressurization/pack-2-flow", 0);
+		setprop("/systems/pressurization/pack-1-comp-out-temp", 0);
+		setprop("/systems/pressurization/pack-2-comp-out-temp", 0);
+		setprop("/systems/pressurization/pack-1-valve", 0);
+		setprop("/systems/pressurization/pack-2-valve", 0);
 		setprop("/systems/ventilation/cabin/fans", 0); # aircon fans
 		setprop("/systems/ventilation/avionics/fan", 0);
 		setprop("/systems/ventilation/avionics/extractvalve", "0");
@@ -142,6 +153,20 @@ var PNEU = {
 		setprop("/controls/oxygen/masksDeployMan", 0);
 		setprop("/controls/oxygen/masksReset", 0); # this is the TMR RESET pb on the maintenance panel, needs 3D model
 		setprop("/controls/oxygen/masksSys", 0);
+		setprop("/systems/pneumatic/hp-valve-1-state", 0);
+		setprop("/systems/pneumatic/hp-valve-2-state", 0);
+		setprop("/systems/pneumatic/hp-valve-1", 0);
+		setprop("/systems/pneumatic/hp-valve-2", 0);
+		setprop("/systems/pneumatic/eng-valve-1-state", 0);
+		setprop("/systems/pneumatic/eng-valve-2-state", 0);
+		setprop("/systems/pneumatic/eng-valve-1", 0);
+		setprop("/systems/pneumatic/eng-valve-2", 0);
+		setprop("/systems/pneumatic/precooler-1-psi", 0);
+		setprop("/systems/pneumatic/precooler-2-psi", 0);
+		setprop("/systems/pneumatic/precooler-1-temp", 0);
+		setprop("/systems/pneumatic/precooler-2-temp", 0);
+		setprop("/systems/pneumatic/precooler-1-ovht", 0);
+		setprop("/systems/pneumatic/precooler-2-ovht", 0);
 	},
 	loop: func() {
 		bleed1_sw = getprop("/controls/pneumatic/switches/bleed1");