diff --git a/Models/Instruments/ECAM/page-apu.xml b/Models/Instruments/ECAM/page-apu.xml
index 40a7cce4..351f5aac 100644
--- a/Models/Instruments/ECAM/page-apu.xml
+++ b/Models/Instruments/ECAM/page-apu.xml
@@ -159,7 +159,7 @@
number-value
- /systems/electrical/suppliers/apu-v
+ /systems/electrical/extra/apu-volts
%3.0f
@@ -170,7 +170,7 @@
x-shift
- -80
+ -84
diff --git a/Models/Instruments/ECAM/page-elec.xml b/Models/Instruments/ECAM/page-elec.xml
index a184f9a5..2aa9fec5 100644
--- a/Models/Instruments/ECAM/page-elec.xml
+++ b/Models/Instruments/ECAM/page-elec.xml
@@ -213,19 +213,9 @@
-
-
-
-
-
-
-
-
-
-
text
- GEN1
+ GEN1-volts
0
1.0
@@ -236,7 +226,7 @@
number-value
- /systems/electrical/suppliers/gen1-v
+ /systems/electrical/bus/ac1
%3.0f
@@ -247,15 +237,20 @@
x-shift
- -116
+ -117
+
+
+ /controls/electrical/switches/gen1
+ 1
+
+
-
text
- GEN2
+ GEN2-volts
0
1.0
@@ -266,7 +261,7 @@
number-value
- /systems/electrical/suppliers/gen2-v
+ /systems/electrical/bus/ac2
%3.0f
@@ -277,13 +272,17 @@
x-shift
- 92
+ 91
+
+
+ /controls/electrical/switches/gen2
+ 1
+
+
-
-
text
APU-V
@@ -292,26 +291,77 @@
0
helvetica_bold
- 11
+ 10
number-value
- /systems/electrical/suppliers/apu-v
+ /systems/electrical/extra/apu-volts
%3.0f
y-shift
- -66
+ -58
x-shift
-24
+
+
+
+ /controls/electrical/switches/gen-apu
+ 1
+
+
+ /controls/electrical/switches/gen-ext
+ 0
+
+
+
+
+
+ text
+ APU-H
+
+ 0
+ 1.0
+ 0
+
+ helvetica_bold
+ 10
+
+
+ number-value
+ /systems/electrical/extra/apu-hz
+ %3.0f
+
+
+
+
+ y-shift
+ -67
+
+
+ x-shift
+ -24
+
+
+
+
+
+ /controls/electrical/switches/gen-apu
+ 1
+
+
+ /controls/electrical/switches/gen-ext
+ 0
+
+
+
-
text
@@ -322,26 +372,334 @@
0
helvetica_bold
- 11
+ 10
number-value
- /systems/electrical/suppliers/ext-power-v
+ /systems/electrical/extra/ext-volts
%3.0f
y-shift
- -54
+ -53
x-shift
- 37
+ 32
+
+
+
+ /controls/electrical/switches/gen-ext
+ 1
+
+
+ /controls/switches/cart
+ 1
+
+
+
+
+
+ text
+ EXT-V
+
+ 0
+ 1.0
+ 0
+
+ helvetica_bold
+ 10
+
+
+ number-value
+ /systems/electrical/extra/ext-volts
+ %3.0f
+
+
+
+
+ y-shift
+ -53
+
+
+ x-shift
+ 32
+
+
+
+
+
+ /controls/electrical/switches/gen-ext
+ 1
+
+
+ /controls/switches/cart
+ 1
+
+
+
+
+
+ text
+ EXT-H
+
+ 0
+ 1.0
+ 0
+
+ helvetica_bold
+ 10
+
+
+ number-value
+ /systems/electrical/extra/ext-hz
+ %3.0f
+
+
+
+
+ y-shift
+ -63
+
+
+ x-shift
+ 32
+
+
+
+
+
+ /controls/electrical/switches/gen-ext
+ 1
+
+
+ /controls/switches/cart
+ 1
+
+
+
+
+
+ apugen
+ true
+ 42
+ 42
+
+ Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-off.png
+
+
+
+ y-shift
+ -53
+
+
+ x-shift
+ -11
+
+
+
+
+
+ /controls/electrical/switches/gen-apu
+ 0
+
+
+ /controls/APU/master
+ 1
+
+
+ /controls/electrical/switches/gen-ext
+ 0
+
+
+
+
+
+ apugenno
+ true
+ 42
+ 42
+
+ Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-no.png
+
+
+
+ y-shift
+ -53
+
+
+ x-shift
+ -11
+
+
+
+
+
+ /controls/APU/master
+ 0
+
+
+ /controls/electrical/switches/gen-ext
+ 1
+
+
+
+
+
+ noextpwr
+ true
+ 55
+ 38
+
+ Aircraft/A320Family/Models/Instruments/ECAM/res/elec-extpwroff.png
+
+
+
+ y-shift
+ -50
+
+
+ x-shift
+ 44
+
+
+
+
+
+ /controls/electrical/switches/gen-ext
+ 0
+
+
+ /controls/switches/cart
+ 0
+
+
+
+
+
+
+ text
+ GEN1-hz
+
+ 0
+ 1.0
+ 0
+
+ helvetica_bold
+ 11
+
+
+ number-value
+ /systems/electrical/bus/gen1-hz
+ %3.0f
+
+
+
+
+ y-shift
+ -68
+
+
+ x-shift
+ -117
+
+
+
+
+ /controls/electrical/switches/gen1
+ 1
+
+
+
+ text
+ GEN2-hz
+
+ 0
+ 1.0
+ 0
+
+ helvetica_bold
+ 11
+
+
+ number-value
+ /systems/electrical/bus/gen2-hz
+ %3.0f
+
+
+
+
+ y-shift
+ -68
+
+
+ x-shift
+ 91
+
+
+
+
+ /controls/electrical/switches/gen2
+ 1
+
+
+
+
+ gen1off
+ true
+ 44
+ 55
+
+ Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen1off.png
+
+
+
+ y-shift
+ -48
+
+
+ x-shift
+ -103
+
+
+
+
+ /controls/electrical/switches/gen1
+ 0
+
+
+
+
+ gen2off
+ true
+ 44
+ 55
+
+ Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen2off.png
+
+
+
+ y-shift
+ -48
+
+
+ x-shift
+ 106
+
+
+
+
+ /controls/electrical/switches/gen2
+ 0
+
+
+
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen-no.png b/Models/Instruments/ECAM/res/elec-apu-gen-no.png
new file mode 100644
index 00000000..b0b3f4e4
Binary files /dev/null and b/Models/Instruments/ECAM/res/elec-apu-gen-no.png differ
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen-off.png b/Models/Instruments/ECAM/res/elec-apu-gen-off.png
index 9b51f079..8392bbb2 100644
Binary files a/Models/Instruments/ECAM/res/elec-apu-gen-off.png and b/Models/Instruments/ECAM/res/elec-apu-gen-off.png differ
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen.png b/Models/Instruments/ECAM/res/elec-apu-gen.png
deleted file mode 100644
index 757104df..00000000
Binary files a/Models/Instruments/ECAM/res/elec-apu-gen.png and /dev/null differ
diff --git a/Models/Instruments/ECAM/res/elec-extpwr.png b/Models/Instruments/ECAM/res/elec-extpwr.png
deleted file mode 100644
index 1bc6c68e..00000000
Binary files a/Models/Instruments/ECAM/res/elec-extpwr.png and /dev/null differ
diff --git a/Models/Instruments/ECAM/res/elec-extpwroff.png b/Models/Instruments/ECAM/res/elec-extpwroff.png
new file mode 100644
index 00000000..d942f4e1
Binary files /dev/null and b/Models/Instruments/ECAM/res/elec-extpwroff.png differ
diff --git a/Models/Instruments/ECAM/res/page-elec.png b/Models/Instruments/ECAM/res/page-elec.png
index cf640f70..2da68802 100644
Binary files a/Models/Instruments/ECAM/res/page-elec.png and b/Models/Instruments/ECAM/res/page-elec.png differ
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 9f30b2ab..f24ef5a0 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -35,9 +35,13 @@ var elec_init = func {
setprop("/systems/electrical/bus/dc-ess", 0);
setprop("/systems/electrical/bus/ac1", 0);
setprop("/systems/electrical/bus/ac2", 0);
- setprop("/systems/electrical/bus/ac1-hz", 0);
- setprop("/systems/electrical/bus/ac2-hz", 0);
+ setprop("/systems/electrical/bus/gen1-hz", 0);
+ setprop("/systems/electrical/bus/gen2-hz", 0);
setprop("/systems/electrical/bus/ac-ess", 0);
+ setprop("/systems/electrical/extra/ext-volts", 0);
+ setprop("/systems/electrical/extra/apu-volts", 0);
+ setprop("/systems/electrical/extra/ext-hz", 0);
+ setprop("/systems/electrical/extra/apu-hz", 0);
setprop("systems/electrical/on", 0);
setprop("/controls/electrical/xtie/xtieL", 0);
setprop("/controls/electrical/xtie/xtieR", 0);
@@ -131,29 +135,39 @@ var master_elec = func {
if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
+ setprop("/systems/electrical/extra/ext-hz", ac_volt_std);
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 (rpmapu >= 94.9 and gen_apu_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
+ setprop("/systems/electrical/extra/apu-hz", ac_volt_std);
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 (stateL == 3 and gen1_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/bus/gen1-hz", ac_hz_std);
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 (apu_ext_crosstie_sw == 1 and xtieL) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/bus/gen1-hz", ac_hz_std);
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 {
setprop("/systems/electrical/bus/ac1", 0);
+ setprop("/systems/electrical/extra/ext-volts", 0);
+ setprop("/systems/electrical/extra/apu-volts", 0);
+ setprop("/systems/electrical/extra/ext-hz", 0);
+ setprop("/systems/electrical/extra/apu-hz", 0);
if (getprop("/systems/electrical/bus/ac2") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0);
}
@@ -168,29 +182,39 @@ var master_elec = func {
if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
+ setprop("/systems/electrical/extra/ext-hz", ac_hz_std);
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 (rpmapu >= 94.9 and gen_apu_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
+ setprop("/systems/electrical/extra/apu-hz", ac_hz_std);
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 (stateR == 3 and gen2_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/bus/gen2-hz", ac_hz_std);
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 (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+ setprop("/systems/electrical/bus/gen2-hz", ac_hz_std);
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 {
setprop("/systems/electrical/bus/ac2", 0);
+ setprop("/systems/electrical/extra/ext-volts", 0);
+ setprop("/systems/electrical/extra/apu-volts", 0);
+ setprop("/systems/electrical/extra/ext-hz", 0);
+ setprop("/systems/electrical/extra/apu-hz", 0);
if (getprop("/systems/electrical/bus/ac1") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0);
}