From 3d3cb1a7b6582893d70c2d58f1b075a071e71e47 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 26 Sep 2017 14:12:16 -0400
Subject: [PATCH] A32X: APU and EXT Pwr now require Bus Tie in On/Auto

---
 Nasal/electrical.nas | 16 ++++++++--------
 revision.txt         |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 147f74ec..37c27e4c 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -236,11 +236,11 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
-	} else if (extpwr_on and gen_ext_sw) {
+	} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
-	} else if (gen_apu and !genapu_fail) {
+	} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
@@ -265,11 +265,11 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
-	} else if (extpwr_on and gen_ext_sw) {
+	} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
-	} else if (gen_apu and !genapu_fail) {
+	} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
@@ -292,9 +292,9 @@ var master_elec = func {
 	# Left AC bus yes?
 	if (stateL == 3 and gen1_sw and !gen1_fail) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
-	} else if (extpwr_on and gen_ext_sw) {
+	} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
-	} else if (gen_apu and !genapu_fail) {
+	} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 	} else if (apu_ext_crosstie_sw == 1 and xtieL) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
@@ -307,9 +307,9 @@ var master_elec = func {
 	# Right AC bus yes?
 	if (stateR == 3 and gen2_sw and !gen2_fail) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
-	} else if (extpwr_on and gen_ext_sw) {
+	} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
-	} else if (gen_apu and !genapu_fail) {
+	} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 	} else if (apu_ext_crosstie_sw == 1  and xtieR) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
diff --git a/revision.txt b/revision.txt
index 8799d84b..93682b45 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-1537
\ No newline at end of file
+1538
\ No newline at end of file