diff --git a/A318-100-CFM-set.xml b/A318-100-CFM-set.xml
index ec1f96be..6cc95807 100644
--- a/A318-100-CFM-set.xml
+++ b/A318-100-CFM-set.xml
@@ -42,7 +42,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -55,7 +55,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -68,7 +68,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -81,7 +81,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -94,7 +94,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml
index 5a2c24ff..2b9557c4 100644
--- a/A319-100-CFM-set.xml
+++ b/A319-100-CFM-set.xml
@@ -47,7 +47,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -60,7 +60,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -73,7 +73,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -86,7 +86,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -99,7 +99,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml
index 1bfdf7ba..e4c2962e 100644
--- a/A319-100-IAE-set.xml
+++ b/A319-100-IAE-set.xml
@@ -47,7 +47,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -60,7 +60,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -73,7 +73,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -86,7 +86,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -99,7 +99,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index 6e490f83..19ad4437 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -67,7 +67,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -80,7 +80,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -93,7 +93,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -106,7 +106,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -119,7 +119,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 0532f992..f3ced74e 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -67,7 +67,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -80,7 +80,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -93,7 +93,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -106,7 +106,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -119,7 +119,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index e0a18e81..04fc2b89 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -67,7 +67,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -80,7 +80,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -93,7 +93,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -106,7 +106,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -119,7 +119,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A320-main.xml b/A320-main.xml
index 24d4474d..e7a4431f 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -809,7 +809,7 @@
property-assign
/sim/current-view/view-number
- 9
+ 8
@@ -818,7 +818,7 @@
property-assign
/sim/current-view/view-number
- 10
+ 9
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index 12dcc974..5eca12c2 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -57,7 +57,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -70,7 +70,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -83,7 +83,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -96,7 +96,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -109,7 +109,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml
index d9a07f5f..2b635f9d 100644
--- a/A320neo-PW-set.xml
+++ b/A320neo-PW-set.xml
@@ -57,7 +57,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -70,7 +70,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -83,7 +83,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -96,7 +96,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -109,7 +109,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml
index 9b692c58..3ed8f2b2 100644
--- a/A321-200-CFM-set.xml
+++ b/A321-200-CFM-set.xml
@@ -47,7 +47,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -60,7 +60,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -73,7 +73,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -86,7 +86,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -99,7 +99,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 2152fcaa..78922b1c 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -48,7 +48,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -61,7 +61,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -74,7 +74,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -87,7 +87,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -100,7 +100,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A321neo-CFM-set.xml b/A321neo-CFM-set.xml
index 88922e6b..71108d96 100644
--- a/A321neo-CFM-set.xml
+++ b/A321neo-CFM-set.xml
@@ -43,7 +43,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -56,7 +56,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -69,7 +69,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -82,7 +82,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -95,7 +95,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/A321neo-PW-set.xml b/A321neo-PW-set.xml
index 6b45343c..b7f46ffb 100644
--- a/A321neo-PW-set.xml
+++ b/A321neo-PW-set.xml
@@ -43,7 +43,7 @@
60
-
+
Copilot View
lookfrom
true
@@ -56,7 +56,7 @@
60
-
+
Overhead Panel View
lookfrom
true
@@ -69,7 +69,7 @@
85
-
+
Left Engine View
lookfrom
false
@@ -82,7 +82,7 @@
85
-
+
Right Wing View
lookfrom
false
@@ -95,7 +95,7 @@
85
-
+
Aft View
lookfrom
false
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml
index 6f995429..f7ac6f6d 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml
@@ -13,6 +13,16 @@
eng-eis1.xml
+
+
+
+ /instrumentation/efis/ecam/display-mode
+ APU
+
+
+ apu.xml
+
+
osgtxt-common.xml
diff --git a/Models/Instruments/Lower-ECAM/apu.xml b/Models/Instruments/Lower-ECAM/apu.xml
new file mode 100644
index 00000000..931534a0
--- /dev/null
+++ b/Models/Instruments/Lower-ECAM/apu.xml
@@ -0,0 +1,579 @@
+
+
+
+ res/apu/apu.ac
+
+
+
+
+
+ rotate
+ N
+ /systems/apu/rpm
+
+ 0-126
+ 100 54
+
+
+ 0
+ -0.04466
+ 0.0003
+
+
+ -1
+ 0
+ 0
+
+
+
+
+
+ rotate
+ EGT
+ /systems/apu/egt
+
+ 275-114
+ 300-106
+ 700 -19
+ 1000 67
+ 1100 86
+
+
+ 0
+ -0.04483
+ -0.03256
+
+
+ -1
+ 0
+ 0
+
+
+
+
+
+
+
+ txt.n
+
+ 0.0004
+ -0.04266
+ -0.0033
+
+ center-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/apu/rpm
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ XX.n
+
+ 0.0004
+ -0.04266
+ -0.0033
+
+ center-center
+ yz-plane
+ text-value
+ XX
+ autopilot/servicable
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+
+
+ txt.egt
+
+ 0.0004
+ -0.04283
+ -0.03556
+
+ center-center
+ yz-plane
+ number-value
+ %4.0f
+ /systems/apu/egt
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ XX.egt
+
+ 0.0004
+ -0.04283
+ -0.03556
+
+ center-center
+ yz-plane
+ text-value
+ XX
+ autopilot/servicable
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+
+
+ txt.avail
+
+ 0.0004
+ 0.0
+ 0.05
+
+ center-center
+ yz-plane
+ text-value
+ AVAIL
+ autopilot/servicable
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.0055
+
+ 32
+ 32
+
+
+
+
+ select
+ txt.avail
+ txt.bleedpsi
+
+
+ /systems/apu/rpm
+ 94.9
+
+
+
+
+
+ txt.flapopen
+
+ 0.0004
+ 0.035
+ -0.01
+
+ center-center
+ yz-plane
+ text-value
+ FLAP OPEN
+ autopilot/servicable
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.0055
+
+ 32
+ 32
+
+
+
+
+ select
+ txt.flapopen
+
+
+
+ /systems/apu/rpm
+ 3.5
+
+
+ /controls/APU/master
+ 1
+
+
+
+
+
+
+ txt.bleedpsi
+
+ 0.0004
+ 0.047
+ 0.033
+
+ center-center
+ yz-plane
+ number-value
+ %2.0f
+ /systems/pneumatic/bleedapu
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ XX.bleedpsi
+
+ 0.0004
+ 0.047
+ 0.033
+
+ center-center
+ yz-plane
+ text-value
+ XX
+ autopilot/servicable
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ select
+ XX.bleedpsi
+
+
+ /systems/apu/rpm
+ 94.9
+
+
+
+
+
+ txt.load
+
+ 0.0004
+ -0.048
+ 0.0483
+
+ right-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/electrical/extra/apu-load
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ txt.volts
+
+ 0.0004
+ -0.048
+ 0.0413
+
+ right-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/electrical/extra/apu-volts
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ txt.volts.a
+
+ 0.0004
+ -0.048
+ 0.0413
+
+ right-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/electrical/extra/apu-volts
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ select
+ txt.volts
+
+
+ /systems/electrical/extra/apu-volts
+ 110
+
+
+
+
+
+ select
+ txt.volts.a
+
+
+ /systems/electrical/extra/apu-volts
+ 110
+
+
+
+
+
+ txt.hz
+
+ 0.0004
+ -0.048
+ 0.034
+
+ right-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/electrical/extra/apu-hz
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ txt.hz.a
+
+ 0.0004
+ -0.048
+ 0.034
+
+ right-center
+ yz-plane
+ number-value
+ %3.0f
+ /systems/electrical/extra/apu-hz
+ false
+ helvetica_bold.txf
+ true
+ false
+ false
+ 0.005
+
+ 32
+ 32
+
+
+
+
+ select
+ txt.hz
+
+
+ /systems/electrical/extra/apu-hz
+ 380
+
+
+
+
+
+ select
+ txt.hz.a
+
+
+ /systems/electrical/extra/apu-hz
+ 380
+
+
+
+
+
+
+ select
+ bleed-inline
+
+
+
+ /systems/pneumatic/bleedapu
+ 0
+
+
+ /controls/pneumatic/switches/bleedapu
+ 1
+
+
+
+
+
+
+
+
+ select
+ N
+ EGT
+ txt.n
+ txt.egt
+
+
+
+ /systems/apu/rpm
+ 3.5
+
+
+ /controls/APU/master
+ 1
+
+
+
+
+
+
+ select
+ XX.n
+ XX.egt
+
+
+
+ /systems/apu/rpm
+ 3.5
+
+
+ /controls/APU/master
+ 0
+
+
+
+
+
+
+
+
+
+ material
+ txt.n
+ txt.egt
+ txt.avail
+ txt.flapopen
+ txt.bleedpsi
+ txt.load
+ txt.volts
+ txt.hz
+
+ 0
+ 0.543
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0.543
+ 0
+
+
+
+
+
+ material
+ XX.n
+ XX.egt
+ XX.bleedpsi
+ txt.volts.a
+ txt.hz.a
+
+ 1
+ 0.4
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+ 1
+ 0.4
+ 0
+
+
+
+
diff --git a/Models/Instruments/Lower-ECAM/res/apu/apu-extra.png b/Models/Instruments/Lower-ECAM/res/apu/apu-extra.png
new file mode 100644
index 00000000..baf4d6a9
Binary files /dev/null and b/Models/Instruments/Lower-ECAM/res/apu/apu-extra.png differ
diff --git a/Models/Instruments/Lower-ECAM/res/apu/apu.ac b/Models/Instruments/Lower-ECAM/res/apu/apu.ac
new file mode 100644
index 00000000..e44f9628
--- /dev/null
+++ b/Models/Instruments/Lower-ECAM/res/apu/apu.ac
@@ -0,0 +1,198 @@
+AC3Db
+MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0
+MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 1 1 1 shi 0 trans 0
+OBJECT world
+kids 4
+OBJECT poly
+name "bleed-inline"
+loc 7.20988e-005 -0.0851298 -0.51126
+texture "apu-extra.png"
+crease 45.000000
+numvert 4
+0 0.130166 0.464091
+0 0.130166 0.452192
+0 0.150206 0.452192
+0 0.150206 0.464091
+numsurf 1
+SURF 0x10
+mat 0
+refs 4
+3 0.787356 0.908774
+0 0.787356 0.783756
+1 0.859843 0.783756
+2 0.859843 0.908774
+kids 0
+OBJECT poly
+name "N"
+loc 0.000492332 0.00759549 0.0446599
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00834595 -0.000478942
+0 -0.00776947 -0.000478942
+0 -0.00776947 0.000477958
+0 0.00834595 0.000477958
+numsurf 1
+SURF 0x0
+mat 1
+refs 4
+0 1.00067 0.999407
+3 4.45843e-005 0.999407
+2 4.45843e-005 0.000756443
+1 1.00067 0.000756443
+kids 0
+OBJECT poly
+name "face"
+loc 1.6424e-005 -0.0851298 -0.51126
+texture "apu.png"
+crease 45.000000
+numvert 16
+0 0.00773944 0.430689
+0 0.00625946 0.43426
+0 0.00623417 0.588284
+0 0.00771479 0.591855
+0 0.0113114 0.42921
+0 0.0113114 0.43426
+0 0.0112861 0.588284
+0 0.0112861 0.593334
+0 0.158974 0.429186
+0 0.162542 0.430665
+0 0.164025 0.434236
+0 0.158974 0.434236
+0 0.15895 0.593311
+0 0.15895 0.58826
+0 0.16252 0.591832
+0 0.164001 0.58826
+numsurf 18
+SURF 0x10
+mat 0
+refs 3
+0 0.990844 0.0200349
+5 0.969089 0.0423177
+1 0.969089 0.0108024
+SURF 0x10
+mat 0
+refs 3
+4 0.999854 0.0423177
+5 0.969089 0.0423177
+0 0.990844 0.0200349
+SURF 0x10
+mat 0
+refs 3
+6 0.0307649 0.0421599
+1 0.969089 0.0108024
+5 0.969089 0.0423177
+SURF 0x10
+mat 0
+refs 3
+1 0.969089 0.0108024
+6 0.0307649 0.0421599
+2 0.0307649 0.0106447
+SURF 0x10
+mat 0
+refs 3
+6 0.0307649 0.0421599
+7 0 0.0421599
+3 0.00901031 0.0198811
+SURF 0x10
+mat 0
+refs 3
+6 0.0307649 0.0421599
+3 0.00901031 0.0198811
+2 0.0307649 0.0106447
+SURF 0x10
+mat 0
+refs 3
+5 0.969089 0.0423177
+8 1 0.963469
+11 0.969235 0.963469
+SURF 0x10
+mat 0
+refs 3
+8 1 0.963469
+5 0.969089 0.0423177
+4 0.999854 0.0423177
+SURF 0x10
+mat 0
+refs 3
+13 0.0309113 0.963318
+5 0.969089 0.0423177
+11 0.969235 0.963469
+SURF 0x10
+mat 0
+refs 3
+5 0.969089 0.0423177
+13 0.0309113 0.963318
+6 0.0307649 0.0421599
+SURF 0x10
+mat 0
+refs 3
+7 0 0.0421599
+13 0.0309113 0.963318
+12 0.00014019 0.963318
+SURF 0x10
+mat 0
+refs 3
+13 0.0309113 0.963318
+7 0 0.0421599
+6 0.0307649 0.0421599
+SURF 0x10
+mat 0
+refs 3
+11 0.969235 0.963469
+8 1 0.963469
+9 0.99099 0.985727
+SURF 0x10
+mat 0
+refs 3
+10 0.969235 0.99498
+11 0.969235 0.963469
+9 0.99099 0.985727
+SURF 0x10
+mat 0
+refs 3
+15 0.0309113 0.994828
+11 0.969235 0.963469
+10 0.969235 0.99498
+SURF 0x10
+mat 0
+refs 3
+11 0.969235 0.963469
+15 0.0309113 0.994828
+13 0.0309113 0.963318
+SURF 0x10
+mat 0
+refs 3
+12 0.00014019 0.963318
+13 0.0309113 0.963318
+14 0.00915051 0.985588
+SURF 0x10
+mat 0
+refs 3
+15 0.0309113 0.994828
+14 0.00915051 0.985588
+13 0.0309113 0.963318
+kids 0
+OBJECT poly
+name "EGT"
+loc 0.000492332 -0.025522 0.044835
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00860268 0.000477958
+0 -0.00751274 0.000477958
+0 -0.00751274 -0.000478942
+0 0.00860268 -0.000478942
+numsurf 1
+SURF 0x0
+mat 1
+refs 4
+3 1.00067 0.999407
+0 4.45843e-005 0.999407
+1 4.45843e-005 0.000756443
+2 1.00067 0.000756443
+kids 0
diff --git a/Models/Instruments/Lower-ECAM/res/apu/apu.png b/Models/Instruments/Lower-ECAM/res/apu/apu.png
new file mode 100644
index 00000000..42e434e9
Binary files /dev/null and b/Models/Instruments/Lower-ECAM/res/apu/apu.png differ
diff --git a/Models/Instruments/Lower-ECAM/res/apu/needle.png b/Models/Instruments/Lower-ECAM/res/apu/needle.png
new file mode 100644
index 00000000..7eae21df
Binary files /dev/null and b/Models/Instruments/Lower-ECAM/res/apu/needle.png differ
diff --git a/Models/Instruments/Lower-ECAM/res/empty.ac b/Models/Instruments/Lower-ECAM/res/empty.ac
new file mode 100644
index 00000000..4dd7e1f9
--- /dev/null
+++ b/Models/Instruments/Lower-ECAM/res/empty.ac
@@ -0,0 +1,3 @@
+AC3Db
+OBJECT world
+kids 0
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index a7e589c2..55ca1cb3 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -180,11 +180,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 (gen_apu and !genapu_fail) {
+ } else if (extpwr_on and gen_ext_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 (extpwr_on and gen_ext_sw) {
+ } else if (gen_apu and !genapu_fail) {
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);
@@ -209,11 +209,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 (gen_apu and !genapu_fail) {
+ } else if (extpwr_on and gen_ext_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 (extpwr_on and gen_ext_sw) {
+ } else if (gen_apu and !genapu_fail) {
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);
@@ -236,10 +236,10 @@ 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 (gen_apu and !genapu_fail) {
- setprop("/systems/electrical/bus/ac1", ac_volt_std);
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
+ } else if (gen_apu and !genapu_fail) {
+ 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);
} else if (emergen) {
@@ -251,10 +251,10 @@ 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 (gen_apu and !genapu_fail) {
- setprop("/systems/electrical/bus/ac2", ac_volt_std);
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
+ } else if (gen_apu and !genapu_fail) {
+ 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);
} else if (emergen) {
diff --git a/Nasal/engines.nas b/Nasal/engines.nas
index 413b901e..ec96f84e 100644
--- a/Nasal/engines.nas
+++ b/Nasal/engines.nas
@@ -7,20 +7,21 @@
var engines = props.globals.getNode("/engines").getChildren("engine");
var n1_min = 22.4;
-var n2_min = 63.7;
+var n2_min = 60.7;
var egt_min = 434;
var n1_spin = 5.1;
var n2_spin = 22.8;
var n1_start = 22.3;
-var n2_start = 63.6;
+var n2_start = 60.6;
var egt_start = 587;
var n1_max = 105.8;
var n2_max = 102.1;
var egt_max = 712;
var n1_wm = 0;
var n2_wm = 0;
-var apu_max = 99.8;
-var apu_egt_max = 513;
+var apu_max = 99.2;
+var apu_egt_min = 496;
+var apu_egt_max = 643;
var spinup_time = 49;
var start_time = 10;
var egt_lightup_time = 2;
@@ -50,6 +51,9 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
eng_one_man_startt.start();
}
} else if (getprop("/controls/engines/engine[0]/cutoff-switch") == 1) {
+ eng_one_auto_startt.stop();
+ eng_one_man_startt.stop();
+ eng_one_n2_checkt.stop();
setprop("/controls/engines/engine[0]/man-start", 0);
setprop("/systems/pneumatic/eng1-starter", 0);
setprop("/controls/engines/engine[0]/starter", 0);
@@ -99,6 +103,9 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
eng_two_man_startt.start();
}
} else if (getprop("/controls/engines/engine[1]/cutoff-switch") == 1) {
+ eng_two_auto_startt.stop();
+ eng_two_man_startt.stop();
+ eng_two_n2_checkt.stop();
setprop("/controls/engines/engine[1]/man-start", 0);
setprop("/systems/pneumatic/eng2-starter", 0);
setprop("/controls/engines/engine[1]/starter", 0);
@@ -228,16 +235,31 @@ setlistener("/controls/APU/start", func {
if ((getprop("/controls/APU/master") == 1) and (getprop("/controls/APU/start") == 1)) {
if (getprop("/systems/acconfig/autoconfig-running") == 0) {
interpolate("/systems/apu/rpm", apu_max, spinup_time);
- interpolate("/systems/apu/egt", apu_egt_max, spinup_time);
+ apu_egt_checkt.start();
} else if (getprop("/systems/acconfig/autoconfig-running") == 1) {
interpolate("/systems/apu/rpm", apu_max, 5);
interpolate("/systems/apu/egt", apu_egt_max, 5);
}
} else if (getprop("/controls/APU/master") == 0) {
+ apu_egt_checkt.stop();
apu_stop();
}
});
+var apu_egt_check = func {
+ if (getprop("/systems/apu/rpm") >= 28) {
+ apu_egt_checkt.stop();
+ interpolate("/systems/apu/egt", apu_egt_max, 5);
+ apu_egt2_checkt.start();
+ }
+}
+
+var apu_egt2_check = func {
+ if (getprop("/systems/apu/egt") >= 643) {
+ apu_egt2_checkt.stop();
+ interpolate("/systems/apu/egt", apu_egt_min, 20);
+ }
+}
############
# Stop APU #
@@ -246,6 +268,8 @@ setlistener("/controls/APU/start", func {
setlistener("/controls/APU/master", func {
if (getprop("/controls/APU/master") == 0) {
setprop("/controls/APU/start", 0);
+ apu_egt_checkt.stop();
+ apu_egt2_checkt.stop();
apu_stop();
}
});
@@ -394,3 +418,5 @@ var eng_one_n2_checkt = maketimer(0.5, eng_one_n2_check);
var eng_two_auto_startt = maketimer(0.5, eng_two_auto_start);
var eng_two_man_startt = maketimer(0.5, eng_two_man_start);
var eng_two_n2_checkt = maketimer(0.5, eng_two_n2_check);
+var apu_egt_checkt = maketimer(0.5, apu_egt_check);
+var apu_egt2_checkt = maketimer(0.5, apu_egt2_check);