diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 486db82c..7082233d 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -16,7 +16,7 @@
select
ACESSFeedBtn1F
- ACESSFeedBtn2O
+ ACESSFeedBtn2A
ACPack1Btn1F
ACPack1Btn2O
ACPack2Btn1F
@@ -2939,11 +2939,11 @@
- AC ESS pick
+ AC ESS FEED pick
pick
ACESSFeedBtn
ACESSFeedBtn1F
- ACESSFeedBtn2O
+ ACESSFeedBtn2A
false
@@ -2979,16 +2979,10 @@
ACESSFeedBtn1F
-
-
- systems/electrical/ac-ess-feed-fault
- 1
-
-
- controls/electrical/switches/ac-ess-feed
- 1
-
-
+
+ systems/electrical/ac-ess-feed-fault
+ 1
+
controls/switches/annun-test
1
@@ -2999,12 +2993,12 @@
select
- ACESSFeedBtn2O
+ ACESSFeedBtn2A
controls/electrical/switches/ac-ess-feed
- 0
+ 1
controls/switches/annun-test
diff --git a/Models/Instruments/OHpanel/res/buttons-grid.png b/Models/Instruments/OHpanel/res/buttons-grid.png
deleted file mode 100644
index a25f1b0e..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons2-grid.png b/Models/Instruments/OHpanel/res/buttons2-grid.png
deleted file mode 100644
index e36a4db4..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons2-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons3-grid.png b/Models/Instruments/OHpanel/res/buttons3-grid.png
deleted file mode 100644
index 7d9f83ac..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons3-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons4-grid.png b/Models/Instruments/OHpanel/res/buttons4-grid.png
deleted file mode 100644
index 0365d481..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons4-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons5-grid.png b/Models/Instruments/OHpanel/res/buttons5-grid.png
deleted file mode 100644
index 26fdbc1c..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons5-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons6-grid.png b/Models/Instruments/OHpanel/res/buttons6-grid.png
deleted file mode 100644
index 6b66b739..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons6-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons7-grid.png b/Models/Instruments/OHpanel/res/buttons7-grid.png
deleted file mode 100644
index 1ad03141..00000000
Binary files a/Models/Instruments/OHpanel/res/buttons7-grid.png and /dev/null differ
diff --git a/Models/Instruments/OHpanel/res/buttons7.png b/Models/Instruments/OHpanel/res/buttons7.png
index 9b4690f4..955d2609 100644
Binary files a/Models/Instruments/OHpanel/res/buttons7.png and b/Models/Instruments/OHpanel/res/buttons7.png differ
diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac
index 426c26fe..dcc69378 100644
--- a/Models/Instruments/OHpanel/res/ohpanel.ac
+++ b/Models/Instruments/OHpanel/res/ohpanel.ac
@@ -36994,11 +36994,11 @@ refs 4
2 9.31321e-008 0.5
kids 0
OBJECT poly
-name "ACESSFeedBtn2O"
+name "ACESSFeedBtn2A"
loc 0.000175806 0.0480501 -0.11075
data 8
Cube.062
-texture "buttons2.png"
+texture "buttons7.png"
crease 30.000000
numvert 8
-0.01 -0.0464 0.0314
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 56a14623..02d49d7c 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -145,7 +145,7 @@ var ELEC = {
setprop("/controls/electrical/switches/gen-apu", 1);
setprop("/controls/electrical/switches/gen-ext", 0);
setprop("/controls/electrical/switches/apu-ext-crosstie", 1);
- setprop("/controls/electrical/switches/ac-ess-feed", 1);
+ setprop("/controls/electrical/switches/ac-ess-feed", 0);
setprop("/controls/electrical/switches/battery1", 0);
setprop("/controls/electrical/switches/battery2", 0);
setprop("/systems/electrical/battery1-volts", 25.9);
@@ -419,117 +419,71 @@ var ELEC = {
# Left AC bus yes?
if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "GEN";
} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "EXT";
} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "APU";
} else if (apu_ext_crosstie_sw == 1 and xtieL) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "XTIE";
} else if (emergen) {
setprop("/systems/electrical/bus/ac1", 0);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "ESSRAT";
} else if (dcbat and ias >= 50) {
setprop("/systems/electrical/bus/ac1", 0);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "ESSBAT";
} else {
setprop("/systems/electrical/bus/ac1", 0);
- if (getprop("/systems/electrical/bus/ac2") == 0) {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac1_src = "XX";
}
# Right AC bus yes?
if (stateR == 3 and gen2_sw and !gen2_fail) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac2_src = "GEN";
} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac2_src = "EXT";
} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac2_src = "APU";
} else if (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac2_src = "XTIE";
} else if (emergen) {
setprop("/systems/electrical/bus/ac2", 0);
- if (!ac_ess_fail) {
- setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
- } else {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
ac2_src = "ESSRAT";
} else if (dcbat and ias >= 50) {
setprop("/systems/electrical/bus/ac2", 0);
- if (!ac_ess_fail) {
+ ac2_src = "ESSBAT";
+ } else {
+ setprop("/systems/electrical/bus/ac2", 0);
+ ac2_src = "XX";
+ }
+
+ ac1 = getprop("/systems/electrical/bus/ac1");
+ ac2 = getprop("/systems/electrical/bus/ac2");
+
+ # AC ESS bus yes?
+ if (!ac_ess_fail) {
+ if (ac1 >= 110 and !ac_ess_feed_sw) {
+ setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ } else if (ac2 >= 110 and ac_ess_feed_sw) {
+ setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ } else if (emergen or (dcbat and ias >= 50)) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
- ac2_src = "ESSBAT";
} else {
- setprop("/systems/electrical/bus/ac2", 0);
- if (getprop("/systems/electrical/bus/ac1") == 0) {
- setprop("/systems/electrical/bus/ac-ess", 0);
- }
- ac2_src = "XX";
+ setprop("/systems/electrical/bus/ac-ess", 0);
}
+ ac_ess = getprop("/systems/electrical/bus/ac-ess");
+
# HZ/Volts yes?
if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/extra/gen1-volts", ac_volt_std);
@@ -563,10 +517,6 @@ var ELEC = {
setprop("/systems/electrical/extra/apu-hz", 0);
}
- ac1 = getprop("/systems/electrical/bus/ac1");
- ac2 = getprop("/systems/electrical/bus/ac2");
- ac_ess = getprop("/systems/electrical/bus/ac-ess");
-
if (ac1 == 0 and ac2 == 0 and emergen == 0) {
setprop("/systems/electrical/bus/ac-ess-shed", 0);
} else {
@@ -738,7 +688,7 @@ var ELEC = {
setprop("/systems/electrical/gen1-fault", 0);
}
- if (ac_ess_fail and ac_ess_feed_sw) {
+ if (ac_ess_fail) {
setprop("/systems/electrical/ac-ess-feed-fault", 1);
} else {
setprop("/systems/electrical/ac-ess-feed-fault", 0);
diff --git a/revision.txt b/revision.txt
index bbc24e95..7b509411 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4210
\ No newline at end of file
+4211
\ No newline at end of file