diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 0e5a6f2f..e897e30e 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -265,9 +265,9 @@ var canvas_upperECAM_cfm_eis2 = {
return m;
},
getKeys: func() {
- return ["N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-box","N11-scale","N11-scale2","N11-scalenum","N11-XX","N11-XX2","N11-XX-box","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick","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-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",
+ return ["N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-box","N11-scale","N11-scale2","N11-scaletick","N11-scalenum","N11-XX","N11-XX2","N11-XX-box","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick",
+ "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","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","FlapTxt","FlapDots","N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1","REV1-box","REV2","REV2-box"];
},
update: func() {
@@ -293,6 +293,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["N11-decimal"].show();
me["N11-decpnt"].show();
me["N11-needle"].show();
+ me["N11-scaletick"].show();
me["N11-ylim"].show();
me["N11-scalenum"].show();
me["N11-box"].show();
@@ -306,6 +307,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["N11-decimal"].hide();
me["N11-decpnt"].hide();
me["N11-needle"].hide();
+ me["N11-scaletick"].hide();
me["N11-ylim"].hide();
me["N11-scalenum"].hide();
me["N11-box"].hide();
@@ -327,6 +329,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["N12-decimal"].show();
me["N12-decpnt"].show();
me["N12-needle"].show();
+ me["N12-scaletick"].show();
me["N12-ylim"].show();
me["N12-scalenum"].show();
me["N12-box"].show();
@@ -340,6 +343,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["N12-decimal"].hide();
me["N12-decpnt"].hide();
me["N12-needle"].hide();
+ me["N12-scaletick"].hide();
me["N12-ylim"].hide();
me["N12-scalenum"].hide();
me["N12-box"].hide();
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
deleted file mode 100644
index f628259a..00000000
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
+++ /dev/null
@@ -1,1211 +0,0 @@
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
- EGT °C N1 % % N2 F.F LBS/H FOB : LBS
-
-
-
-
- 5 10 5
- 000 00 00000 0 00 0 XX XX XX 0000000 LINE 1 LINE 2 LINE 3 LINE 4 LINE 5 LINE 6 LINE 7 LINE 8
- 10 5
- TOGA XX 00 0 XX 1+F 00 0 XX REV 00000 XX XX %
-
-
-
-
- 5 10 5
- 000 00 0 XX XX
- 10 5
- REV FLAP
- S F
-
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
index 69757f9c..950176d8 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
@@ -12,7 +12,7 @@
viewBox="0 0 1024 1024"
version="1.1"
id="svg2"
- inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ inkscape:version="0.91 r13725"
sodipodi:docname="cfm-eis2.svg">
@@ -40,10 +40,10 @@
inkscape:window-width="1920"
inkscape:window-height="1030"
id="namedview371"
- showgrid="true"
- inkscape:zoom="1.4142136"
- inkscape:cx="633.20716"
- inkscape:cy="1167.7783"
+ showgrid="false"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="1126.6667"
+ inkscape:cy="841.87643"
inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@@ -56,632 +56,58 @@
EGT °C N1 % % N2 FF LBS/H FOB : LBS
-
-
-
-
- 5 10
- 000 00 00000 0 00 0 XX XX XX XX 0000000 LINE 1 LINE 2 LINE 3 LINE 4 LINE 5 LINE 6 LINE 7 LINE 8 TOGA XX 00 0 XX 1+F
+ inkscape:label="#g4344"
+ transform="translate(-12.155904,31.48427)">
S F
- 00 0 XX
-
- 000 XX
-
- REV 00000 XX XX
-
-
- 5 10
- 00 0 XX XX
-
- REV LBS LINE 1 LINE 2 FOB : 000000 LBS/H FF N2 % EGT °C N1 % 0000 XX 0000 XX 00 0 XX 00 0 XX % TOGA 00 0 XX XX 000 XX 00
+ 10 5
+ 0
+
+ XX REV XX
+
+ 000 XX 00
+ 10 5
+ 0
+
+ XX REV XX
+
+ LINE 3 LINE 4 LINE 5 LINE 6 LINE 7 LINE 8
+
+
+
+ image/svg+xml
+
+
+
+
+
+
diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis1.svg b/Models/Instruments/Upper-ECAM/res/iae-eis1.svg
deleted file mode 100644
index 0e9e2c47..00000000
--- a/Models/Instruments/Upper-ECAM/res/iae-eis1.svg
+++ /dev/null
@@ -1,1398 +0,0 @@
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
- EGT °C N1 % % N2 F.F LBS/H FOB : LBS
-
-
- 1 1.2 1.4 1.6
-
-
- 000 00000 00 0 XX XX 0000000 LINE 1 LINE 2 LINE 3 LINE 4 LINE 5 LINE 6 LINE 7 LINE 8
- 8 4
- 1+F 00 0 XX 00000 XX XX FLAP
- S F
- TOGA 1.000 XX XX 1.000 XX XX REV
- 4 10
- 00 0 XX
-
-
- 1 1.2 1.4 1.6
-
-
- 000 XX
- 8 4
- 1.000 XX XX REV
- 4 10
- 00 0 XX EPR
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index bad9bdf8..052df43b 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -235,10 +235,10 @@
/engines/engine[0]/n1-actual
- 19.7 -134 50.0 -58 100.0 42 110.0 59 19.7 -131 50.0 -64 100.0 48 110.0 65
@@ -276,10 +276,10 @@
/engines/engine[0]/n1-actual-cmd
- 19.7 -134 50.0 -58 100.0 42 110.0 59 19.7 -131 50.0 -64 100.0 48 110.0 65
@@ -317,10 +317,10 @@
/engines/engine[1]/n1-actual
- 19.7 -134 50.0 -58 100.0 42 110.0 59 19.7 -131 50.0 -64 100.0 48 110.0 65
@@ -358,10 +358,10 @@
/engines/engine[1]/n1-actual-cmd
- 19.7 -134 50.0 -58 100.0 42 110.0 59 19.7 -131 50.0 -64 100.0 48 110.0 65
@@ -402,10 +402,10 @@
/systems/thrust/n1/toga-lim
- 19.7 -116 50.0 -45 100.0 69 110.0 90 19.7 -131 50.0 -64 100.0 48 110.0 65
diff --git a/revision.txt b/revision.txt
index 06b9789a..70626b2f 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4032
\ No newline at end of file
+4033
\ No newline at end of file