diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index 4ba98b4c..5f944d26 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -13,18 +13,18 @@
- 611903
- 1735389
- 1401293
+ 414659
+ 895647
+ 678957
0
0
0
- 95721.5
+ 95409.5
-2.4335
0
- -0.75
+ -0.934
@@ -32,34 +32,32 @@
-15.44
0
- 0.3
+ 0.39
- 3722
+ 5896
-10.8
0
- 0.3
+ 0.39
-
- 11361
+ 7256
- -4.3
+ -3.3
0
- 0.3
+ 0.39
-
- 8422
+ 6651
- -5.3
+ 4.9
0
- 0.3
+ 0.39
@@ -71,20 +69,18 @@
-1
-
3000
- -3.1
+ 4.2
0
-1
-
0
- -8.1
+ 8.2
0
-1
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 7849acfa..2a644de4 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -13,9 +13,9 @@
- 611903
- 1735389
- 1401293
+ 414659
+ 895647
+ 678957
0
0
0
@@ -24,7 +24,7 @@
-2.4335
0
- -0.75
+ -0.934
@@ -32,34 +32,32 @@
-15.44
0
- 0.3
+ 0.39
- 3722
+ 5896
-10.8
0
- 0.3
+ 0.39
-
- 11361
+ 7256
- -4.3
+ -3.3
0
- 0.3
+ 0.39
-
- 8422
+ 6651
- -5.3
+ 4.9
0
- 0.3
+ 0.39
@@ -71,20 +69,18 @@
-1
-
3000
- -3.1
+ 4.2
0
-1
-
0
- -8.1
+ 8.2
0
-1
diff --git a/A320-main.xml b/A320-main.xml
index b2932c74..b8d85a72 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1378,8 +1378,6 @@
0
0
0
- 0
- 0
0
0
0
@@ -4401,9 +4399,7 @@
Simple Engage/Disengage reversers
nasal
-
+
@@ -4411,9 +4407,7 @@
Disengage/Decrease reversers
nasal
-
+
@@ -4421,65 +4415,15 @@
Engage/Increase reversers
nasal
-
+
Ctrl-b
Cycle speedbrake setting
-
-
-
- /controls/flight/speedbrake-arm
- 1
-
-
-
- /gear/gear[1]/wow
- 1
-
-
- /gear/gear[2]/wow
- 1
-
-
-
-
- property-cycle
- /controls/flight/speedbrake
- 0.0
- 1.0
-
-
-
-
-
- /controls/flight/speedbrake-arm
- 1
-
-
- /gear/gear[1]/wow
- 0
-
-
- /gear/gear[2]/wow
- 0
-
-
-
- property-cycle
- /controls/flight/speedbrake
- 0.0
- 0.5
- 1.0
-
-
- property-assign
- /controls/flight/speedbrake-arm
- 0
+ nasal
+
@@ -4796,7 +4740,6 @@
Aircraft/A320-family/Nasal/MCDU/PERFTO.nas
Aircraft/A320-family/Nasal/MCDU/RADNAV.nas
Aircraft/A320-family/Nasal/MCDU/DATA.nas
- Aircraft/A320-family/Nasal/MCDU/DATA2.nas
Aircraft/A320-family/Nasal/MCDU/STATUS.nas
@@ -4837,6 +4780,7 @@
Aircraft/A320-family/Models/Instruments/DCDU/DCDU.nas
+ Aircraft/A320-family/Models/Instruments/MCDU/MCDU-funcs.nas
Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 7d19e913..ef578295 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -13,18 +13,18 @@
- 611903
- 1735389
- 1401293
+ 414659
+ 895647
+ 678957
0
0
0
- 98160.71
+ 95409.5
-2.4335
0
- -0.75
+ -0.934
@@ -32,34 +32,32 @@
-15.44
0
- 0.3
+ 0.39
- 3722
+ 5896
-10.8
0
- 0.3
+ 0.39
-
- 11361
+ 7256
- -4.3
+ -3.3
0
- 0.3
+ 0.39
-
- 8422
+ 6651
- -5.3
+ 4.9
0
- 0.3
+ 0.39
@@ -71,20 +69,18 @@
-1
-
3000
- -3.1
+ 4.2
0
-1
-
0
- -8.1
+ 8.2
0
-1
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 88082031..5070d82d 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -13,18 +13,18 @@
- 611903
- 1735389
- 1401293
+ 414659
+ 895647
+ 678957
0
0
0
- 97497.7
+ 95409.5
-2.4335
0
- -0.75
+ -0.934
@@ -32,34 +32,32 @@
-15.44
0
- 0.3
+ 0.39
- 3722
+ 5896
-10.8
0
- 0.3
+ 0.39
-
- 11361
+ 7256
- -4.3
+ -3.3
0
- 0.3
+ 0.39
-
- 8422
+ 6651
- -5.3
+ 4.9
0
- 0.3
+ 0.39
@@ -71,20 +69,18 @@
-1
-
3000
- -3.1
+ 4.2
0
-1
-
0
- -8.1
+ 8.2
0
-1
diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
index 1c64299b..eed9220e 100644
--- a/AircraftConfig/fail.xml
+++ b/AircraftConfig/fail.xml
@@ -412,26 +412,6 @@
true
-
-
- left
- /systems/failures/electrical/bat-1
-
- dialog-apply
-
- true
-
-
-
-
- left
- /systems/failures/electrical/bat-2
-
- dialog-apply
-
- true
-
-
left
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 0682ea1e..b81491a1 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -5601,6 +5601,22 @@
+
+
+ pick
+ metric_alt
+
+
+ false
+
+ nasal
+
+
+
+
@@ -6976,48 +6992,20 @@
1
-
-
- false
-
- nasal
-
-
-
false
nasal
-
+
+
+
+
+
+ false
+
+ nasal
+
@@ -7701,19 +7689,15 @@
vs.ind
fpa.ind
fpa.ind.001
- atc-code
- atc-test
fpa-text
qnh-inhg
qnh-hpa
qnh-std
qnh-test
- rudder-trim
- rudder-trim-letter
- 0.75
- 0.30
- 0.0
+ 1.00
+ 0.515
+ 0.00
controls/lighting/fcu-digit-norm
@@ -7727,9 +7711,9 @@
0
- 0.75
- 0.30
- 0.0
+ 1.00
+ 0.515
+ 0.00
controls/lighting/fcu-digit-norm
@@ -7738,10 +7722,12 @@
material
rudder-trim
rudder-trim-letter
+ atc-code
+ atc-test
- 0.75
- 0.30
- 0.0
+ 1.00
+ 0.355
+ 0.00
0
@@ -7754,9 +7740,9 @@
0
- 0.75
- 0.30
- 0.0
+ 1.00
+ 0.355
+ 0.00
@@ -9180,9 +9166,9 @@
dme1
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
0
@@ -9195,9 +9181,9 @@
0
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
diff --git a/Models/FlightDeck/res/fcu.png b/Models/FlightDeck/res/fcu.png
index 12c2f466..24a71eb7 100644
Binary files a/Models/FlightDeck/res/fcu.png and b/Models/FlightDeck/res/fcu.png differ
diff --git a/Models/FlightDeck/res/fcu2.png b/Models/FlightDeck/res/fcu2.png
index 87efcbcb..5b4e39d6 100644
Binary files a/Models/FlightDeck/res/fcu2.png and b/Models/FlightDeck/res/fcu2.png differ
diff --git a/Models/Fuselage/res/CFMLEAP1A.ac b/Models/Fuselage/res/CFMLEAP1A.ac
index d3b8e25d..2639a52b 100644
--- a/Models/Fuselage/res/CFMLEAP1A.ac
+++ b/Models/Fuselage/res/CFMLEAP1A.ac
@@ -3,7 +3,7 @@ MATERIAL "engine-LEAP" rgb 0.720 0.720 0.720 amb 1.000 1.000 1.000 emis 0.000
MATERIAL "engine-LEAP-Inner" rgb 0.800 0.800 0.800 amb 1.000 1.000 1.000 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 5 trans 0.000
OBJECT world
name "Blender_exporter_v2.26__CFMLEAP1A.ac"
-kids 21
+kids 20
OBJECT poly
name "EngineLEAPL"
data 10
@@ -11,7 +11,7 @@ Circle.070
crease 40.0
texture "engine-leap1a.png"
texrep 1 1
-numvert 915
+numvert 971
-5.99603 -1.40518 4.72154
-5.99603 -3.21746 4.72154
-5.99603 -2.08404 4.36962
@@ -927,7 +927,63 @@ numvert 915
-6.59341 -1.42205 5.35885
-6.59533 -1.41164 5.35153
-6.59535 -1.41048 5.35534
-numsurf 763
+-5.36544 -1.38745 6.48767
+-5.58537 -1.40004 6.51961
+-5.89058 -1.42088 6.54841
+-5.3821 -1.34082 6.43333
+-5.60021 -1.35352 6.46475
+-5.90234 -1.37166 6.49624
+-5.36522 -1.38064 6.49365
+-5.89036 -1.41406 6.55439
+-5.58514 -1.39322 6.52558
+-5.38187 -1.334 6.43931
+-5.90211 -1.36484 6.50222
+-5.59998 -1.3467 6.47073
+-5.28901 -1.37521 6.46328
+-5.29742 -1.38317 6.47371
+-6.05451 -1.43226 6.55571
+-6.0674 -1.42517 6.54833
+-6.07481 -1.39031 6.51341
+-6.06527 -1.38175 6.50493
+-6.06718 -1.41835 6.5543
+-6.05428 -1.42545 6.56169
+-6.06504 -1.37493 6.51091
+-6.07458 -1.3835 6.51939
+-5.31444 -1.33587 6.42032
+-5.3008 -1.34233 6.42636
+-5.29719 -1.37636 6.47969
+-5.28878 -1.36839 6.46926
+-5.30058 -1.33551 6.43234
+-5.31421 -1.32905 6.42629
+-5.36544 -1.38745 4.7736
+-5.58537 -1.40004 4.74166
+-5.89058 -1.42088 4.71285
+-5.3821 -1.34082 4.82793
+-5.60021 -1.35352 4.79651
+-5.90234 -1.37166 4.76502
+-5.36522 -1.38064 4.76762
+-5.89036 -1.41406 4.70687
+-5.58514 -1.39322 4.73568
+-5.38187 -1.334 4.82195
+-5.90211 -1.36484 4.75904
+-5.59998 -1.3467 4.79054
+-5.28901 -1.37521 4.79798
+-5.29742 -1.38317 4.78756
+-6.05451 -1.43226 4.70555
+-6.0674 -1.42517 4.71294
+-6.07481 -1.39031 4.74785
+-6.06527 -1.38175 4.75633
+-6.06718 -1.41835 4.70696
+-6.05428 -1.42545 4.69958
+-6.06504 -1.37493 4.75035
+-6.07458 -1.3835 4.74187
+-5.31444 -1.33587 4.84095
+-5.3008 -1.34233 4.8349
+-5.29719 -1.37636 4.78158
+-5.28878 -1.36839 4.79201
+-5.30058 -1.33551 4.82892
+-5.31421 -1.32905 4.83497
+numsurf 799
SURF 0X10
mat 0
refs 4
@@ -6238,332 +6294,266 @@ refs 4
911 0.294766 0.901495
912 0.29524 0.901496
910 0.29524 0.903886
-kids 0
-OBJECT poly
-name "EngineLEAPL.007"
-data 10
-Circle.043
-crease 40.0
-texture "engine-leap1a.png"
-texrep 1 1
-numvert 56
--5.36544 -1.38745 6.48767
--5.58537 -1.40004 6.51961
--5.89058 -1.42088 6.54841
--5.3821 -1.34082 6.43333
--5.60021 -1.35352 6.46475
--5.90234 -1.37166 6.49624
--5.36522 -1.38064 6.49365
--5.89036 -1.41406 6.55439
--5.58514 -1.39322 6.52558
--5.38187 -1.334 6.43931
--5.90211 -1.36484 6.50222
--5.59998 -1.3467 6.47073
--5.28901 -1.37521 6.46328
--5.29742 -1.38317 6.47371
--6.05451 -1.43226 6.55571
--6.0674 -1.42517 6.54833
--6.07481 -1.39031 6.51341
--6.06527 -1.38175 6.50493
--6.06718 -1.41835 6.5543
--6.05428 -1.42545 6.56169
--6.06504 -1.37493 6.51091
--6.07458 -1.3835 6.51939
--5.31444 -1.33587 6.42032
--5.3008 -1.34233 6.42636
--5.29719 -1.37636 6.47969
--5.28878 -1.36839 6.46926
--5.30058 -1.33551 6.43234
--5.31421 -1.32905 6.42629
--5.36544 -1.38745 4.7736
--5.58537 -1.40004 4.74166
--5.89058 -1.42088 4.71285
--5.3821 -1.34082 4.82793
--5.60021 -1.35352 4.79651
--5.90234 -1.37166 4.76502
--5.36522 -1.38064 4.76762
--5.89036 -1.41406 4.70687
--5.58514 -1.39322 4.73568
--5.38187 -1.334 4.82195
--5.90211 -1.36484 4.75904
--5.59998 -1.3467 4.79054
--5.28901 -1.37521 4.79798
--5.29742 -1.38317 4.78756
--6.05451 -1.43226 4.70555
--6.0674 -1.42517 4.71294
--6.07481 -1.39031 4.74785
--6.06527 -1.38175 4.75633
--6.06718 -1.41835 4.70696
--6.05428 -1.42545 4.69958
--6.06504 -1.37493 4.75035
--6.07458 -1.3835 4.74187
--5.31444 -1.33587 4.84095
--5.3008 -1.34233 4.8349
--5.29719 -1.37636 4.78158
--5.28878 -1.36839 4.79201
--5.30058 -1.33551 4.82892
--5.31421 -1.32905 4.83497
-numsurf 36
SURF 0X10
mat 0
refs 4
-2 0.156482 0.623991
-1 0.123384 0.624027
-8 0.123514 0.623013
-7 0.155977 0.622984
+917 0.156482 0.623991
+916 0.123384 0.624027
+923 0.123514 0.623013
+922 0.155977 0.622984
SURF 0X10
mat 0
refs 4
-3 0.100318 0.613748
-4 0.12407 0.614572
-11 0.124187 0.615286
-9 0.10089 0.614613
+918 0.100318 0.613748
+919 0.12407 0.614572
+926 0.124187 0.615286
+924 0.10089 0.614613
SURF 0X10
mat 0
refs 4
-4 0.12407 0.614572
-5 0.156848 0.614608
-10 0.156335 0.615316
-11 0.124187 0.615286
+919 0.12407 0.614572
+920 0.156848 0.614608
+925 0.156335 0.615316
+926 0.124187 0.615286
SURF 0X10
mat 0
refs 4
-1 0.123384 0.624027
-0 0.099433 0.62319
-6 0.100023 0.622329
-8 0.123514 0.623013
+916 0.123384 0.624027
+915 0.099433 0.62319
+921 0.100023 0.622329
+923 0.123514 0.623013
SURF 0X10
mat 0
refs 4
-21 0.174735 0.61585
-16 0.175608 0.615261
-15 0.175425 0.621697
-18 0.174557 0.621109
+936 0.174735 0.61585
+931 0.175608 0.615261
+930 0.175425 0.621697
+933 0.174557 0.621109
SURF 0X10
mat 0
refs 4
-12 0.090914 0.620953
-23 0.091558 0.614428
-26 0.092298 0.615169
-25 0.091667 0.620501
+927 0.090914 0.620953
+938 0.091558 0.614428
+941 0.092298 0.615169
+940 0.091667 0.620501
SURF 0X10
mat 0
refs 4
-22 0.092907 0.613091
-3 0.100318 0.613748
-9 0.10089 0.614613
-27 0.093622 0.614076
+937 0.092907 0.613091
+918 0.100318 0.613748
+924 0.10089 0.614613
+942 0.093622 0.614076
SURF 0X10
mat 0
refs 4
-5 0.156848 0.614608
-17 0.174438 0.61386
-20 0.173588 0.614704
-10 0.156335 0.615316
+920 0.156848 0.614608
+932 0.174438 0.61386
+935 0.173588 0.614704
+925 0.156335 0.615316
SURF 0X10
mat 0
refs 6
-7 0.155977 0.622984
-10 0.156335 0.615316
-20 0.173588 0.614704
-21 0.174735 0.61585
-18 0.174557 0.621109
-19 0.173329 0.622341
+922 0.155977 0.622984
+925 0.156335 0.615316
+935 0.173588 0.614704
+936 0.174735 0.61585
+933 0.174557 0.621109
+934 0.173329 0.622341
SURF 0X10
mat 0
refs 6
-24 0.092711 0.621771
-25 0.091667 0.620501
-26 0.092298 0.615169
-27 0.093622 0.614076
-9 0.10089 0.614613
-6 0.100023 0.622329
+939 0.092711 0.621771
+940 0.091667 0.620501
+941 0.092298 0.615169
+942 0.093622 0.614076
+924 0.10089 0.614613
+921 0.100023 0.622329
SURF 0X10
mat 0
refs 4
-14 0.174174 0.623205
-2 0.156482 0.623991
-7 0.155977 0.622984
-19 0.173329 0.622341
+929 0.174174 0.623205
+917 0.156482 0.623991
+922 0.155977 0.622984
+934 0.173329 0.622341
SURF 0X10
mat 0
refs 4
-11 0.124187 0.615286
-10 0.156335 0.615316
-7 0.155977 0.622984
-8 0.123514 0.623013
+926 0.124187 0.615286
+925 0.156335 0.615316
+922 0.155977 0.622984
+923 0.123514 0.623013
SURF 0X10
mat 0
refs 4
-9 0.10089 0.614613
-11 0.124187 0.615286
-8 0.123514 0.623013
-6 0.100023 0.622329
+924 0.10089 0.614613
+926 0.124187 0.615286
+923 0.123514 0.623013
+921 0.100023 0.622329
SURF 0X10
mat 0
refs 4
-14 0.174174 0.623205
-19 0.173329 0.622341
-18 0.174557 0.621109
-15 0.175425 0.621697
+929 0.174174 0.623205
+934 0.173329 0.622341
+933 0.174557 0.621109
+930 0.175425 0.621697
SURF 0X10
mat 0
refs 4
-16 0.175608 0.615261
-21 0.174735 0.61585
-20 0.173588 0.614704
-17 0.174438 0.61386
+931 0.175608 0.615261
+936 0.174735 0.61585
+935 0.173588 0.614704
+932 0.174438 0.61386
SURF 0X10
mat 0
refs 4
-22 0.092907 0.613091
-27 0.093622 0.614076
-26 0.092298 0.615169
-23 0.091558 0.614428
+937 0.092907 0.613091
+942 0.093622 0.614076
+941 0.092298 0.615169
+938 0.091558 0.614428
SURF 0X10
mat 0
refs 4
-12 0.090914 0.620953
-25 0.091667 0.620501
-24 0.092711 0.621771
-13 0.091978 0.622507
+927 0.090914 0.620953
+940 0.091667 0.620501
+939 0.092711 0.621771
+928 0.091978 0.622507
SURF 0X10
mat 0
refs 4
-0 0.099433 0.62319
-13 0.091978 0.622507
-24 0.092711 0.621771
-6 0.100023 0.622329
+915 0.099433 0.62319
+928 0.091978 0.622507
+939 0.092711 0.621771
+921 0.100023 0.622329
SURF 0X10
mat 0
refs 4
-30 0.068591 0.623991
-35 0.068086 0.622984
-36 0.035623 0.623013
-29 0.035493 0.624027
+945 0.068591 0.623991
+950 0.068086 0.622984
+951 0.035623 0.623013
+944 0.035493 0.624027
SURF 0X10
mat 0
refs 4
-31 0.012427 0.613748
-37 0.012999 0.614613
-39 0.036296 0.615286
-32 0.036179 0.614572
+946 0.012427 0.613748
+952 0.012999 0.614613
+954 0.036296 0.615286
+947 0.036179 0.614572
SURF 0X10
mat 0
refs 4
-32 0.036179 0.614572
-39 0.036296 0.615286
-38 0.068444 0.615316
-33 0.068957 0.614608
+947 0.036179 0.614572
+954 0.036296 0.615286
+953 0.068444 0.615316
+948 0.068957 0.614608
SURF 0X10
mat 0
refs 4
-29 0.035493 0.624027
-36 0.035623 0.623013
-34 0.012132 0.622329
-28 0.011542 0.62319
+944 0.035493 0.624027
+951 0.035623 0.623013
+949 0.012132 0.622329
+943 0.011542 0.62319
SURF 0X10
mat 0
refs 4
-49 0.086844 0.61585
-46 0.086665 0.621109
-43 0.087534 0.621697
-44 0.087717 0.615262
+964 0.086844 0.61585
+961 0.086665 0.621109
+958 0.087534 0.621697
+959 0.087717 0.615262
SURF 0X10
mat 0
refs 4
-40 0.003023 0.620953
-53 0.003776 0.620501
-54 0.004407 0.615169
-51 0.003667 0.614428
+955 0.003023 0.620953
+968 0.003776 0.620501
+969 0.004407 0.615169
+966 0.003667 0.614428
SURF 0X10
mat 0
refs 4
-50 0.005016 0.613091
-55 0.005731 0.614076
-37 0.012999 0.614613
-31 0.012427 0.613748
+965 0.005016 0.613091
+970 0.005731 0.614076
+952 0.012999 0.614613
+946 0.012427 0.613748
SURF 0X10
mat 0
refs 4
-33 0.068957 0.614608
-38 0.068444 0.615316
-48 0.085697 0.614704
-45 0.086547 0.61386
+948 0.068957 0.614608
+953 0.068444 0.615316
+963 0.085697 0.614704
+960 0.086547 0.61386
SURF 0X10
mat 0
refs 6
-35 0.068086 0.622984
-47 0.085438 0.622341
-46 0.086665 0.621109
-49 0.086844 0.61585
-48 0.085697 0.614704
-38 0.068444 0.615316
+950 0.068086 0.622984
+962 0.085438 0.622341
+961 0.086665 0.621109
+964 0.086844 0.61585
+963 0.085697 0.614704
+953 0.068444 0.615316
SURF 0X10
mat 0
refs 6
-52 0.00482 0.621771
-34 0.012132 0.622329
-37 0.012999 0.614613
-55 0.005731 0.614076
-54 0.004407 0.615169
-53 0.003776 0.620501
+967 0.00482 0.621771
+949 0.012132 0.622329
+952 0.012999 0.614613
+970 0.005731 0.614076
+969 0.004407 0.615169
+968 0.003776 0.620501
SURF 0X10
mat 0
refs 4
-42 0.086283 0.623205
-47 0.085438 0.622341
-35 0.068086 0.622984
-30 0.068591 0.623991
+957 0.086283 0.623205
+962 0.085438 0.622341
+950 0.068086 0.622984
+945 0.068591 0.623991
SURF 0X10
mat 0
refs 4
-39 0.036296 0.615286
-36 0.035623 0.623013
-35 0.068086 0.622984
-38 0.068444 0.615316
+954 0.036296 0.615286
+951 0.035623 0.623013
+950 0.068086 0.622984
+953 0.068444 0.615316
SURF 0X10
mat 0
refs 4
-37 0.012999 0.614613
-34 0.012132 0.622329
-36 0.035623 0.623013
-39 0.036296 0.615286
+952 0.012999 0.614613
+949 0.012132 0.622329
+951 0.035623 0.623013
+954 0.036296 0.615286
SURF 0X10
mat 0
refs 4
-42 0.086283 0.623205
-43 0.087534 0.621697
-46 0.086665 0.621109
-47 0.085438 0.622341
+957 0.086283 0.623205
+958 0.087534 0.621697
+961 0.086665 0.621109
+962 0.085438 0.622341
SURF 0X10
mat 0
refs 4
-44 0.087717 0.615262
-45 0.086547 0.61386
-48 0.085697 0.614704
-49 0.086844 0.61585
+959 0.087717 0.615262
+960 0.086547 0.61386
+963 0.085697 0.614704
+964 0.086844 0.61585
SURF 0X10
mat 0
refs 4
-50 0.005016 0.613091
-51 0.003667 0.614428
-54 0.004407 0.615169
-55 0.005731 0.614076
+965 0.005016 0.613091
+966 0.003667 0.614428
+969 0.004407 0.615169
+970 0.005731 0.614076
SURF 0X10
mat 0
refs 4
-40 0.003023 0.620953
-41 0.004087 0.622507
-52 0.00482 0.621771
-53 0.003776 0.620501
+955 0.003023 0.620953
+956 0.004087 0.622507
+967 0.00482 0.621771
+968 0.003776 0.620501
SURF 0X10
mat 0
refs 4
-28 0.011542 0.62319
-34 0.012132 0.622329
-52 0.00482 0.621771
-41 0.004087 0.622507
+943 0.011542 0.62319
+949 0.012132 0.622329
+967 0.00482 0.621771
+956 0.004087 0.622507
kids 0
OBJECT poly
name "EngineLEAPL.Inner"
diff --git a/Models/Fuselage/res/IAEV2500.ac b/Models/Fuselage/res/IAEV2500.ac
index ee4ce409..0f4f16a4 100644
--- a/Models/Fuselage/res/IAEV2500.ac
+++ b/Models/Fuselage/res/IAEV2500.ac
@@ -12658,143 +12658,143 @@ numsurf 20
SURF 0X10
mat 3
refs 4
-1 0.831933 0.473945
-0 0.831933 0.411533
-5 0.898381 0.411533
-2 0.898381 0.473945
+1 0.831933 0.783971
+0 0.831933 0.721559
+5 0.898381 0.721559
+2 0.898381 0.783971
SURF 0X10
mat 3
refs 4
-0 0.831933 0.411533
-40 0.831933 0.38219
-37 0.898381 0.389125
-5 0.898381 0.411533
+0 0.831933 0.721559
+40 0.831933 0.692216
+37 0.898381 0.699151
+5 0.898381 0.721559
SURF 0X10
mat 3
refs 4
-7 0.831933 0.72174
-6 0.831933 0.784152
-3 0.898381 0.784152
-4 0.898381 0.72174
+7 0.831933 0.411714
+6 0.831933 0.474126
+3 0.898381 0.474126
+4 0.898381 0.411714
SURF 0X10
mat 3
refs 4
-6 0.831933 0.784152
-22 0.831933 0.79733
-16 0.898381 0.799399
-3 0.898381 0.784152
+6 0.831933 0.474126
+22 0.831933 0.487304
+16 0.898381 0.489373
+3 0.898381 0.474126
SURF 0X10
mat 3
refs 4
-2 0.898381 0.473945
-5 0.898381 0.411533
-28 0.961802 0.411533
-29 0.961802 0.473945
+2 0.898381 0.783971
+5 0.898381 0.721559
+28 0.961802 0.721559
+29 0.961802 0.783971
SURF 0X10
mat 3
refs 4
-4 0.898381 0.72174
-3 0.898381 0.784152
-33 0.961798 0.784152
-24 0.961798 0.72174
+4 0.898381 0.411714
+3 0.898381 0.474126
+33 0.961798 0.474126
+24 0.961798 0.411714
SURF 0X10
mat 3
refs 4
-3 0.898381 0.784152
-16 0.898381 0.799399
-32 0.961798 0.79932
-33 0.961798 0.784152
+3 0.898381 0.474126
+16 0.898381 0.489373
+32 0.961798 0.489294
+33 0.961798 0.474126
SURF 0X10
mat 3
refs 4
-9 0.831933 0.474028
-8 0.831933 0.411615
-13 0.898381 0.411615
-10 0.898381 0.474028
+9 0.831933 0.784054
+8 0.831933 0.721641
+13 0.898381 0.721641
+10 0.898381 0.784054
SURF 0X10
mat 3
refs 4
-8 0.831933 0.411615
-42 0.831933 0.382274
-38 0.898381 0.389209
-13 0.898381 0.411615
+8 0.831933 0.721641
+42 0.831933 0.6923
+38 0.898381 0.699234
+13 0.898381 0.721641
SURF 0X10
mat 3
refs 4
-15 0.831933 0.721657
-14 0.831933 0.784069
-11 0.898381 0.784069
-12 0.898381 0.721657
+15 0.831933 0.411631
+14 0.831933 0.474043
+11 0.898381 0.474043
+12 0.898381 0.411631
SURF 0X10
mat 3
refs 4
-14 0.831933 0.784069
-21 0.831933 0.797244
-23 0.898381 0.799313
-11 0.898381 0.784069
+14 0.831933 0.474043
+21 0.831933 0.487218
+23 0.898381 0.489287
+11 0.898381 0.474043
SURF 0X10
mat 3
refs 4
-10 0.898381 0.474028
-13 0.898381 0.411615
-26 0.961802 0.411615
-27 0.961802 0.474028
+10 0.898381 0.784054
+13 0.898381 0.721641
+26 0.961802 0.721641
+27 0.961802 0.784054
SURF 0X10
mat 3
refs 4
-12 0.898381 0.721657
-11 0.898381 0.784069
-31 0.961798 0.784069
-35 0.961798 0.721657
+12 0.898381 0.411631
+11 0.898381 0.474043
+31 0.961798 0.474043
+35 0.961798 0.411631
SURF 0X10
mat 3
refs 4
-11 0.898381 0.784069
-23 0.898381 0.799313
-30 0.961798 0.799234
-31 0.961798 0.784069
+11 0.898381 0.474043
+23 0.898381 0.489287
+30 0.961798 0.489208
+31 0.961798 0.474043
SURF 0X10
mat 3
refs 4
-18 0.898381 0.489191
-20 0.831933 0.487231
-1 0.831933 0.473945
-2 0.898381 0.473945
+18 0.898381 0.799217
+20 0.831933 0.797257
+1 0.831933 0.783971
+2 0.898381 0.783971
SURF 0X10
mat 3
refs 4
-17 0.898381 0.489274
-19 0.831933 0.487314
-9 0.831933 0.474028
-10 0.898381 0.474028
+17 0.898381 0.7993
+19 0.831933 0.79734
+9 0.831933 0.784054
+10 0.898381 0.784054
SURF 0X10
mat 3
refs 4
-29 0.961802 0.473945
-25 0.961802 0.489112
-18 0.898381 0.489191
-2 0.898381 0.473945
+29 0.961802 0.783971
+25 0.961802 0.799138
+18 0.898381 0.799217
+2 0.898381 0.783971
SURF 0X10
mat 3
refs 4
-27 0.961802 0.474028
-34 0.961802 0.489195
-17 0.898381 0.489274
-10 0.898381 0.474028
+27 0.961802 0.784054
+34 0.961802 0.799221
+17 0.898381 0.7993
+10 0.898381 0.784054
SURF 0X10
mat 3
refs 4
-43 0.898381 0.699247
-36 0.831933 0.692311
-15 0.831933 0.721657
-12 0.898381 0.721657
+43 0.898381 0.389221
+36 0.831933 0.382285
+15 0.831933 0.411631
+12 0.898381 0.411631
SURF 0X10
mat 3
refs 4
-39 0.898381 0.699333
-41 0.831933 0.692398
-7 0.831933 0.72174
-4 0.898381 0.72174
+39 0.898381 0.389307
+41 0.831933 0.382372
+7 0.831933 0.411714
+4 0.898381 0.411714
kids 0
OBJECT poly
name "EngineIAEV2500R"
diff --git a/Models/Instruments/MCDU/MCDU-funcs.nas b/Models/Instruments/MCDU/MCDU-funcs.nas
new file mode 100644
index 00000000..d823cdbc
--- /dev/null
+++ b/Models/Instruments/MCDU/MCDU-funcs.nas
@@ -0,0 +1,359 @@
+var showLeft = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_L1"].show();
+ } else {
+ obj["Simple_L1"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_L2"].show();
+ } else {
+ obj["Simple_L2"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_L3"].show();
+ } else {
+ obj["Simple_L3"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_L4"].show();
+ } else {
+ obj["Simple_L4"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_L5"].show();
+ } else {
+ obj["Simple_L5"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_L6"].show();
+ } else {
+ obj["Simple_L6"].hide();
+ }
+ }
+};
+
+var showLeftS = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_L1S"].show();
+ } else {
+ obj["Simple_L1S"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_L2S"].show();
+ } else {
+ obj["Simple_L2S"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_L3S"].show();
+ } else {
+ obj["Simple_L3S"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_L4S"].show();
+ } else {
+ obj["Simple_L4S"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_L5S"].show();
+ } else {
+ obj["Simple_L5S"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_L6S"].show();
+ } else {
+ obj["Simple_L6S"].hide();
+ }
+ }
+};
+
+var showCenter = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_C1"].show();
+ } else {
+ obj["Simple_C1"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_C2"].show();
+ } else {
+ obj["Simple_C2"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_C3"].show();
+ } else {
+ obj["Simple_C3"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_C4"].show();
+ } else {
+ obj["Simple_C4"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_C5"].show();
+ } else {
+ obj["Simple_C5"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_C6"].show();
+ } else {
+ obj["Simple_C6"].hide();
+ }
+ }
+};
+
+var showCenterS = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_C1S"].show();
+ } else {
+ obj["Simple_C1S"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_C2S"].show();
+ } else {
+ obj["Simple_C2S"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_C3S"].show();
+ } else {
+ obj["Simple_C3S"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_C4S"].show();
+ } else {
+ obj["Simple_C4S"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_C5S"].show();
+ } else {
+ obj["Simple_C5S"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_C6S"].show();
+ } else {
+ obj["Simple_C6S"].hide();
+ }
+ }
+};
+
+var showRight = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_R1"].show();
+ } else {
+ obj["Simple_R1"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_R2"].show();
+ } else {
+ obj["Simple_R2"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_R3"].show();
+ } else {
+ obj["Simple_R3"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_R4"].show();
+ } else {
+ obj["Simple_R4"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_R5"].show();
+ } else {
+ obj["Simple_R5"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_R6"].show();
+ } else {
+ obj["Simple_R6"].hide();
+ }
+ }
+};
+
+var showRightS = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_R1S"].show();
+ } else {
+ obj["Simple_R1S"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_R2S"].show();
+ } else {
+ obj["Simple_R2S"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_R3S"].show();
+ } else {
+ obj["Simple_R3S"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_R4S"].show();
+ } else {
+ obj["Simple_R4S"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_R5S"].show();
+ } else {
+ obj["Simple_R5S"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_R6S"].show();
+ } else {
+ obj["Simple_R6S"].hide();
+ }
+ }
+};
+
+var showLeftArrow = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_L1_Arrow"].show();
+ } else {
+ obj["Simple_L1_Arrow"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_L2_Arrow"].show();
+ } else {
+ obj["Simple_L2_Arrow"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_L3_Arrow"].show();
+ } else {
+ obj["Simple_L3_Arrow"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_L4_Arrow"].show();
+ } else {
+ obj["Simple_L4_Arrow"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_L5_Arrow"].show();
+ } else {
+ obj["Simple_L5_Arrow"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_L6_Arrow"].show();
+ } else {
+ obj["Simple_L6_Arrow"].hide();
+ }
+ }
+};
+
+var showRightArrow = func (obj, a, b, c, d, e, f) {
+ if (a != 0) {
+ if (a >= 1) {
+ obj["Simple_R1_Arrow"].show();
+ } else {
+ obj["Simple_R1_Arrow"].hide();
+ }
+ }
+ if (b != 0) {
+ if (b >= 1) {
+ obj["Simple_R2_Arrow"].show();
+ } else {
+ obj["Simple_R2_Arrow"].hide();
+ }
+ }
+ if (c != 0) {
+ if (c >= 1) {
+ obj["Simple_R3_Arrow"].show();
+ } else {
+ obj["Simple_R3_Arrow"].hide();
+ }
+ }
+ if (d != 0) {
+ if (d >= 1) {
+ obj["Simple_R4_Arrow"].show();
+ } else {
+ obj["Simple_R4_Arrow"].hide();
+ }
+ }
+ if (e != 0) {
+ if (e >= 1) {
+ obj["Simple_R5_Arrow"].show();
+ } else {
+ obj["Simple_R5_Arrow"].hide();
+ }
+ }
+ if (f != 0) {
+ if (f >= 1) {
+ obj["Simple_R6_Arrow"].show();
+ } else {
+ obj["Simple_R6_Arrow"].hide();
+ }
+ }
+};
\ No newline at end of file
diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 12d70a12..1ebe59dd 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -407,11 +407,11 @@ var canvas_MCDU_base = {
me["Simple_R6"].setText("CONFIRM ALIGN ");
me.colorRight("ack", "ack", "ack", "ack", "ack", "amb");
me["IRSINIT_star"].show();
- me.showRightArrow(0, 0, 0, 0, 0, -1);
+ showRightArrow(me,0, 0, 0, 0, 0, -1);
} else {
me["Simple_R6"].setText("ALIGN ON REF ");
me["IRSINIT_star"].hide();
- me.showRightArrow(0, 0, 0, 0, 0, 1);
+ showRightArrow(me,0, 0, 0, 0, 0, 1);
}
if (systems.ADIRS.Operating.aligned[i].getValue()) {
if (systems.ADIRS.ADIRunits[i].mode == 2) {
@@ -570,13 +570,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("MCDU MENU");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, -1, -1);
+ showLeft(me,1, 1, 1, 1, -1, -1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, -1);
- me.showLeftArrow(1, 1, 1, 1, -1, -1);
- me.showRight(-1, -1, -1, -1, -1, -1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,-1, -1, -1, -1, -1, -1);
+ showLeftArrow(me,1, 1, 1, 1, -1, -1);
+ showRight(me,-1, -1, -1, -1, -1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -620,13 +620,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("ATSU DATALINK");
me.defaultPageNumbers();
- me.showLeft(1, -1, -1, -1, -1, -1);
+ showLeft(me,1, -1, -1, -1, -1, -1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, -1);
- me.showLeftArrow(1, -1, -1, -1, -1, -1);
- me.showRight(1, -1, -1, -1, -1, 1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(1, -1, -1, -1, -1, 1);
+ showLeftS(me,-1, -1, -1, -1, -1, -1);
+ showLeftArrow(me,1, -1, -1, -1, -1, -1);
+ showRight(me,1, -1, -1, -1, -1, 1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,1, -1, -1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -643,13 +643,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("AOC MENU");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, 1, 1);
+ showLeft(me,1, 1, 1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, 1);
- me.showLeftArrow(1, 1, 1, -1, 1, 1);
- me.showRight(1, 1, 1, 1, 1, -1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(1, 1, 1, 1, 1, 1);
+ showLeftS(me,-1, -1, -1, -1, -1, 1);
+ showLeftArrow(me,1, 1, 1, -1, 1, 1);
+ showRight(me,1, 1, 1, 1, 1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,1, 1, 1, 1, 1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -687,14 +687,14 @@ var canvas_MCDU_base = {
me["Simple_L0S"].hide();
me["ArrowLeft"].hide();
me["ArrowRight"].hide();
- me.showLeft(1, 1, 1, 1, 1, -1);
- me.showLeftS(1, -1, 1, 1, 1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(-1, 1, 1, 1, 1, -1);
- me.showCenterS(-1, 1, 1, 1, 1, -1);
- me.showRight(1, 1, 1, 1, 1, -1);
- me.showRightS(1, 1, 1, 1, 1, -1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeft(me,1, 1, 1, 1, 1, -1);
+ showLeftS(me,1, -1, 1, 1, 1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,-1, 1, 1, 1, 1, -1);
+ showCenterS(me,-1, 1, 1, 1, 1, -1);
+ showRight(me,1, 1, 1, 1, 1, -1);
+ showRightS(me,1, 1, 1, 1, 1, -1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -780,13 +780,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("SENSORS ");
me.defaultPageNumbers();
me["Simple_L0S"].hide();
- me.showLeft(1, 1, 1, 1, 1, 1);
- me.showLeftS(1, 1, 1, 1, -1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
+ showLeftS(me,1, 1, 1, 1, -1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
me.colorLeftArrow("wht", "wht", "wht", "wht", "wht", "wht");
- me.showRight(1, 1, 1, 1, -1, -1);
- me.showRightS(1, 1, 1, 1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showRight(me,1, 1, 1, 1, -1, -1);
+ showRightS(me,1, 1, 1, 1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
#me["PRINTPAGE"] - TODO missing asterisk at 5L - only useful when printing available
me.standardFontSize();
@@ -829,15 +829,15 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("AOC CONFIGURATION");
me.defaultPageNumbers();
- me.showLeft(1, -1, -1, -1, -1, 1);
+ showLeft(me,1, -1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, -1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, 1, 1, 1, 1, -1);
- me.showCenterS(1, -1, 1, -1, 1, -1);
- me.showRight(1, -1, -1, -1, -1, 1);
- me.showRightS(1, -1, -1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,1, -1, -1, -1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, 1, 1, 1, 1, -1);
+ showCenterS(me,1, -1, 1, -1, 1, -1);
+ showRight(me,1, -1, -1, -1, -1, 1);
+ showRightS(me,1, -1, -1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -884,13 +884,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("WEATHER REQ");
me.defaultPageNumbers();
- me.showLeft(1, -1, -1, -1, -1, 1);
+ showLeft(me,1, -1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, -1, -1, -1);
- me.showLeftArrow(1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, -1, 1, -1);
- me.showRightS(1, 1, 1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,1, -1, -1, -1, -1, -1);
+ showLeftArrow(me,1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, -1, 1, -1);
+ showRightS(me,1, 1, 1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -947,13 +947,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("WEATHER TYPE");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, -1, -1);
+ showLeft(me,1, 1, 1, -1, -1, -1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, -1);
- me.showLeftArrow(1, 1, 1, -1, -1, -1);
- me.showRight(1, 1, 1, -1, -1, -1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(1, 1, 1, -1, -1, -1);
+ showLeftS(me,-1, -1, -1, -1, -1, -1);
+ showLeftArrow(me,1, 1, 1, -1, -1, -1);
+ showRight(me,1, 1, 1, -1, -1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,1, 1, 1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -989,9 +989,9 @@ var canvas_MCDU_base = {
me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht");
- me.showRight(-1, -1, -1, -1, -1, -1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showRight(me,-1, -1, -1, -1, -1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
if (myReceivedMessages[i] != nil) {
me["Simple_Title"].setText(sprintf("%s", myReceivedMessages[i].title));
@@ -1051,11 +1051,11 @@ var canvas_MCDU_base = {
me.colorCenterS("grn", "wht", "wht", "wht", "wht", "wht");
me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht");
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(1, -1, -1, -1, -1, -1);
- me.showRight(-1, -1, -1, -1, -1, -1);
- me.showRightS(1, -1, -1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
+ showRight(me,-1, -1, -1, -1, -1, -1);
+ showRightS(me,1, -1, -1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
if (myReceivedMessage[i] != nil) {
@@ -1145,13 +1145,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, -1, 1, 1, 1);
+ showLeft(me,1, 1, -1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, 1);
- me.showLeftArrow(1, 1, -1, 1, 1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(-1, -1, -1, -1, 1, -1);
- me.showRightArrow(1, 1, 1, 1, 1, 1);
+ showLeftS(me,-1, -1, -1, -1, -1, 1);
+ showLeftArrow(me,1, 1, -1, 1, 1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,-1, -1, -1, -1, 1, -1);
+ showRightArrow(me,1, 1, 1, 1, 1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -1187,13 +1187,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("ATC LAT REQ");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, 1, 1);
+ showLeft(me,1, 1, 1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1255,13 +1255,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("WHEN CAN WE EXPECT");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, -1, 1, 1);
+ showLeft(me,1, 1, -1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, 1, -1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(-1, 1, 1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,-1, 1, -1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,-1, 1, 1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1320,13 +1320,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, -1, 1, 1);
+ showLeft(me,1, 1, 1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, -1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, -1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1388,13 +1388,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, -1, 1, 1);
+ showLeft(me,1, 1, 1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, -1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, -1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1455,13 +1455,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("ATC OTHER REQ");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, 1, 1);
+ showLeft(me,1, 1, 1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, -1, -1, -1, 1, 1);
- me.showRightS(-1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, -1, -1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, -1, -1, -1, 1, 1);
+ showRightS(me,-1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1513,16 +1513,16 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, 1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, 1, -1, -1);
- me.showRightS(1, 1, 1, -1, -1, 1);
- me.showRight(1, 1, 1, -1, -1, 1);
- me.showRightS(1, 1, 1, -1, -1, 1);
- me.showRightArrow(1, 1, 1, -1, -1, 1);
+ showLeftS(me,1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, 1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, 1, -1, -1);
+ showRightS(me,1, 1, 1, -1, -1, 1);
+ showRight(me,1, 1, 1, -1, -1, 1);
+ showRightS(me,1, 1, 1, -1, -1, 1);
+ showRightArrow(me,1, 1, 1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1621,15 +1621,15 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, 1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, 1, -1, -1);
- me.showRightS(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
+ showLeftS(me,-1, -1, -1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, 1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, 1, -1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].hide();
@@ -1672,13 +1672,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, -1, 1, 1, 1);
+ showLeft(me,1, 1, -1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,-1, -1, -1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
me["arrowsDepArr"].show();
@@ -1738,15 +1738,15 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, -1, -1, -1, 1);
+ showLeft(me,1, 1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, -1, 1);
- me.showLeftArrow(1, 1, -1, -1, -1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(1, -1, -1, -1, -1, -1);
- me.showRight(1, -1, -1, -1, -1, -1);
- me.showRightS(-1, -1, -1, -1, -1, -1);
- me.showRightArrow(1, -1, -1, -1, -1, -1);
+ showLeftS(me,-1, -1, -1, -1, -1, 1);
+ showLeftArrow(me,1, 1, -1, -1, -1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
+ showRight(me,1, -1, -1, -1, -1, -1);
+ showRightS(me,-1, -1, -1, -1, -1, -1);
+ showRightArrow(me,1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -1823,15 +1823,15 @@ var canvas_MCDU_base = {
me["ArrowLeft"].hide();
me["ArrowRight"].hide();
- me.showLeft(1, 1, 1, 1, -1, 1);
+ showLeft(me,1, 1, 1, 1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, -1, -1, 1);
- me.showLeftArrow(1, 1, 1, -1, -1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, -1, -1, -1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, -1, -1, -1, -1, 1);
+ showLeftArrow(me,1, 1, 1, -1, -1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -1877,7 +1877,11 @@ var canvas_MCDU_base = {
if (atsu.ATISInstances[x].station != nil) {
me["Simple_L" ~ (x + 1)].setText(" " ~ atsu.ATISInstances[x].station ~ "/" ~ (atsu.ATISInstances[x].type == 0 ? "ARR" : "DEP"));
me["Simple_L" ~ (x + 1)].setFont(default);
- me["Simple_L" ~ (x + 1) ~ "_Arrow"].show();
+ if (atsu.ATISInstances[x].received) {
+ me["Simple_L" ~ (x + 1) ~ "_Arrow"].show();
+ } else {
+ me["Simple_L" ~ (x + 1) ~ "_Arrow"].hide();
+ }
} else {
me["Simple_L" ~ (x + 1)].setText(" [ ]/[ ]");
me["Simple_L" ~ (x + 1)].setFont(symbol);
@@ -1907,15 +1911,15 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("NOTIFICATION");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, -1, -1, 1);
+ showLeft(me,1, 1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, -1, -1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(-1, 1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, -1, -1, -1);
- me.showRight(-1, 1, -1, -1, -1, 1);
- me.showRightS(-1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
+ showLeftS(me,1, 1, -1, -1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,-1, 1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,-1, 1, -1, -1, -1, 1);
+ showRightS(me,-1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -1993,15 +1997,15 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("CONNECTION STATUS");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, 1, -1, 1);
+ showLeft(me,1, 1, -1, 1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, -1, -1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, -1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, 1, -1, -1);
- me.showRight(1, -1, 1, -1, 1, 1);
- me.showRightS(-1, -1, 1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
+ showLeftS(me,1, 1, -1, -1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, -1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, 1, -1, -1);
+ showRight(me,1, -1, 1, -1, 1, 1);
+ showRightS(me,-1, -1, 1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2074,13 +2078,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("COMM MENU");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, -1, 1);
+ showLeft(me,1, 1, 1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, -1, 1);
- me.showLeftArrow(1, 1, 1, -1, -1, 1);
- me.showRight(1, 1, -1, 1, -1, -1);
- me.showRightS(1, 1, -1, -1, -1, -1);
- me.showRightArrow(1, 1, -1, 1, -1, -1);
+ showLeftS(me,1, 1, 1, -1, -1, 1);
+ showLeftArrow(me,1, 1, 1, -1, -1, 1);
+ showRight(me,1, 1, -1, 1, -1, -1);
+ showRightS(me,1, 1, -1, -1, -1, -1);
+ showRightArrow(me,1, 1, -1, 1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2115,15 +2119,15 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("VHF3 VOICE DIRECTORY");
me.defaultPageNumbers();
- me.showLeft(1, -1, -1, 1, -1, 1);
+ showLeft(me,1, -1, -1, 1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, 1, -1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(1, -1, -1, -1, -1, -1);
- me.showRight(1, -1, -1, -1, 1, 1);
- me.showRightS(1, -1, -1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,1, -1, -1, 1, -1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
+ showRight(me,1, -1, -1, -1, 1, 1);
+ showRightS(me,1, -1, -1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2173,15 +2177,15 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("VHF3 DATA MODE");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, -1, 1);
+ showLeft(me,1, 1, 1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, -1, -1, -1, -1);
- me.showLeftArrow(-1, 1, 1, -1, -1, 1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(1, -1, -1, -1, -1, -1);
- me.showRight(1, 1, 1, -1, -1, 1);
- me.showRightS(1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, 1, 1, -1, -1, -1);
+ showLeftS(me,1, -1, -1, -1, -1, -1);
+ showLeftArrow(me,-1, 1, 1, -1, -1, 1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
+ showRight(me,1, 1, 1, -1, -1, 1);
+ showRightS(me,1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, 1, 1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2234,13 +2238,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("COMM INIT");
me.defaultPageNumbers();
- me.showLeft(-1, 1, 1, 1, -1, 1);
+ showLeft(me,-1, 1, 1, 1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, 1, 1, 1, -1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, -1, 1, -1, -1, 1);
- me.showRightS(-1, -1, 1, -1, -1, 1);
- me.showRightArrow(-1, -1, 1, -1, -1, -1);
+ showLeftS(me,-1, 1, 1, 1, -1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, -1, 1, -1, -1, 1);
+ showRightS(me,-1, -1, 1, -1, -1, 1);
+ showRightArrow(me,-1, -1, 1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2276,13 +2280,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("COMM STATUS");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, 1, 1, 1);
+ showLeft(me,1, 1, -1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, -1, 1, 1, 1);
- me.showRightS(-1, 1, 1, 1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,-1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, -1, 1, 1, 1);
+ showRightS(me,-1, 1, 1, 1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2328,13 +2332,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("COMPANY CALL");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, -1, -1, 1);
+ showLeft(me,1, 1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, -1, -1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, -1, -1, -1, -1, 1);
- me.showRightS(1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,1, 1, -1, -1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, -1, -1, -1, -1, 1);
+ showRightS(me,1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2421,13 +2425,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText(sprintf("%s", " " ~ acType.getValue()));
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, -1, 1);
+ showLeft(me,1, 1, 1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, -1, 1);
- me.showLeftArrow(-1, -1, 1, -1, -1, -1);
- me.showRight(-1, 1, -1, 1, 1, 1);
- me.showRightS(-1, -1, -1, 1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
+ showLeftS(me,1, 1, 1, -1, -1, 1);
+ showLeftArrow(me,-1, -1, 1, -1, -1, -1);
+ showRight(me,-1, 1, -1, 1, 1, 1);
+ showRightS(me,-1, -1, -1, 1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2514,13 +2518,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, -1, -1);
+ showLeft(me,1, 1, 1, 1, -1, -1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, -1);
- me.showLeftArrow(1, 1, 1, 1, 1, -1);
- me.showRight(-1, -1, -1, -1, 1, 1);
- me.showRightS(-1, -1, -1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, 1, 1);
+ showLeftS(me,1, 1, 1, -1, 1, -1);
+ showLeftArrow(me,1, 1, 1, 1, 1, -1);
+ showRight(me,-1, -1, -1, -1, 1, 1);
+ showRightS(me,-1, -1, -1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, 1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2554,13 +2558,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, 1, 1);
- me.showLeftArrow(1, 1, 1, 1, 1, 1);
- me.showRight(1, 1, 1, 1, -1, -1);
- me.showRightS(1, 1, 1, 1, -1, -1);
- me.showRightArrow(1, 1, 1, 1, -1, -1);
+ showLeftS(me,-1, -1, -1, -1, 1, 1);
+ showLeftArrow(me,1, 1, 1, 1, 1, 1);
+ showRight(me,1, 1, 1, 1, -1, -1);
+ showRightS(me,1, 1, 1, 1, -1, -1);
+ showRightArrow(me,1, 1, 1, 1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -2635,17 +2639,17 @@ var canvas_MCDU_base = {
me["Simple_Title2"].setColor(GREEN);
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, 1, 1, -1, 1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(-1, -1, -1, -1, 1, -1);
+ showLeftS(me,-1, 1, 1, -1, 1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,-1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(-1, -1, -1, -1, 1, -1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(-1, -1, -1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
+ showCenterS(me,-1, -1, -1, -1, 1, -1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,-1, -1, -1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
me.standardFontSize();
@@ -2733,14 +2737,14 @@ var canvas_MCDU_base = {
me.defaultHideWithCenter();
me.standardFontSize();
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, -1, -1, -1);
- me.showLeftS(-1, 1, 1, 1, -1, -1);
- me.showLeftArrow(1, 1, 1, -1, -1, -1);
- me.showCenter(-1, -1, -1, -1, -1, -1);
- me.showCenterS(-1, -1, -1, -1, -1, -1);
- me.showRight(-1, -1, -1, -1, -1, -1);
- me.showRightS(1, 1, 1, 1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeft(me,1, 1, 1, -1, -1, -1);
+ showLeftS(me,-1, 1, 1, 1, -1, -1);
+ showLeftArrow(me,1, 1, 1, -1, -1, -1);
+ showCenter(me,-1, -1, -1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,-1, -1, -1, -1, -1, -1);
+ showRightS(me,1, 1, 1, 1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["arrowsDepArr"].hide();
me["PERFAPPR"].hide();
me["PERFGA"].hide();
@@ -2798,14 +2802,14 @@ var canvas_MCDU_base = {
me.defaultHideWithCenter();
me.standardFontSize();
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, 1);
- me.showLeftS(1, 1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(-1, 1, 1, -1, 1, 1);
- me.showCenterS(-1, 1, 1, -1, 1, 1);
- me.showRight(-1, 1, 1, -1, 1, 1);
- me.showRightS(-1, 1, 1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
+ showLeftS(me,1, 1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,-1, 1, 1, -1, 1, 1);
+ showCenterS(me,-1, 1, 1, -1, 1, 1);
+ showRight(me,-1, 1, 1, -1, 1, 1);
+ showRightS(me,-1, 1, 1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["arrowsDepArr"].hide();
me["PERFAPPR"].hide();
me["PERFGA"].hide();
@@ -2857,13 +2861,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("RADIO NAV");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, -1);
+ showLeft(me,1, 1, 1, 1, 1, -1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, 1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showRight(1, 1, 1, 1, 1, -1);
- me.showRightS(1, 1, 1, 1, 1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,1, 1, 1, 1, 1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,1, 1, 1, 1, 1, -1);
+ showRightS(me,1, 1, 1, 1, 1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -3003,13 +3007,13 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(0, 1, 0, -1, 0, 1);
+ showLeft(me,0, 1, 0, -1, 0, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showRight(0, 0, 1, 1, 1, 1);
- me.showRightS(1, 0, -1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, 1, -1, -1);
+ showLeftS(me,1, 1, 1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,0, 0, 1, 1, 1, 1);
+ showRightS(me,1, 0, -1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, 1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
@@ -3089,7 +3093,7 @@ var canvas_MCDU_base = {
} else {
me["Simple_L2"].setText("NONE");
}
- me.showRight(1, -1, 0, 0, 0, 0);
+ showRight(me,1, -1, 0, 0, 0, 0);
me["Simple_R2S"].hide();
me["INITA_InitRequest"].hide();
} else {
@@ -3098,7 +3102,7 @@ var canvas_MCDU_base = {
me["Simple_L1"].hide();
me["Simple_L2"].setColor(WHITE);
me["Simple_L2"].setText("----/----------");
- me.showRight(-1, 1, 0, 0, 0, 0);
+ showRight(me,-1, 1, 0, 0, 0, 0);
me["Simple_R2S"].show();
if (!Simbrief.SimbriefParser.inhibit) {
me["INITA_InitRequest"].show();
@@ -3109,11 +3113,11 @@ var canvas_MCDU_base = {
if (ADIRSMCDUBTN.getValue() != 1) {
me["INITA_AlignIRS"].show();
me["Simple_R3"].setColor(AMBER);
- me.showRightArrow(0, 0, -1, 0, 0, 0);
+ showRightArrow(me,0, 0, -1, 0, 0, 0);
} else {
me["INITA_AlignIRS"].hide();
me["Simple_R3"].setColor(WHITE);
- me.showRightArrow(0, 0, 1, 0, 0, 0);
+ showRightArrow(me,0, 0, 1, 0, 0, 0);
}
if (fmgc.FMGCInternal.tropoSet) {
me["Simple_R5"].setFontSize(normal);
@@ -3171,17 +3175,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("IRS INIT");
me.defaultPageNumbers();
- me.showLeft(1, 1, -1, -1, -1, 1);
+ showLeft(me,1, 1, -1, -1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, -1, -1, -1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, -1, -1, -1, 1);
- me.showRightS(1, 1, -1, -1, -1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, -1, 1, 1, 1, -1);
+ showLeftS(me,1, 1, -1, -1, -1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, -1, -1, -1, 1);
+ showRightS(me,1, 1, -1, -1, -1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, -1, 1, 1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, 1, 1, 1, 1, -1);
+ showCenterS(me,1, 1, 1, 1, 1, -1);
me.fontLeft(default, default, 0, 0, 0, default);
me.fontLeftS(default, default, 0, 0, 0, 0);
@@ -3270,11 +3274,11 @@ var canvas_MCDU_base = {
me["Simple_R6"].setText("CONFIRM ALIGN ");
me.colorRight("ack", "ack", "ack", "ack", "ack", "amb");
me["IRSINIT_star"].show();
- me.showRightArrow(0, 0, 0, 0, 0, -1);
+ showRightArrow(me,0, 0, 0, 0, 0, -1);
} else {
me["Simple_R6"].setText("ALIGN ON REF ");
me["IRSINIT_star"].hide();
- me.showRightArrow(0, 0, 0, 0, 0, 1);
+ showRightArrow(me,0, 0, 0, 0, 0, 1);
}
me["Simple_L2S"].setText("LAT");
@@ -3293,13 +3297,13 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("ROUTE SELECTION");
me.showPageNumbers(1,1);
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, 1, 1, 1, 1, -1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, 1, 1, 1, 1, 1);
- me.showRightS(-1, 1, 1, 1, 1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showLeftS(me,-1, 1, 1, 1, 1, -1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, 1, 1, 1, 1, 1);
+ showRightS(me,-1, 1, 1, 1, 1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me.fontSizeLeftS(normal, normal, normal, normal, normal, normal);
me.fontSizeRight(0, small, small, small, small, normal);
me.fontSizeRightS(0, small, small, small, small, normal);
@@ -3359,17 +3363,17 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(1, -1, 1, 1, 1, -1);
+ showLeftS(me,1, 1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,1, -1, 1, 1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(-1, -1, -1, -1, -1, -1);
- me.showRight(-1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, 1, 1);
- me.showRightArrow(-1, -1, 1, -1, -1, -1);
+ showCenterS(me,-1, -1, -1, -1, -1, -1);
+ showRight(me,-1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, 1, 1);
+ showRightArrow(me,-1, -1, 1, -1, -1, -1);
me.standardFont();
@@ -3805,17 +3809,17 @@ var canvas_MCDU_base = {
me["ArrowLeft"].show();
me["ArrowRight"].show();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(1, 1, 1, -1, 1, -1);
+ showLeftS(me,1, -1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,1, 1, 1, -1, 1, -1);
me["Simple_C3B"].show();
me["Simple_C4B"].hide();
- me.showCenterS(1, -1, -1, -1, -1, -1);
- me.showRight(1, 1, -1, 1, 1, 1);
- me.showRightS(1, -1, 1, 1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
+ showRight(me,1, 1, -1, 1, 1, 1);
+ showRightS(me,1, -1, 1, 1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
me.standardFont();
@@ -4139,17 +4143,17 @@ var canvas_MCDU_base = {
me["ArrowLeft"].hide();
me["ArrowRight"].hide();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, -1, 1, 1, 1, 1);
- me.showLeftArrow(-1, 1, -1, -1, 1, -1);
- me.showRight(1, -1, -1, 1, 1, 1);
- me.showRightS(1, -1, -1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(1, -1, -1, 1, -1, 1);
+ showLeftS(me,1, -1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, 1, -1, -1, 1, -1);
+ showRight(me,1, -1, -1, 1, 1, 1);
+ showRightS(me,1, -1, -1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,1, -1, -1, 1, -1, 1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, -1, -1, -1, -1, 1);
+ showCenterS(me,1, -1, -1, -1, -1, 1);
me.fontLeft(default, default, symbol, default, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -4172,13 +4176,13 @@ var canvas_MCDU_base = {
me.colorCenter("grn", "grn", "wht", "wht", "wht", "grn");
me.colorCenterS("wht", "wht", "wht", "wht", "wht", "wht");
if (page == "PROGCRZ") {
- me.showLeftS(0, 0, -1, 0, 0, 0);
- me.showCenterS(0, 0, 1, 0, 0, 0);
- #me.showRight(0, 0, 1, 0, 0, 0); #Add when implement cruise phase
+ showLeftS(me,0, 0, -1, 0, 0, 0);
+ showCenterS(me,0, 0, 1, 0, 0, 0);
+ #showRight(me,0, 0, 1, 0, 0, 0); #Add when implement cruise phase
me.fontLeft(0, 0, default, 0, 0, 0);
} else if (page == "PROGDES" or page == "PROGAPPR") {
- me.showCenter(0, 1, 0, 0, 0, 0);
- me.showRight(0, 1, 0, 0, 0, 0);
+ showCenter(me,0, 1, 0, 0, 0, 0);
+ showRight(me,0, 1, 0, 0, 0, 0);
#me["Simple_C2"].setFontSize(normal);
#me["Simple_R2"].setFontSize(normal);
}
@@ -4192,7 +4196,7 @@ var canvas_MCDU_base = {
# me["Simple_R5S"].show();
# me["Simple_R5"].setFontSize(small);
# me["Simple_R5"].setColor(WHITE);
- # me.showLeftArrow(-1, 1, -1, -1, -1, -1);
+ # showLeftArrow(me,-1, 1, -1, -1, -1, -1);
#}
pageSwitch[i].setBoolValue(1);
@@ -4299,17 +4303,17 @@ var canvas_MCDU_base = {
me["ArrowLeft"].hide();
me["ArrowRight"].hide();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, 1, 1, -1, -1, -1);
+ showLeftS(me,1, 1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, 1, 1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, 1, 1, -1, -1, -1);
+ showCenterS(me,1, 1, 1, -1, -1, -1);
me.fontLeft(default, default, default, default, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -4469,17 +4473,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("CLB");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, 1, 1);
- me.showRight(-1, 1, 1, 1, -1, 1);
- me.showRightS(-1, -1, 1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(-1, 1, 1, 1, -1, -1);
+ showLeftS(me,1, 1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, 1, 1);
+ showRight(me,-1, 1, 1, 1, -1, 1);
+ showRightS(me,-1, -1, 1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,-1, 1, 1, 1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(-1, -1, 1, -1, 1, -1);
+ showCenterS(me,-1, -1, 1, -1, 1, -1);
me.fontLeft(default, default, default, symbol, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -4506,20 +4510,20 @@ var canvas_MCDU_base = {
if (fmgc.FMGCInternal.phase == 2) {
me["Simple_Title"].setColor(GREEN);
- me.showLeft(0, 0, 0, 0, 1, 0);
- me.showLeftS(0, 0, 0, 0, 1, 0);
- me.showLeftArrow(0, 0, 0, 0, 1, 1);
- me.showRight(0, 0, 0, 1, 0, 0);
- me.showRightS(0, 0, 0, 0, 1, 0);
- me.showCenterS(0, 0, 0, 0, 1, 0);
+ showLeft(me,0, 0, 0, 0, 1, 0);
+ showLeftS(me,0, 0, 0, 0, 1, 0);
+ showLeftArrow(me,0, 0, 0, 0, 1, 1);
+ showRight(me,0, 0, 0, 1, 0, 0);
+ showRightS(me,0, 0, 0, 0, 1, 0);
+ showCenterS(me,0, 0, 0, 0, 1, 0);
if (managedSpeed.getValue() == 1) {
- me.showLeft(0, 0, 0, -1, 0, 0);
- me.showLeftS(0, 0, 0, -1, 0, 0);
+ showLeft(me,0, 0, 0, -1, 0, 0);
+ showLeftS(me,0, 0, 0, -1, 0, 0);
} else {
me["Simple_L4S"].setText(" SELECTED");
- me.showLeft(0, 0, 0, 1, 0, 0);
- me.showLeftS(0, 0, 0, 1, 0, 0);
+ showLeft(me,0, 0, 0, 1, 0, 0);
+ showLeftS(me,0, 0, 0, 1, 0, 0);
}
if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) {
@@ -4540,19 +4544,19 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu");
- me.showLeftArrow(0, 0, 0, 0, 0, -1);
+ showLeftArrow(me,0, 0, 0, 0, 0, -1);
} else {
setprop("/FMGC/internal/activate-once", 0);
setprop("/FMGC/internal/activate-twice", 0);
}
} else {
me["Simple_Title"].setColor(WHITE);
- me.showLeft(0, 0, 0, 0, -1, 0);
- me.showLeftS(0, 0, 0, 0, -1, 0);
- me.showLeftArrow(0, 0, 0, 0, -1, 0);
- me.showRight(0, 0, 0, -1, 0, 0);
- me.showRightS(0, 0, 0, 0, -1, 0);
- me.showCenterS(0, 0, 0, 0, -1, 0);
+ showLeft(me,0, 0, 0, 0, -1, 0);
+ showLeftS(me,0, 0, 0, 0, -1, 0);
+ showLeftArrow(me,0, 0, 0, 0, -1, 0);
+ showRight(me,0, 0, 0, -1, 0, 0);
+ showRightS(me,0, 0, 0, 0, -1, 0);
+ showCenterS(me,0, 0, 0, 0, -1, 0);
me.colorLeft("ack", "ack", "ack", "ack", "ack", "wht");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "wht");
@@ -4622,17 +4626,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("CRZ");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, -1, 1);
+ showLeft(me,1, 1, 1, 1, -1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, -1, -1, -1, 1, 1);
- me.showRightS(1, -1, -1, -1, 1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, -1, -1, -1, 1, -1);
+ showLeftS(me,1, 1, 1, 1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, -1, -1, -1, 1, 1);
+ showRightS(me,1, -1, -1, -1, 1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, -1, -1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, -1, -1, -1, -1, -1);
+ showCenterS(me,1, -1, -1, -1, -1, -1);
me.fontLeft(default, default, default, symbol, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -4659,12 +4663,12 @@ var canvas_MCDU_base = {
if (fmgc.FMGCInternal.phase == 3) {
me["Simple_Title"].setColor(GREEN);
if (managedSpeed.getValue() == 1) {
- me.showLeft(0, 0, 0, -1, 0, 0);
- me.showLeftS(0, 0, 0, -1, 0, 0);
+ showLeft(me,0, 0, 0, -1, 0, 0);
+ showLeftS(me,0, 0, 0, -1, 0, 0);
} else {
me["Simple_L4S"].setText(" SELECTED");
- me.showLeft(0, 0, 0, 1, 0, 0);
- me.showLeftS(0, 0, 0, 1, 0, 0);
+ showLeft(me,0, 0, 0, 1, 0, 0);
+ showLeftS(me,0, 0, 0, 1, 0, 0);
}
if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) {
@@ -4685,7 +4689,7 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu");
- me.showLeftArrow(0, 0, 0, 0, 0, -1);
+ showLeftArrow(me,0, 0, 0, 0, 0, -1);
} else {
setprop("/FMGC/internal/activate-once", 0);
setprop("/FMGC/internal/activate-twice", 0);
@@ -4758,17 +4762,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("DES");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(1, 1, 1, 1, -1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, -1, 1, -1, 1);
- me.showRightS(1, -1, 1, -1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, 1, -1, 1, 1, -1);
+ showLeftS(me,1, 1, 1, 1, -1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, -1, 1, -1, 1);
+ showRightS(me,1, -1, 1, -1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, 1, -1, 1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, -1, 1, -1, -1, -1);
+ showCenterS(me,1, -1, 1, -1, -1, -1);
me.fontLeft(default, default, default, symbol, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -4795,18 +4799,18 @@ var canvas_MCDU_base = {
if (fmgc.FMGCInternal.phase == 4) {
me["Simple_Title"].setColor(GREEN);
- me.showLeft(0, 0, 0, 0, 1, 0);
- me.showRight(0, 1, 0, 1, 0, 0);
- me.showRightS(0, 0, 1, 0, 0, 0);
- me.showCenter(0, 1, 0, 1, 1, 0);
- me.showCenterS(0, 0, 1, 0, 0, 0);
+ showLeft(me,0, 0, 0, 0, 1, 0);
+ showRight(me,0, 1, 0, 1, 0, 0);
+ showRightS(me,0, 0, 1, 0, 0, 0);
+ showCenter(me,0, 1, 0, 1, 1, 0);
+ showCenterS(me,0, 0, 1, 0, 0, 0);
if (managedSpeed.getValue() == 1) {
- me.showLeft(0, 0, 0, -1, 0, 0);
- me.showLeftS(0, 0, 0, -1, 0, 0);
+ showLeft(me,0, 0, 0, -1, 0, 0);
+ showLeftS(me,0, 0, 0, -1, 0, 0);
} else {
me["Simple_L4S"].setText(" SELECTED");
- me.showLeft(0, 0, 0, 1, 0, 0);
- me.showLeftS(0, 0, 0, 1, 0, 0);
+ showLeft(me,0, 0, 0, 1, 0, 0);
+ showLeftS(me,0, 0, 0, 1, 0, 0);
}
if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) {
@@ -4827,18 +4831,18 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu");
- me.showLeftArrow(0, 0, 0, 0, 0, -1);
+ showLeftArrow(me,0, 0, 0, 0, 0, -1);
} else {
setprop("/FMGC/internal/activate-once", 0);
setprop("/FMGC/internal/activate-twice", 0);
}
} else {
me["Simple_Title"].setColor(WHITE);
- me.showLeft(0, 0, 0, 0, -1, 0);
- me.showRight(0, -1, 0, -1, 0, 0);
- me.showRightS(0, 0, -1, 0, 0, 0);
- me.showCenter(0, -1, 0, -1, -1, 0);
- me.showCenterS(0, 0, -1, 0, 0, 0);
+ showLeft(me,0, 0, 0, 0, -1, 0);
+ showRight(me,0, -1, 0, -1, 0, 0);
+ showRightS(me,0, 0, -1, 0, 0, 0);
+ showCenter(me,0, -1, 0, -1, -1, 0);
+ showCenterS(me,0, 0, -1, 0, 0, 0);
me.colorLeft("ack", "ack", "ack", "ack", "ack", "wht");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "wht");
@@ -4914,17 +4918,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("APPR");
me.defaultPageNumbers();
- me.showLeft(1, 1, 1, 1, 1, 1);
+ showLeft(me,1, 1, 1, 1, 1, 1);
me["Simple_L0S"].show();
- me.showLeftS(1, 1, 1, 1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(1, 1, 1, 1, 1, 1);
- me.showRightS(1, 1, 1, 1, -1, 1);
- me.showRightArrow(-1, -1, -1, -1, -1, 1);
- me.showCenter(1, 1, 1, -1, 1, -1);
+ showLeftS(me,1, 1, 1, 1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,1, 1, 1, 1, 1, 1);
+ showRightS(me,1, 1, 1, 1, -1, 1);
+ showRightArrow(me,-1, -1, -1, -1, -1, 1);
+ showCenter(me,1, 1, 1, -1, 1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, 1, 1, -1, 1, -1);
+ showCenterS(me,1, 1, 1, -1, 1, -1);
me.fontLeft(symbol, default, default, default, symbol, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -5096,17 +5100,17 @@ var canvas_MCDU_base = {
me["Simple_Title"].setText("GO AROUND");
me.defaultPageNumbers();
- me.showLeft(-1, -1, -1, -1, 1, 1);
+ showLeft(me,-1, -1, -1, -1, 1, 1);
me["Simple_L0S"].hide();
- me.showLeftS(-1, -1, -1, -1, 1, 1);
- me.showLeftArrow(-1, -1, -1, -1, -1, 1);
- me.showRight(-1, -1, -1, -1, 1, -1);
- me.showRightS(-1, -1, -1, -1, 1, -1);
- me.showRightArrow(-1, -1, -1, -1, -1, -1);
- me.showCenter(1, 1, 1, -1, -1, -1);
+ showLeftS(me,-1, -1, -1, -1, 1, 1);
+ showLeftArrow(me,-1, -1, -1, -1, -1, 1);
+ showRight(me,-1, -1, -1, -1, 1, -1);
+ showRightS(me,-1, -1, -1, -1, 1, -1);
+ showRightArrow(me,-1, -1, -1, -1, -1, -1);
+ showCenter(me,1, 1, 1, -1, -1, -1);
me["Simple_C3B"].hide();
me["Simple_C4B"].hide();
- me.showCenterS(1, 1, 1, -1, -1, -1);
+ showCenterS(me,1, 1, 1, -1, -1, -1);
me.fontLeft(default, default, default, default, default, default);
me.fontLeftS(default, default, default, default, default, default);
@@ -5956,359 +5960,6 @@ var canvas_MCDU_base = {
me["Simple_C6S"].setColor(getprop("/MCDUC/colors/" ~ f ~ "/r"), getprop("/MCDUC/colors/" ~ f ~ "/g"), getprop("/MCDUC/colors/" ~ f ~ "/b"));
}
},
- # -1 = hide, 0 = ignore, 1 = show
- showLeft: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_L1"].show();
- } else {
- me["Simple_L1"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_L2"].show();
- } else {
- me["Simple_L2"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_L3"].show();
- } else {
- me["Simple_L3"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_L4"].show();
- } else {
- me["Simple_L4"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_L5"].show();
- } else {
- me["Simple_L5"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_L6"].show();
- } else {
- me["Simple_L6"].hide();
- }
- }
- },
- showLeftS: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_L1S"].show();
- } else {
- me["Simple_L1S"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_L2S"].show();
- } else {
- me["Simple_L2S"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_L3S"].show();
- } else {
- me["Simple_L3S"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_L4S"].show();
- } else {
- me["Simple_L4S"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_L5S"].show();
- } else {
- me["Simple_L5S"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_L6S"].show();
- } else {
- me["Simple_L6S"].hide();
- }
- }
- },
- showLeftArrow: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_L1_Arrow"].show();
- } else {
- me["Simple_L1_Arrow"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_L2_Arrow"].show();
- } else {
- me["Simple_L2_Arrow"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_L3_Arrow"].show();
- } else {
- me["Simple_L3_Arrow"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_L4_Arrow"].show();
- } else {
- me["Simple_L4_Arrow"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_L5_Arrow"].show();
- } else {
- me["Simple_L5_Arrow"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_L6_Arrow"].show();
- } else {
- me["Simple_L6_Arrow"].hide();
- }
- }
- },
- showRight: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_R1"].show();
- } else {
- me["Simple_R1"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_R2"].show();
- } else {
- me["Simple_R2"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_R3"].show();
- } else {
- me["Simple_R3"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_R4"].show();
- } else {
- me["Simple_R4"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_R5"].show();
- } else {
- me["Simple_R5"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_R6"].show();
- } else {
- me["Simple_R6"].hide();
- }
- }
- },
- showRightS: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_R1S"].show();
- } else {
- me["Simple_R1S"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_R2S"].show();
- } else {
- me["Simple_R2S"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_R3S"].show();
- } else {
- me["Simple_R3S"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_R4S"].show();
- } else {
- me["Simple_R4S"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_R5S"].show();
- } else {
- me["Simple_R5S"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_R6S"].show();
- } else {
- me["Simple_R6S"].hide();
- }
- }
- },
- showRightArrow: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_R1_Arrow"].show();
- } else {
- me["Simple_R1_Arrow"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_R2_Arrow"].show();
- } else {
- me["Simple_R2_Arrow"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_R3_Arrow"].show();
- } else {
- me["Simple_R3_Arrow"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_R4_Arrow"].show();
- } else {
- me["Simple_R4_Arrow"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_R5_Arrow"].show();
- } else {
- me["Simple_R5_Arrow"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_R6_Arrow"].show();
- } else {
- me["Simple_R6_Arrow"].hide();
- }
- }
- },
- showCenter: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_C1"].show();
- } else {
- me["Simple_C1"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_C2"].show();
- } else {
- me["Simple_C2"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_C3"].show();
- } else {
- me["Simple_C3"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_C4"].show();
- } else {
- me["Simple_C4"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_C5"].show();
- } else {
- me["Simple_C5"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_C6"].show();
- } else {
- me["Simple_C6"].hide();
- }
- }
- },
- showCenterS: func (a, b, c, d, e, f) {
- if (a != 0) {
- if (a >= 1) {
- me["Simple_C1S"].show();
- } else {
- me["Simple_C1S"].hide();
- }
- }
- if (b != 0) {
- if (b >= 1) {
- me["Simple_C2S"].show();
- } else {
- me["Simple_C2S"].hide();
- }
- }
- if (c != 0) {
- if (c >= 1) {
- me["Simple_C3S"].show();
- } else {
- me["Simple_C3S"].hide();
- }
- }
- if (d != 0) {
- if (d >= 1) {
- me["Simple_C4S"].show();
- } else {
- me["Simple_C4S"].hide();
- }
- }
- if (e != 0) {
- if (e >= 1) {
- me["Simple_C5S"].show();
- } else {
- me["Simple_C5S"].hide();
- }
- }
- if (f != 0) {
- if (f >= 1) {
- me["Simple_C6S"].show();
- } else {
- me["Simple_C6S"].hide();
- }
- }
- },
# 0 = ignore
fontLeft: func (a, b, c, d, e, f) {
if (a != 0) {
diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas
index 7135bc89..9c884708 100644
--- a/Models/Instruments/ND/canvas/framework/navdisplay.nas
+++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas
@@ -225,7 +225,7 @@ canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update
# anything that needs updatecenter called, should be added to the vector here
#
foreach(var element; ["staFromL2","staToL2","staFromR2","staToR2",
- "hdgTrk","trkInd","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","curHdgPtr",
+ "hdgTrk","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","curHdgPtr",
"HdgBugCRT2","TrkBugLCD2","HdgBugLCD2","hdgBug2","selHdgLine","selHdgLine2","curHdgPtr2",
"staToL","staFromL","staToR","staFromR"] )
me.symbols[element] = me.nd.getElementById(element).updateCenter();
@@ -613,13 +613,11 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
if((me.in_mode("toggle_display_mode", ["MAP"]) and me.get_switch("toggle_display_type") == "CRT")
or (me.get_switch("toggle_track_heading") and me.get_switch("toggle_display_type") == "LCD"))
{
- me.symbols.trkInd.setRotation(0);
me.symbols.curHdgPtr.setRotation((userHdg-userTrk)*D2R);
me.symbols.curHdgPtr2.setRotation((userHdg-userTrk)*D2R);
}
else
{
- me.symbols.trkInd.setRotation((userTrk-userHdg)*D2R);
me.symbols.curHdgPtr.setRotation(0);
me.symbols.curHdgPtr2.setRotation(0);
}
@@ -656,10 +654,6 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
var adf0hdg = getprop("/instrumentation/adf/indicated-bearing-deg");
var adf1hdg = getprop("/instrumentation/adf[1]/indicated-bearing-deg");
if(!me.get_switch("toggle_centered")) {
- if(me.in_mode("toggle_display_mode", ["PLAN"]) or (me.adirs_property.getValue() != 1 or (me.change_phase == 1) and (adirs_3.getValue() != 1 or att_switch.getValue() != me.attitude_heading_setting)))
- me.symbols.trkInd.hide();
- else
- me.symbols.trkInd.show();
if((getprop("/instrumentation/nav[2]/in-range") and me.get_switch("toggle_lh_vor_adf") == 1)) {
me.symbols.staToL.setColor(0.195,0.96,0.097);
me.symbols.staFromL.setColor(0.195,0.96,0.097);
@@ -713,7 +707,6 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
}
me.symbols.selHdgLine.setVisible(staPtrVis and hdg_bug_active);
} else {
- me.symbols.trkInd.hide();
if((getprop("/instrumentation/nav[2]/in-range") and me.get_switch("toggle_lh_vor_adf") == 1)) {
me.symbols.staFromL2.setColor(0.195,0.96,0.097);
me.symbols.staToL2.setColor(0.195,0.96,0.097);
diff --git a/Models/Instruments/ND/canvas/map/DECEL.symbol b/Models/Instruments/ND/canvas/map/DECEL.symbol
index c0a65b20..37a70536 100644
--- a/Models/Instruments/ND/canvas/map/DECEL.symbol
+++ b/Models/Instruments/ND/canvas/map/DECEL.symbol
@@ -23,8 +23,7 @@ var init = func {
var draw = func{
if(me.decel_grp != nil){
var spd_ctrl = getprop(me.options.spd_ctrl);
- var spd_managed = (spd_ctrl == me.options.managed_val);
- if(spd_managed)
+ if(spd_ctrl)
me.decel_grp.setColor(me.style.managed_color);
else
me.decel_grp.setColor(me.style.selected_color);
diff --git a/Models/Instruments/ND/canvas/map/WPT-airbus.symbol b/Models/Instruments/ND/canvas/map/WPT-airbus.symbol
index 439e8e1e..7d00e465 100644
--- a/Models/Instruments/ND/canvas/map/WPT-airbus.symbol
+++ b/Models/Instruments/ND/canvas/map/WPT-airbus.symbol
@@ -82,7 +82,7 @@ var draw = func{
var wp_group = me.element;
var alt = me.model.alt;
var i = me.model.idx;
- var vnav_actv = getprop(me.options.ver_ctrl) == me.options.managed_val;
+ var vnav_actv = getprop(me.options.spd_ctrl) == 1;
var curwp = getprop(me.options.current_wp);
if(alt > 0){
var wp_d = me.model.wp.distance_along_route;
diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg
index d83f7743..363030ba 100644
--- a/Models/Instruments/ND/canvas/res/airbusND.svg
+++ b/Models/Instruments/ND/canvas/res/airbusND.svg
@@ -1183,43 +1183,29 @@
x="198.86594"
y="648.10144">99
-
+ inkscape:label="#path3888-1" />
+ 100,
+ predicate: func(nd) getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 60,
is_true: func(nd) {
- nd.symbols.tas.setText(sprintf("%3.0f",getprop("/velocities/TAS") ));
+ nd.symbols.tas.setText(sprintf("%3.0f",getprop("/instrumentation/airspeed-indicator/true-speed-kt")));
nd.symbols.tas.show();
},
- is_false: func(nd) nd.symbols.tas.hide(),
- },
- },
- {
- id: "tasLbl",
- impl: {
- init: func(nd,symbol),
- predicate: func(nd) nd.aircraft_source.get_spd() > 100,
- is_true: func(nd) nd.symbols.tasLbl.show(),
- is_false: func(nd) nd.symbols.tasLbl.hide(),
+ is_false: func(nd){
+ nd.symbols.tas.setText("---");
+ }
},
},
{
@@ -1006,12 +1000,6 @@ canvas.NDStyles["Airbus"] = {
impl: {
init: func(nd,symbol),
common: func(nd) nd.symbols.gs.setText(sprintf("%3.0f",nd.aircraft_source.get_gnd_spd() )),
- predicate: func(nd) nd.aircraft_source.get_gnd_spd() >= 30,
- is_true: func(nd) {
- #nd.symbols.gs.show();
- nd.symbols.gs.setFontSize(36);
- },
- is_false: func(nd) {},#nd.symbols.gs.hide(),
},
},
{
@@ -1333,36 +1321,47 @@ canvas.NDStyles["Airbus"] = {
is_false: func(nd) nd.symbols.dme.hide(),
},
},
+ {
+ id:"curTrkPtr",
+ impl: {
+ init: func(nd,symbol),
+ predicate: func(nd) (nd.in_mode("toggle_display_mode", ["APP","VOR","MAP"]) and !nd.get_switch("toggle_centered")
+ and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))
+ and abs(nd.aircraft_source.get_trk_mag() - nd.aircraft_source.get_hdg_mag()) <= 42),
+ is_true: func(nd) {
+ nd.symbols.curTrkPtr.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R);
+ nd.symbols.curTrkPtr.show();
+ },
+ is_false: func(nd) nd.symbols.curTrkPtr.hide(),
+ },
+ },
{
id:"trkline",
impl: {
init: func(nd,symbol),
- predicate: func(nd){
- nd.get_switch("toggle_display_mode") == "MAP" and !nd.get_switch("toggle_centered")
- and (nd.change_phase != 1)
- and (
- getprop(nd.options.defaults.lat_ctrl) != nd.options.defaults.managed_val or
- nd.get_switch("toggle_trk_line")
- )
- },
+ predicate: func(nd) (nd.get_switch("toggle_display_mode") == "MAP" and
+ !nd.get_switch("toggle_centered") and (nd.change_phase != 1) and
+ getprop(nd.options.defaults.lat_ctrl) == 0 and abs(nd.aircraft_source.get_trk_mag() - nd.aircraft_source.get_hdg_mag()) <= 42 and
+ (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))),
is_true: func(nd) {
+ nd.symbols.trkline.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R);
nd.symbols.trkline.show();
},
is_false: func(nd) nd.symbols.trkline.hide(),
},
},
{
- id:"trkInd2",
+ id:"curTrkPtr2",
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode("toggle_display_mode", ["APP","VOR","MAP"]) and nd.get_switch("toggle_centered")
- and (nd.change_phase != 1)
- and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))),
+ and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))
+ and abs(nd.aircraft_source.get_trk_mag() - nd.aircraft_source.get_hdg_mag()) <= 42),
is_true: func(nd) {
- nd.symbols.trkInd2.show();
- nd.symbols.trkInd2.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R);
+ nd.symbols.curTrkPtr2.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R);
+ nd.symbols.curTrkPtr2.show();
},
- is_false: func(nd) nd.symbols.trkInd2.hide(),
+ is_false: func(nd) nd.symbols.curTrkPtr2.hide(),
},
},
{
@@ -1371,9 +1370,10 @@ canvas.NDStyles["Airbus"] = {
init: func(nd,symbol),
predicate: func(nd) (nd.get_switch("toggle_display_mode") == "MAP" and
nd.get_switch("toggle_centered") and (nd.change_phase != 1) and
- getprop(nd.options.defaults.lat_ctrl) != nd.options.defaults.managed_val and
- (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))),
+ getprop(nd.options.defaults.lat_ctrl) == 0 and abs(nd.aircraft_source.get_trk_mag() - nd.aircraft_source.get_hdg_mag()) <= 42 and
+ (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))),
is_true: func(nd) {
+ nd.symbols.trkline2.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R);
nd.symbols.trkline2.show();
},
is_false: func(nd) nd.symbols.trkline2.hide(),
@@ -1530,35 +1530,24 @@ canvas.NDStyles["Airbus"] = {
id:"wind",
impl: {
init: func(nd,symbol),
- predicate: ALWAYS,
+ predicate: func(nd) (getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 100),
is_true: func(nd) {
- var windDir = getprop("environment/wind-from-heading-deg");
- if(!nd.get_switch("toggle_true_north"))
- windDir = windDir + getprop("environment/magnetic-variation-deg");
- nd.symbols.wind.setText(sprintf("%03.0f / %02.0f",windDir,getprop("environment/wind-speed-kt")));
+ var windDir = pts.Instrumentation.PFD.windDirection.getValue() or 0;
+ nd.symbols.wind.setText(sprintf("%03.0f / %02.0f",windDir,pts.Instrumentation.PFD.windSpeed.getValue() or 0));
},
- is_false: NOTHING,
+ is_false: func(nd) {
+ nd.symbols.wind.setText("---/--");
+ }
},
},
{
id:"windArrow",
impl: {
init: func(nd,symbol),
- predicate: func(nd) (!(nd.in_mode("toggle_display_mode", ["PLAN"]) and (nd.get_switch("toggle_display_type") == "LCD"))),
+ predicate: func(nd) (!(nd.in_mode("toggle_display_mode", ["PLAN"]) and (nd.get_switch("toggle_display_type") == "LCD")) and (pts.Instrumentation.PFD.windSpeed.getValue() or 0) >= 2 and getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 100),
is_true: func(nd) {
nd.symbols.windArrow.show();
- var windArrowRot = getprop("environment/wind-from-heading-deg");
- if(nd.in_mode("toggle_display_mode", ["MAP","PLAN"])) {
- if(nd.get_switch("toggle_true_north"))
- windArrowRot = windArrowRot - nd.aircraft_source.get_trk_tru();
- else
- windArrowRot = windArrowRot - nd.aircraft_source.get_trk_mag();
- } else {
- if(nd.get_switch("toggle_true_north"))
- windArrowRot = windArrowRot - nd.aircraft_source.get_hdg_tru();
- else
- windArrowRot = windArrowRot - nd.aircraft_source.get_hdg_mag();
- }
+ var windArrowRot = (pts.Instrumentation.PFD.windDirection.getValue() or 0) - nd.aircraft_source.get_hdg_tru();
nd.symbols.windArrow.setRotation(windArrowRot*D2R);
},
is_false: func(nd) nd.symbols.windArrow.hide(),
diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index ab3d0cff..1fed75d8 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -216,9 +216,9 @@ var canvas_PFD_base = {
"FMA_athr_box","FMA_Middle1","FMA_Middle2","ALPHA_MAX","ALPHA_PROT","ALPHA_SW","ALPHA_bars","VLS_min","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP",
"ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank","AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading",
"AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP",
- "ALT_digit_DN","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale",
+ "ALT_digit_DN","ALT_digit_UP_metric","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale",
"HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L",
- "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate"];
+ "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd","Metric_box","Metric_letter","Metric_cur_alt"];
},
off: 0,
on: 0,
@@ -349,6 +349,7 @@ var canvas_PFD_base = {
PFD_2_mismatch.page.show();
}
},
+ showMetricAlt: 0,
updateCommon: func () {
# FMA MAN TOGA MCT FLX THR
# Set properties used a lot to a variable to avoid calling getValue() multiple times
@@ -396,6 +397,12 @@ var canvas_PFD_base = {
me["AI_agl"].setText(sprintf("%s", math.round(math.clamp(gear_agl_cur, 0, 2500))));
+ if (gear_agl_cur < 400 and pts.Velocities.groundspeedKt.getValue() > 50 and pts.Fdm.JSBsim.Fadec.detent[0].getValue() <= 3 and pts.Fdm.JSBsim.Fadec.detent[1].getValue() <= 3) {
+ me["tailstrikeInd"].show();
+ } else {
+ me["tailstrikeInd"].hide();
+ }
+
if (fmgc.FMGCInternal.phase < 3 or fmgc.flightPlanController.arrivalDist >= 250) {
me["FMA_dh_box"].hide();
me["FMA_dh"].hide();
@@ -1025,7 +1032,6 @@ var canvas_PFD_base = {
me["QNH_std"].hide();
me["QNH_box"].hide();
}
-
},
# Get Angle of Attack from ADR1 or, depending on Switching panel, ADR3
@@ -1688,6 +1694,18 @@ var canvas_PFD_1 = {
me["ALT_scale"].show();
me.altitude = dmc.DMController.DMCs[0].outputs[1].getValue();
+
+ if (me.showMetricAlt) {
+ me["Metric_box"].show();
+ me["Metric_letter"].show();
+ me["Metric_cur_alt"].show();
+ me["Metric_cur_alt"].setText(sprintf("%5.0f", me.altitude * 0.3048));
+ } else {
+ me["Metric_box"].hide();
+ me["Metric_letter"].hide();
+ me["Metric_cur_alt"].hide();
+ }
+
me.altOffset = me.altitude / 500 - int(me.altitude / 500);
me.middleAltText = roundaboutAlt(me.altitude / 100);
me.middleAltOffset = nil;
@@ -1715,6 +1733,14 @@ var canvas_PFD_1 = {
me["ALT_tens"].setTranslation(0, altTens * 1.392);
ap_alt_cur = ap_alt.getValue();
+
+ if (me.showMetricAlt) {
+ me["ALT_digit_UP_metric"].show();
+ me["ALT_digit_UP_metric"].setText(sprintf("%5.0fM", ap_alt_cur * 0.3048));
+ } else {
+ me["ALT_digit_UP_metric"].hide();
+ }
+
alt_diff_cur = dmc.DMController.DMCs[0].outputs[7].getValue();
if (alt_diff_cur >= -565 and alt_diff_cur <= 565) {
me["ALT_target"].setTranslation(0, (alt_diff_cur / 100) * -48.66856);
@@ -1824,6 +1850,10 @@ var canvas_PFD_1 = {
me["ALT_box_flash"].hide();
me["ALT_box_amber"].hide();
me["ALT_box"].hide();
+ me["Metric_box"].hide();
+ me["Metric_letter"].hide();
+ me["Metric_cur_alt"].hide();
+ me["ALT_digit_UP_metric"].hide();
}
me.updateCommon();
@@ -2459,6 +2489,18 @@ var canvas_PFD_2 = {
me["ALT_scale"].show();
me.altitude = dmc.DMController.DMCs[1].outputs[1].getValue();
+
+ if (me.showMetricAlt) {
+ me["Metric_box"].show();
+ me["Metric_letter"].show();
+ me["Metric_cur_alt"].show();
+ me["Metric_cur_alt"].setText(sprintf("%5.0f", me.altitude * 0.3048));
+ } else {
+ me["Metric_box"].hide();
+ me["Metric_letter"].hide();
+ me["Metric_cur_alt"].hide();
+ }
+
me.altOffset = me.altitude / 500 - int(me.altitude / 500);
me.middleAltText = roundaboutAlt(me.altitude / 100);
me.middleAltOffset = nil;
@@ -2486,6 +2528,14 @@ var canvas_PFD_2 = {
me["ALT_tens"].setTranslation(0, altTens * 1.392);
ap_alt_cur = ap_alt.getValue();
+
+ if (me.showMetricAlt) {
+ me["ALT_digit_UP_metric"].show();
+ me["ALT_digit_UP_metric"].setText(sprintf("%5.0fM", ap_alt_cur * 0.3048));
+ } else {
+ me["ALT_digit_UP_metric"].hide();
+ }
+
alt_diff_cur = dmc.DMController.DMCs[1].outputs[7].getValue();
if (alt_diff_cur >= -565 and alt_diff_cur <= 565) {
me["ALT_target"].setTranslation(0, (alt_diff_cur / 100) * -48.66856);
@@ -2595,6 +2645,10 @@ var canvas_PFD_2 = {
me["ALT_box_flash"].hide();
me["ALT_box_amber"].hide();
me["ALT_box"].hide();
+ me["Metric_box"].hide();
+ me["Metric_letter"].hide();
+ me["Metric_cur_alt"].hide();
+ me["ALT_digit_UP_metric"].hide();
}
me.updateCommon();
diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg
index 23653432..28c3d817 100644
--- a/Models/Instruments/PFD/res/pfd.svg
+++ b/Models/Instruments/PFD/res/pfd.svg
@@ -41,9 +41,9 @@
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="-8"
- inkscape:cy="683.12157"
- inkscape:cx="1026.1197"
- inkscape:zoom="1.8101934"
+ inkscape:cy="1074.3176"
+ inkscape:cx="955.3885"
+ inkscape:zoom="2"
showgrid="true"
id="namedview371"
inkscape:window-height="705"
@@ -580,6 +580,13 @@
id="path886"
d="m 448.25473,1194.8172 66.90422,59.142 h -59.49742 v -14.7583 h 11.11022 l -18.51702,-19.615 -18.51702,19.615 h 11.11022 v 14.7583 h -59.49741 z"
style="fill:none;stroke:#ff0000;stroke-width:7.42499971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+
G
- -800
+
+ 11070
+ M
+ 10000M
diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml
index 2bd06244..a02a2e68 100644
--- a/Models/Instruments/Radio/Radio1.xml
+++ b/Models/Instruments/Radio/Radio1.xml
@@ -2176,9 +2176,9 @@
rmp-standby
rmp-standby-test
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
0
@@ -2191,9 +2191,9 @@
0
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml
index 2d9d7589..8ef9b533 100644
--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@@ -2176,9 +2176,9 @@
rmp-standby
rmp-standby-test
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
0
@@ -2191,9 +2191,9 @@
0
- 0.89
- 0.37
- 0.08
+ 1.00
+ 0.355
+ 0.00
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index d7a6f042..dedcd4e3 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -30,6 +30,9 @@ var ECAM_line5rc = props.globals.getNode("/ECAM/rightmsg/linec5", 1);
var ECAM_line6rc = props.globals.getNode("/ECAM/rightmsg/linec6", 1);
var ECAM_line7rc = props.globals.getNode("/ECAM/rightmsg/linec7", 1);
var ECAM_line8rc = props.globals.getNode("/ECAM/rightmsg/linec8", 1);
+var enginesBothAtIdle = props.globals.getNode("/fdm/jsbsim/fadec/both-at-idle");
+var enginesBothAtIdleTime = props.globals.initNode("/ECAM/Upper/idle-time", 0.0, "DOUBLE");
+var enginesBothAtIdleTimeSaved = props.globals.initNode("/ECAM/Upper/idle-time-saved", 0.0, "DOUBLE");
var canvas_upperECAM = {
new: func(svg, name, type) {
@@ -496,7 +499,7 @@ var canvas_upperECAM = {
"EGT1-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal","N12-box","N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N12-XX2","N12-XX-box","EGT2-needle","EGT2",
"EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","FlapTxt","FlapDots","N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1",
"REV1-box","REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","ECAMR1","ECAMR2","ECAMR3","ECAMR4","ECAMR5","ECAMR6","ECAMR7","ECAMR8","ECAM_Right","FOB-weight-unit","FFlow-weight-unit","SlatAlphaLock",
- "SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp"];
+ "SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp","idleIndication"];
},
getKeysIAE: func() {
return ["EPR1-needle","EPR1-thr","EPR1-ylim","EPR1","EPR1-decpnt","EPR1-decimal","EPR1-box","EPR1-scale","EPR1-scaletick","EPR1-scalenum","EPR1-XX","EPR1-XX2","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick","EGT1-XX",
@@ -504,7 +507,7 @@ var canvas_upperECAM = {
"EPR2-decimal","EPR2-box","EPR2-scale","EPR2-scaletick","EPR2-scalenum","EPR2-XX","EPR2-XX2","EGT2-needle","EGT2","EGT2-scale","EGT2-scale2","EGT2-box","EGT2-scaletick","EGT2-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal",
"N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","FlapTxt","FlapDots","EPRLim-mode","EPRLim","EPRLim-decpnt","EPRLim-decimal","EPRLim-XX","EPRLim-XX2","EPRMode",
"N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","N1Mode","REV1","REV1-box","REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","ECAMR1","ECAMR2","ECAMR3",
- "ECAMR4","ECAMR5","ECAMR6","ECAMR7","ECAMR8","ECAM_Right","FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock","SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp"];
+ "ECAMR4","ECAMR5","ECAMR6","ECAMR7","ECAMR8","ECAM_Right","FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock","SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp","idleIndication"];
},
getKeysTest: func() {
return ["Test_white","Test_text"];
@@ -531,6 +534,9 @@ var canvas_upperECAM = {
me[key].setColor(me.getColorString(node.getValue()));
}, 0, 0);
},
+ displayIdle: 0,
+ displayIdleDim: 0,
+ displayIdleTrigger: 0,
updateCommon: func(notification) {
me.updatePower();
@@ -542,6 +548,37 @@ var canvas_upperECAM = {
return;
}
+ if (enginesBothAtIdle.getValue() and !me["aFloor"].getVisible() and !notification.gear1Wow and notification.athr) {
+ if (!me.displayIdleTrigger) {
+ enginesBothAtIdleTime.setValue(notification.elapsedTime);
+ me.displayIdleTrigger = 1;
+ }
+ if ((notification.elapsedTime - enginesBothAtIdleTime.getValue()) < 10) {
+ if ((notification.elapsedTime - enginesBothAtIdleTimeSaved.getValue()) > 1) {
+ enginesBothAtIdleTimeSaved.setValue(notification.elapsedTime);
+ me.displayIdleDim = !me.displayIdleDim;
+ }
+ }
+ me.displayIdle = 1;
+ } else {
+ me.displayIdle = 0;
+ me.displayIdleDim = 0;
+ me.displayIdleTrigger = 0;
+ enginesBothAtIdleTime.setValue(0);
+ enginesBothAtIdleTimeSaved.setValue(0);
+ }
+
+ if (me.displayIdle) {
+ me["idleIndication"].show();
+ if (me.displayIdleDim) {
+ me["idleIndication"].setColor(0.0509,0.7529,0.2941,0.5);
+ } else {
+ me["idleIndication"].setColor(0.0509,0.7529,0.2941,1);
+ }
+ } else {
+ me["idleIndication"].hide();
+ }
+
foreach(var update_item; me.update_items)
{
update_item.update(notification);
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
index 1362ab37..7470c948 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
@@ -1476,4 +1476,17 @@
x="111.21719"
id="tspan3554"
sodipodi:role="line">A FLOOR
+ IDLE
diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
index cc232e0b..dccad437 100644
--- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
@@ -1971,4 +1971,17 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
+ IDLE
diff --git a/Models/Liveries/A320/CFM/AUA.xml b/Models/Liveries/A320/CFM/AUA.xml
index 00ed9b31..0d22de11 100644
--- a/Models/Liveries/A320/CFM/AUA.xml
+++ b/Models/Liveries/A320/CFM/AUA.xml
@@ -7,6 +7,7 @@
Austrian Airlines (OE-LBU)
AUA-fuselage.png
CFM56-white.png
+ Fuselage/res/placards.png
diff --git a/Models/Liveries/A320/CFM/SWR.xml b/Models/Liveries/A320/CFM/SWR.xml
index 433cf416..a1158b32 100644
--- a/Models/Liveries/A320/CFM/SWR.xml
+++ b/Models/Liveries/A320/CFM/SWR.xml
@@ -8,6 +8,7 @@
SWR-fuselage.png
SWR-engine.png
SWR.png
+ Fuselage/res/placards.png
diff --git a/Models/Liveries/A320/IAE/N680AW.xml b/Models/Liveries/A320/IAE/N680AW.xml
index aea33cef..ce16be2a 100644
--- a/Models/Liveries/A320/IAE/N680AW.xml
+++ b/Models/Liveries/A320/IAE/N680AW.xml
@@ -7,6 +7,7 @@
N680AW(Unpainted)
N680AW-fuselage.png
N680AW-engine.png
+ Fuselage/res/placards.png
diff --git a/Models/Liveries/A320/IAE/QTR.xml b/Models/Liveries/A320/IAE/QTR.xml
index 460c0cf0..ba586fc3 100644
--- a/Models/Liveries/A320/IAE/QTR.xml
+++ b/Models/Liveries/A320/IAE/QTR.xml
@@ -7,6 +7,7 @@
QTR Qatar Airways (A7-AHW)
QTR-fuselage.png
QTR-engine.png
+ Fuselage/res/placards.png
diff --git a/Models/Liveries/A320/IAE/SAS.xml b/Models/Liveries/A320/IAE/SAS.xml
index f818ed67..6de31f3f 100644
--- a/Models/Liveries/A320/IAE/SAS.xml
+++ b/Models/Liveries/A320/IAE/SAS.xml
@@ -7,6 +7,7 @@
SAS Scandinavian (OY-KAM)
SAS-fuselage.png
SAS-engine.png
+ Fuselage/res/placards.png
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 527ca0ce..f300e0ed 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -36,6 +36,7 @@ var altAlertInhibit = nil;
var alt200 = nil;
var alt750 = nil;
var bigThree = nil;
+var fltCtlLandAsap = 0;
var altAlertSteady = 0;
var altAlertFlash = 0;
@@ -2098,7 +2099,7 @@ var messages_priority_2 = func {
altnLaw.active = 1;
altnLawProt.active = 1;
if (altnLawMaxSpeed.clearFlag == 0 and altnLawMaxSpeed2.clearFlag == 0 and !fbw.tripleADRFail) {
- if (!(getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and (getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr") or getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")))) {
+ if (!(systems.HYD.Warnings.greenAbnormLoPr.getValue() and (systems.HYD.Warnings.blueAbnormLoPr.getValue() or systems.HYD.Warnings.yellowAbnormLoPr.getValue()))) {
altnLawMaxSpeed.active = 1;
ECAM_controller.warningReset(altnLawMaxSpeed2);
} else {
@@ -2135,7 +2136,7 @@ var messages_priority_2 = func {
if (getprop("/fdm/jsbsim/fadec/thr-locked-flash") == 0) {
athr_lock.msg = " ";
} else {
- athr_lock.msg = msgSave
+ athr_lock.msg = msgSave;
}
athr_lock.active = 1;
athr_lock_1.active = 1;
@@ -3148,7 +3149,7 @@ var messages_config_memo = func {
setprop("/ECAM/to-config-reset", 0);
}
- if (getprop("/controls/autobrake/mode") == 3) {
+ if (systems.Autobrake.mode.getValue() == 3) {
toMemoLine1.msg = "T.O AUTO BRK MAX";
toMemoLine1.colour = "g";
} else {
@@ -3411,14 +3412,20 @@ var messages_right_memo = func {
ldg_inhibit.active = 0;
}
- if ((!pts.Gear.wow[1].getValue()) and (systems.ELEC.EmerElec.getValue() or getprop("/systems/fire/engine1/warning-active") == 1 or getprop("/systems/fire/engine2/warning-active") == 1 or getprop("/systems/fire/apu/warning-active") == 1 or getprop("/systems/failures/fire/cargo-aft-fire") == 1 or getprop("/systems/failures/fire/cargo-fwd-fire") == 1) or (((systems.HYD.Psi.green.getValue() < 1500 and pts.Engines.Engine.state[0].getValue() == 3) and (systems.HYD.Psi.yellow.getValue() < 1500 and pts.Engines.Engine.state[1].getValue() == 3)) or ((systems.HYD.Psi.green.getValue() < 1500 or systems.HYD.Psi.yellow.getValue() < 1500) and pts.Engines.Engine.state[0].getValue() == 3 and pts.Engines.Engine.state[1].getValue() == 3) and phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8)) {
- # todo: emer elec
+ if (!(FWC.Timer.gnd.getValue() == 1) and (systems.ELEC.EmerElec.getValue() or dualFailNode.getValue() == 1 or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1 or (systems.HYD.Warnings.greenAbnormLoPr.getValue() and systems.HYD.Warnings.yellowAbnormLoPr.getValue()) or (systems.HYD.Warnings.greenAbnormLoPr.getValue() and systems.HYD.Warnings.blueAbnormLoPr.getValue()) or (systems.HYD.Warnings.blueAbnormLoPr.getValue() and systems.HYD.Warnings.yellowAbnormLoPr.getValue()))) {
land_asap_r.active = 1;
} else {
land_asap_r.active = 0;
}
- if (land_asap_r.active == 0 and !pts.Gear.wow[1].getValue() and ((getprop("/fdm/jsbsim/propulsion/tank[0]/contents-lbs") < 1650 and getprop("/fdm/jsbsim/propulsion/tank[1]/contents-lbs") < 1650) or ((getprop("/systems/electrical/bus/dc-2") < 25 and (getprop("/systems/failures/fctl/elac1") == 1 or getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.green.getValue() < 1500 and (getprop("/systems/failures/fctl/elac1") == 1 and getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.yellow.getValue() < 1500 and (getprop("/systems/failures/fctl/elac1") == 1 and getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (getprop("/systems/failures/fctl/elac2") == 1 and getprop("/systems/failures/fctl/sec2") == 1))) or (phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8 and (pts.Engines.Engine.state[0].getValue() != 3 or pts.Engines.Engine.state[1].getValue() != 3)))) {
+ if ((systems.ELEC.Bus.dc2.getValue() < 25 and (fbw.FBW.Failures.elac1.getValue() == 1 or fbw.FBW.Failures.sec1.getValue() == 1)) or ((systems.HYD.Psi.yellow.getValue() < 1500 or systems.HYD.Psi.green.getValue() < 1500) and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (fbw.FBW.Failures.elac2.getValue() == 1 and fbw.FBW.Failures.sec2.getValue() == 1))) {
+ fltCtlLandAsap = 1;
+ } else {
+ fltCtlLandAsap = 0;
+ }
+
+ if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1Fail.getValue() or warningNodes.Logic.eng2Fail.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) {
+ # todo avionics smoke and reverse unlocked
land_asap_a.active = 1;
} else {
land_asap_a.active = 0;
@@ -3496,7 +3503,7 @@ var messages_right_memo = func {
nw_strg_disc.colour = "g";
}
- if (getprop("/controls/pneumatics/switches/ram-air") == 1) {
+ if (systems.PNEU.Switch.ramAir.getValue() == 1) {
ram_air.active = 1;
} else {
ram_air.active = 0;
@@ -3537,7 +3544,7 @@ var messages_right_memo = func {
company_msg.active = 0;
}
- if (getprop("/controls/ice-protection/leng") == 1 or getprop("/controls/ice-protection/reng") == 1 or getprop("/systems/electrical/bus/dc-1") == 0 or getprop("/systems/electrical/bus/dc-2") == 0) {
+ if (getprop("/controls/ice-protection/leng") == 1 or getprop("/controls/ice-protection/reng") == 1 or systems.ELEC.Bus.dc1.getValue() < 25 or systems.ELEC.Bus.dc2.getValue() < 25) {
eng_aice.active = 1;
} else {
eng_aice.active = 0;
@@ -3549,7 +3556,7 @@ var messages_right_memo = func {
wing_aice.active = 0;
}
- if (getprop("/controls/pneumatics/switches/apu") == 1 and pts.APU.rpm.getValue() >= 95) {
+ if (systems.PNEU.Switch.apu.getValue() == 1 and pts.APU.rpm.getValue() >= 95) {
apu_bleed.active = 1;
} else {
apu_bleed.active = 0;
@@ -3561,43 +3568,43 @@ var messages_right_memo = func {
apu_avail.active = 0;
}
- if (getprop("/controls/lighting/landing-lights[1]") > 0 or getprop("/controls/lighting/landing-lights[2]") > 0) {
+ if (pts.Controls.Lighting.landingLights[1].getValue() > 0 or pts.Controls.Lighting.landingLights[2].getValue() > 0) {
ldg_lt.active = 1;
} else {
ldg_lt.active = 0;
}
- if (getprop("/controls/gear/brake-fans") == 1) {
+ if (systems.BrakeSys.brakeFans.getValue() == 1) {
brk_fan.active = 1;
} else {
brk_fan.active = 0;
}
- if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1) { # todo: emer elec
+ if (pts.Instrumentation.MKVII.Inputs.Discretes.flap3Override.getValue() == 1) { # todo: emer elec
gpws_flap3.active = 1;
} else {
gpws_flap3.active = 0;
}
- if (!getprop("/systems/radio/vhf3-data-mode") and (phaseVarMemo3 == 1 or phaseVarMemo3 == 2 or phaseVarMemo3 == 6 or phaseVarMemo3 == 9 or phaseVarMemo3 == 10)) {
+ if (!rmp.vhf3_data_mode.getValue() and (phaseVarMemo3 == 1 or phaseVarMemo3 == 2 or phaseVarMemo3 == 6 or phaseVarMemo3 == 9 or phaseVarMemo3 == 10)) {
vhf3_voice.active = 1;
} else {
vhf3_voice.active = 0;
}
- if (getprop("/controls/autobrake/mode") == 1 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
+ if (systems.Autobrake.mode.getValue() == 1 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
auto_brk_lo.active = 1;
} else {
auto_brk_lo.active = 0;
}
- if (getprop("/controls/autobrake/mode") == 2 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
+ if (systems.Autobrake.mode.getValue() == 2 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
auto_brk_med.active = 1;
} else {
auto_brk_med.active = 0;
}
- if (getprop("/controls/autobrake/mode") == 3 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
+ if (systems.Autobrake.mode.getValue() == 3 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) {
auto_brk_max.active = 1;
} else {
auto_brk_max.active = 0;
diff --git a/Nasal/FBW/it-fbw.nas b/Nasal/FBW/it-fbw.nas
index 7a9daa22..c3c119fd 100644
--- a/Nasal/FBW/it-fbw.nas
+++ b/Nasal/FBW/it-fbw.nas
@@ -68,7 +68,7 @@ var FBW = {
rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"),
rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"),
ths: props.globals.getNode(""),
- spoilerl1: props.globals.getNode(""),
+ spoilerl1: props.globals.getNode("/systems/failures/spoilers/spoiler-l1"),
spoilerl2: props.globals.getNode("/systems/failures/spoilers/spoiler-l2"),
spoilerl3: props.globals.getNode("/systems/failures/spoilers/spoiler-l3"),
spoilerl4: props.globals.getNode("/systems/failures/spoilers/spoiler-l4"),
diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas
index f82370b6..b2b8fd3d 100644
--- a/Nasal/FMGC/FCU.nas
+++ b/Nasal/FMGC/FCU.nas
@@ -491,6 +491,12 @@ var FCUController = {
}
}
},
+ MetricAlt: func() {
+ if (me.FCUworking) {
+ canvas_pfd.PFD_1.showMetricAlt = !canvas_pfd.PFD_1.showMetricAlt;
+ canvas_pfd.PFD_2.showMetricAlt = !canvas_pfd.PFD_2.showMetricAlt;
+ }
+ },
};
# Master / slave principle of operation depending on the autopilot / flight director engagement
diff --git a/Nasal/Libraries/controls-override.nas b/Nasal/Libraries/controls-override.nas
index 2edacb0a..e96bd183 100644
--- a/Nasal/Libraries/controls-override.nas
+++ b/Nasal/Libraries/controls-override.nas
@@ -1,12 +1,6 @@
-# A320 Main Libraries
-# Joshua Davidson (Octal450)
-
+# Airbus A320 Custom Controls
# Copyright (c) 2021 Josh Davidson (Octal450)
-############
-# Controls #
-############
-
controls.stepSpoilers = func(step) {
pts.Controls.Flight.speedbrakeArm.setValue(0);
if (step == 1) {
@@ -16,7 +10,31 @@ controls.stepSpoilers = func(step) {
}
}
+var speedbrakeKey = func() {
+ if (pts.Controls.Flight.speedbrakeArm.getBoolValue()) {
+ pts.Controls.Flight.speedbrakeArm.setBoolValue(0);
+ } else {
+ pts.Controls.Flight.speedbrakeTemp = pts.Controls.Flight.speedbrake.getValue();
+ if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) {
+ if (pts.Controls.Flight.speedbrake.getValue() < 1) {
+ pts.Controls.Flight.speedbrake.setValue(1);
+ } else {
+ pts.Controls.Flight.speedbrake.setValue(0);
+ }
+ } else {
+ if (pts.Controls.Flight.speedbrake.getValue() < 0.5) {
+ pts.Controls.Flight.speedbrake.setValue(0.5);
+ } else if (pts.Controls.Flight.speedbrake.getValue() < 1) {
+ pts.Controls.Flight.speedbrake.setValue(1);
+ } else {
+ pts.Controls.Flight.speedbrake.setValue(0);
+ }
+ }
+ }
+}
+
var deploySpeedbrake = func() {
+ pts.Controls.Flight.speedbrakeArm.setBoolValue(0);
if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) {
if (pts.Controls.Flight.speedbrake.getValue() < 1.0) {
pts.Controls.Flight.speedbrake.setValue(1.0);
@@ -24,22 +42,23 @@ var deploySpeedbrake = func() {
} else {
if (pts.Controls.Flight.speedbrake.getValue() < 0.5) {
pts.Controls.Flight.speedbrake.setValue(0.5);
- } else if (pts.Controls.Flight.speedbrake.getValue() < 1.0) {
- pts.Controls.Flight.speedbrake.setValue(1.0);
+ } else if (pts.Controls.Flight.speedbrake.getValue() < 1) {
+ pts.Controls.Flight.speedbrake.setValue(1);
}
}
}
var retractSpeedbrake = func() {
+ pts.Controls.Flight.speedbrakeArm.setBoolValue(0);
if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) {
- if (pts.Controls.Flight.speedbrake.getValue() > 0.0) {
- pts.Controls.Flight.speedbrake.setValue(0.0);
+ if (pts.Controls.Flight.speedbrake.getValue() > 0) {
+ pts.Controls.Flight.speedbrake.setValue(0);
}
} else {
if (pts.Controls.Flight.speedbrake.getValue() > 0.5) {
pts.Controls.Flight.speedbrake.setValue(0.5);
- } else if (pts.Controls.Flight.speedbrake.getValue() > 0.0) {
- pts.Controls.Flight.speedbrake.setValue(0.0);
+ } else if (pts.Controls.Flight.speedbrake.getValue() > 0) {
+ pts.Controls.Flight.speedbrake.setValue(0);
}
}
}
diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas
index c6412759..568172b0 100644
--- a/Nasal/Libraries/property-tree-setup.nas
+++ b/Nasal/Libraries/property-tree-setup.nas
@@ -54,6 +54,7 @@ var Controls = {
flapsPos: props.globals.getNode("/controls/flight/flaps-pos"),
speedbrake: props.globals.getNode("/controls/flight/speedbrake"),
speedbrakeArm: props.globals.getNode("/controls/flight/speedbrake-arm"),
+ speedbrakeTemp: 0,
rudder: props.globals.getNode("/controls/flight/rudder"),
rudderTrim: props.globals.getNode("/controls/flight/rudder-trim"),
},
@@ -104,6 +105,9 @@ var Fdm = {
alpha: props.globals.getNode("/fdm/jsbsim/aero/alpha-deg"),
alphaNorm: props.globals.getNode("/fdm/jsbsim/aero/alpha-deg-norm"),
},
+ Fadec: {
+ detent: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/detent"),props.globals.getNode("/fdm/jsbsim/fadec/control-2/detent")],
+ },
Fcs: {
brake: [props.globals.getNode("/fdm/jsbsim/fcs/left-brake-cmd-norm"),props.globals.getNode("/fdm/jsbsim/fcs/right-brake-cmd-norm")],
flapDeg: props.globals.getNode("/fdm/jsbsim/fcs/flap-pos-deg"),
@@ -213,7 +217,7 @@ var Instrumentation = {
MKVII: {
Inputs: {
Discretes: {
- flap3Override: props.globals.getNode("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override"),
+ flap3Override: props.globals.getNode("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override"),
},
},
},
@@ -221,6 +225,10 @@ var Instrumentation = {
gsDeflection: props.globals.getNode("/instrumentation/nav[0]/gs-needle-deflection-norm"),
locDeflection: props.globals.getNode("/instrumentation/nav[0]/heading-needle-deflection-norm"),
},
+ PFD: {
+ windDirection: props.globals.getNode("/instrumentation/pfd/wind-direction"),
+ windSpeed: props.globals.getNode("/instrumentation/pfd/wind-speed"),
+ },
TCAS: {
servicable: props.globals.getNode("/instrumentation/tcas/serviceable"),
Inputs: {
diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas
index a707ea1f..c44a615a 100644
--- a/Nasal/MCDU/DATA.nas
+++ b/Nasal/MCDU/DATA.nas
@@ -60,3 +60,15 @@ var printInput2 = func(key, i) {
setprop("FMGC/print/mcdu/page2/R4req", 1);
}
}
+
+var data2Input = func(key, i) {
+ if (key == "L5") {
+ if (canvas_mcdu.myCLBWIND[i] == nil) {
+ canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i);
+ } else {
+ canvas_mcdu.myCLBWIND[i].reload();
+ }
+ fmgc.windController.accessPage[i] = "DATA2";
+ setprop("MCDU[" ~ i ~ "]/page", "WINDCLB");
+ }
+}
diff --git a/Nasal/MCDU/DATA2.nas b/Nasal/MCDU/DATA2.nas
deleted file mode 100644
index 650f8bd7..00000000
--- a/Nasal/MCDU/DATA2.nas
+++ /dev/null
@@ -1,15 +0,0 @@
-# A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring)
-
-# Copyright (c) 2020 Matthew Maring (mattmaring)
-
-var data2Input = func(key, i) {
- if (key == "L5") {
- if (canvas_mcdu.myCLBWIND[i] == nil) {
- canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i);
- } else {
- canvas_mcdu.myCLBWIND[i].reload();
- }
- fmgc.windController.accessPage[i] = "DATA2";
- setprop("MCDU[" ~ i ~ "]/page", "WINDCLB");
- }
-}
diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas
index 2df67438..c9ae3efb 100644
--- a/Nasal/MCDU/MCDU.nas
+++ b/Nasal/MCDU/MCDU.nas
@@ -168,6 +168,7 @@ var MCDU_reset = func(i) {
setprop("/FMGC/internal/eng-out-reduc", "1500");
setprop("/MCDUC/reducacc-set", 0);
fmgc.FMGCInternal.transAlt = 18000;
+ fmgc.FMGCInternal.transAltSet = 0;
# CLB PERF
setprop("/FMGC/internal/activate-once", 0);
diff --git a/Nasal/Systems/Comm/Notification.nas b/Nasal/Systems/Comm/Notification.nas
index f4b9755c..c4b0cd72 100644
--- a/Nasal/Systems/Comm/Notification.nas
+++ b/Nasal/Systems/Comm/Notification.nas
@@ -358,8 +358,8 @@ var ATIS = {
raw = split('"}', raw)[0];
} else {
if (me.type == 0) {
- raw = split('{"arr":"', raw)[1];
- raw = split('","dep":', raw)[0];
+ raw = split('"arr":"', raw)[1];
+ raw = split('","dep":"', raw)[0];
} else {
raw = split('","dep":"', raw)[1];
raw = split('"}', raw)[0];
diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas
index 2849bb63..300cfc89 100644
--- a/Nasal/Systems/electrical.nas
+++ b/Nasal/Systems/electrical.nas
@@ -32,8 +32,6 @@ var ELEC = {
acEssBusFault: props.globals.getNode("/systems/failures/electrical/ac-ess-bus"),
ac1BusFault: props.globals.getNode("/systems/failures/electrical/ac-1-bus"),
ac2BusFault: props.globals.getNode("/systems/failures/electrical/ac-2-bus"),
- bat1Fault: props.globals.getNode("/systems/failures/electrical/bat-1"),
- bat2Fault: props.globals.getNode("/systems/failures/electrical/bat-2"),
dcEssBusFault: props.globals.getNode("/systems/failures/electrical/dc-ess-bus"),
dc1BusFault: props.globals.getNode("/systems/failures/electrical/dc-1-bus"),
dc2BusFault: props.globals.getNode("/systems/failures/electrical/dc-2-bus"),
@@ -194,8 +192,6 @@ var ELEC = {
me.Fail.acEssBusFault.setBoolValue(0);
me.Fail.ac1BusFault.setBoolValue(0);
me.Fail.ac2BusFault.setBoolValue(0);
- me.Fail.bat1Fault.setBoolValue(0);
- me.Fail.bat2Fault.setBoolValue(0);
me.Fail.dcEssBusFault.setBoolValue(0);
me.Fail.dc1BusFault.setBoolValue(0);
me.Fail.dc2BusFault.setBoolValue(0);
diff --git a/Nasal/Systems/hydraulics.nas b/Nasal/Systems/hydraulics.nas
index 7e75f138..70d7af27 100644
--- a/Nasal/Systems/hydraulics.nas
+++ b/Nasal/Systems/hydraulics.nas
@@ -7,7 +7,7 @@ var HYD = {
lcont: 0,
rcont: 0,
Brakes: {
- accumPressPsi: props.globals.initNode("/systems/hydraulic/yellow-accumulator-psi-cmd", 0, "INT"),
+ accumPressPsi: props.globals.initNode("/systems/hydraulic/yellow-accumulator-psi-cmd", 3000, "INT"),
leftPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-left-psi", 0, "INT"),
rightPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-right-psi", 0, "INT"),
mode: props.globals.initNode("/systems/hydraulic/brakes/mode", 0, "INT"),
@@ -62,6 +62,11 @@ var HYD = {
yellowFire: props.globals.getNode("/systems/hydraulic/sources/yellow-edp/fire-valve"),
greenFire: props.globals.getNode("/systems/hydraulic/sources/green-edp/fire-valve"),
},
+ Warnings: {
+ blueAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/blue-abnorm-lo-pr"),
+ greenAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/green-abnorm-lo-pr"),
+ yellowAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/yellow-abnorm-lo-pr"),
+ },
init: func() {
me.resetFail();
me.Qty.blueInput.setValue(math.round((rand() * 2) + 6 , 0.1)); # Random between 6 and 8
@@ -74,6 +79,7 @@ var HYD = {
me.Switch.rat.setValue(0);
me.Switch.yellowEDP.setValue(1);
me.Switch.yellowElec.setValue(0);
+ me.Brakes.accumPressPsi.setValue(3000);
},
resetFail: func() {
me.Fail.blueElec.setBoolValue(0);
@@ -109,7 +115,7 @@ var HYD = {
me.Brakes.accumPressPsi.setValue(0);
}
}
-
+
# Braking Pressure
if (notification.brakesMode == 1 or (notification.brakesMode == 2 and notification.green >= 2500)) {
# Normal braking - Green OK
diff --git a/Systems/a320-adr.xml b/Systems/a320-adr.xml
index 65b82fda..5dfa2f31 100644
--- a/Systems/a320-adr.xml
+++ b/Systems/a320-adr.xml
@@ -530,7 +530,7 @@
/systems/navigation/probes/tat-1/tat
- /velocities/TAS
+ /instrumentation/airspeed-indicator/true-speed-kt
2
7569
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index fa02e9f5..0f23ef08 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -3,12 +3,10 @@
-
+
ice/wingL
ice/wingR
- tuneF
- tuneS
Lift factor due to ground effect
@@ -497,7 +495,7 @@
aero/qbar-psf
metrics/Sw-sqft
aero/beta-rad
- -0.8887
+ -0.6457
@@ -527,7 +525,7 @@
metrics/Sw-sqft
aero/bi2vel
velocities/r-aero-rad_sec
- 0.8709
+ 0.6983
@@ -537,7 +535,7 @@
aero/qbar-psf
metrics/Sw-sqft
hydraulics/rudder/final-deg
- -0.214
+ -0.145
@@ -575,7 +573,7 @@
metrics/bw-ft
aero/bi2vel
velocities/p-aero-rad_sec
- -0.58
+ -0.53
@@ -598,7 +596,7 @@
metrics/Sw-sqft
metrics/bw-ft
hydraulics/aileron-l/final-deg
- 0.044
+ 0.031
@@ -609,7 +607,7 @@
metrics/Sw-sqft
metrics/bw-ft
hydraulics/aileron-r/final-deg
- -0.044
+ -0.031
@@ -620,7 +618,7 @@
metrics/Sw-sqft
metrics/bw-ft
fcs/spoiler-left-deg
- -0.033
+ -0.023
@@ -631,7 +629,7 @@
metrics/Sw-sqft
metrics/bw-ft
fcs/spoiler-right-deg
- 0.033
+ 0.023
@@ -713,7 +711,7 @@
metrics/Sw-sqft
metrics/cbarw-ft
hydraulics/elevator-l/final-deg
- -0.557175
+ -0.345
@@ -724,7 +722,7 @@
metrics/Sw-sqft
metrics/cbarw-ft
hydraulics/elevator-r/final-deg
- -0.557175
+ -0.345
@@ -735,7 +733,7 @@
metrics/Sw-sqft
metrics/cbarw-ft
hydraulics/stabilizer/final-deg
- -1.975
+ -2.575
@@ -773,7 +771,7 @@
metrics/bw-ft
aero/bi2vel
velocities/r-aero-rad_sec
- -0.3
+ -0.25
@@ -784,7 +782,7 @@
metrics/Sw-sqft
metrics/bw-ft
hydraulics/rudder/final-deg
- 0.061
+ 0.042
diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 60571a4f..3ca351e7 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -38,16 +38,16 @@
velocities/mach
atmosphere/density-altitude
- -10000 0 10000 20000 30000 40000 50000
- 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2710 0.0000
- 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2610 0.0000
- 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2530 0.0000
- 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2180 0.0000
- 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.1930 0.0000
- 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1140 0.0000
- 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0450 0.0000
- 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
- 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+ -10000 0 10000 20000 30000 43000 50000
+ 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2840 0.0000
+ 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2740 0.0000
+ 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2670 0.0000
+ 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2310 0.0000
+ 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.2060 0.0000
+ 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1270 0.0000
+ 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0580 0.0000
+ 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+ 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml
index 41c21b16..f5d01ebd 100644
--- a/Systems/a320-cockpit.xml
+++ b/Systems/a320-cockpit.xml
@@ -7,6 +7,16 @@
+
+ spoilers/lever-cmd
+ 20
+
+
+
+ /controls/flight/speedbrake-arm
+ 20
+
+
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index e9f1d84f..95ebf1db 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -25,14 +25,12 @@
/systems/electrical/sources/bat-1/percent
- /systems/failures/electrical/bat-1
- 0 1
- 0 0.0 0.0
- 10 24.0 4.0
- 50 25.5 5.0
- 85 26.5 6.0
- 100 31.0 7.0
+ 0 0.0
+ 10 24.0
+ 50 25.5
+ 85 26.5
+ 100 31.0
@@ -270,14 +268,12 @@
/systems/electrical/sources/bat-2/percent
- /systems/failures/electrical/bat-2
- 0 1
- 0 0.0 0.0
- 10 24.0 4.0
- 50 25.5 5.0
- 85 26.5 6.0
- 100 31.0 7.0
+ 0 0.0
+ 10 24.0
+ 50 25.5
+ 85 26.5
+ 100 31.0
diff --git a/Systems/a320-metrics.xml b/Systems/a320-metrics.xml
index 50dcbfe8..0e991438 100644
--- a/Systems/a320-metrics.xml
+++ b/Systems/a320-metrics.xml
@@ -12,9 +12,9 @@
248.79
- -2.6496
+ -2.2658
0
- -0.75
+ -0.934
diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml
index 9d144a06..7658d70b 100644
--- a/Systems/a320-spoiler.xml
+++ b/Systems/a320-spoiler.xml
@@ -9,6 +9,28 @@
+
+
+
+ /controls/flight/speedbrake gt 0
+
+
+
+
+
+
+
+ /controls/flight/speedbrake
+
+ 0.10 0.0
+ 0.45 0.5
+ 0.55 0.5
+ 0.90 1.0
+
+
+
+
+
@@ -25,8 +47,8 @@
-
-
+
+
fadec/control-1/detent ne 0
fadec/control-2/detent ne 0
@@ -39,7 +61,7 @@
spoilers/main-gear-and eq 1
/velocities/groundspeed-kt ge 72
-
+
fadec/control-1/detent eq 0
fadec/control-2/detent eq 0
/controls/flight/speedbrake-arm eq 1
@@ -48,51 +70,38 @@
+
+
+
+ /controls/flight/speedbrake-arm eq 1
+
+
+
spoilers/main-gear-or eq 0
fbw/fmgc/enabled eq 1
-
- spoilers/main-gear-or eq 0
- fbw/fmgc/enabled eq 1
-
-
+
- /controls/flight/speedbrake
-
- 0.10 0.0
- 0.45 0.625
- 0.55 0.625
- 0.95 1.0
+ spoilers/lever-cmd
+
+ 0.0 0.000
+ 0.5 0.625
+ 1.0 1.000
-
-
-
- spoilers/speedbrake-nul
- 20
-
-
-
- spoilers/speedbrake-nul
- spoilers/auto-speedbrake-cmd
+
- 0.0
+ 0
spoilers/max-spoiler
-
-
-
-
- /controls/flight/speedbrake-arm
- 20
-
+
@@ -125,7 +134,7 @@
hydraulics/spoiler-l1/switch
- 50.0
+ 50
@@ -243,7 +252,7 @@
hydraulics/spoiler-l2/switch
- 50.0
+ 50
@@ -339,7 +348,7 @@
hydraulics/spoiler-l3/switch
- 50.0
+ 50
@@ -435,7 +444,7 @@
hydraulics/spoiler-l4/switch
- 50.0
+ 50
@@ -507,7 +516,7 @@
hydraulics/spoiler-l5/switch
- 50.0
+ 50
@@ -546,7 +555,7 @@
hydraulics/spoiler-r1/switch
- 50.0
+ 50
@@ -664,7 +673,7 @@
hydraulics/spoiler-r2/switch
- 50.0
+ 50
@@ -760,7 +769,7 @@
hydraulics/spoiler-r3/switch
- 50.0
+ 50
@@ -856,7 +865,7 @@
hydraulics/spoiler-r4/switch
- 50.0
+ 50
@@ -928,7 +937,7 @@
hydraulics/spoiler-r5/switch
- 50.0
+ 50
diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml
index 2823f4c5..4c16c6d1 100644
--- a/Systems/a320-v2527-a5-engine-fadec.xml
+++ b/Systems/a320-v2527-a5-engine-fadec.xml
@@ -67,16 +67,16 @@
velocities/mach
atmosphere/density-altitude
- -10000 0 10000 20000 30000 40000 50000
- 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2710 0.0000
- 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2610 0.0000
- 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2530 0.0000
- 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2180 0.0000
- 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.1930 0.0000
- 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1140 0.0000
- 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0450 0.0000
- 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
- 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+ -10000 0 10000 20000 30000 43000 50000
+ 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2840 0.0000
+ 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2740 0.0000
+ 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2670 0.0000
+ 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2310 0.0000
+ 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.2060 0.0000
+ 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1270 0.0000
+ 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0580 0.0000
+ 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+ 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 5cb04a00..a8888794 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -577,14 +577,6 @@
-
- TAS
- gain
- 1.0
- /instrumentation/airspeed-indicator/true-speed-kt
-
-
-
LBtoKG
gain
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index 7c66e40c..c715e8a3 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -573,5 +573,108 @@
+
+
+ Wind East
+ gain
+ 1.0
+
+
+
+
+ /velocities/speed-east-fps
+ 0.592484
+
+
+ /orientation/pitch-deg
+ /orientation/heading-deg
+
+ /systems/navigation/adr/output/tas-3
+
+
+
+
+
+
+ -4096
+ 4096
+
+
+
+ Wind North
+ gain
+ 1.0
+
+
+
+
+ /velocities/speed-north-fps
+ 0.592484
+
+
+ /orientation/pitch-deg
+ /orientation/heading-deg
+
+ /systems/navigation/adr/output/tas-3
+
+
+
+
+
+
+ -4096
+ 4096
+
+
+ Wind Direction
+ exponential
+ 1.28
+
+
+
+
+
+ /instrumentation/pfd/wind-speed-east
+ /instrumentation/pfd/wind-speed-north
+
+
+ 180
+
+
+
+
+
+ 0
+ 360
+
+
+
+
+ Wind Speed
+ exponential
+ 1.28
+
+
+
+
+
+ /instrumentation/pfd/wind-speed-east
+ 2
+
+
+ /instrumentation/pfd/wind-speed-north
+ 2
+
+
+
+
+
+
+ 0
+ 256
+
+