diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index f3907af0..2d1fbb97 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -135,7 +135,8 @@ var canvas_lowerECAM_apu = {
return m;
},
getKeys: func() {
- return ["APUN-needle","APUEGT-needle","APUN","APUEGT","APUAvail","APUFlapOpen","APUBleedValve","APUBleedOnline","APUGenOnline","APUGentext","APUGenLoad","APUGenbox","APUGenVolt","APUGenHz","APUBleedPSI","APUfuelLO","GW","TAT","SAT","text3724","text3728","text3732"];
+ return ["APUN-needle","APUEGT-needle","APUN","APUEGT","APUAvail","APUFlapOpen","APUBleedValve","APUBleedOnline","APUGenOnline","APUGentext","APUGenLoad","APUGenbox","APUGenVolt","APUGenHz","APUBleedPSI","APUfuelLO","GW","TAT","SAT","text3724","text3728",
+ "text3732"];
},
update: func() {
oat = getprop("/environment/temperature-degc");
@@ -350,7 +351,7 @@ var canvas_lowerECAM_fctl = {
return m;
},
getKeys: func() {
- return["ailL","ailR","elevL","elevR","PTcc","PT","PTupdn","GW","TAT","SAT","elac1","elac2","sec1","sec2","sec3","ailLblue","ailRblue","elevLblue","elevRblue","rudderblue","ailLgreen","ailRgreen","elevLgreen","ruddergreen","PTgreen","elevRyellow",
+ return["GW","TAT","SAT","ailL","ailR","elevL","elevR","PTcc","PT","PTupdn","elac1","elac2","sec1","sec2","sec3","ailLblue","ailRblue","elevLblue","elevRblue","rudderblue","ailLgreen","ailRgreen","elevLgreen","ruddergreen","PTgreen","elevRyellow",
"rudderyellow","PTyellow","rudder","spdbrkblue","spdbrkgreen","spdbrkyellow","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex","spoiler1Lrt",
"spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf","spoiler5Lf",
"ailLscale","ailRscale","path4249","path4249-3","path4249-3-6-7","path4249-3-6-7-5","path4249-3-6"];
@@ -736,8 +737,9 @@ var canvas_lowerECAM_wheel = {
return m;
},
getKeys: func() {
- return ["autobrk","autobrkind","NWSyellowrect","altnbrkyellow","normbrkgreen","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex","spoiler1Lrt",
- "spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf","spoiler5Lf"];
+ return ["GW","TAT","SAT","autobrk","autobrkind","NWSyellowrect","altnbrkyellow","normbrkgreen","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex",
+ "spoiler1Lrt","spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf",
+ "spoiler5Lf","braketemp1","braketemp2","braketemp3","braketemp4"];
},
update: func() {
blue_psi = getprop("/systems/hydraulic/blue-psi");
@@ -988,7 +990,6 @@ var canvas_lowerECAM_wheel = {
}
# Hydraulic Boxes
-
if (getprop("/systems/hydraulic/green-psi") > 1500) {
me["normbrkgreen"].setColor(0,1,0);
} else {
@@ -1003,6 +1004,9 @@ var canvas_lowerECAM_wheel = {
me["NWSyellowrect"].setColor(1,0.6,0);
}
+ # Hide not yet implemented stuff
+
+
me.updateBottomStatus();
},
};
diff --git a/Models/Instruments/Lower-ECAM/res/status.svg b/Models/Instruments/Lower-ECAM/res/status.svg
deleted file mode 100644
index 9f1b86c8..00000000
--- a/Models/Instruments/Lower-ECAM/res/status.svg
+++ /dev/null
@@ -1,236 +0,0 @@
-
-
diff --git a/Models/Instruments/Lower-ECAM/res/wheel.svg b/Models/Instruments/Lower-ECAM/res/wheel.svg
index 21af7830..62ba41f5 100644
--- a/Models/Instruments/Lower-ECAM/res/wheel.svg
+++ b/Models/Instruments/Lower-ECAM/res/wheel.svg
@@ -12,7 +12,7 @@
viewBox="0 0 1024 1024"
version="1.1"
id="svg2"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="wheel.svg">
@@ -37,14 +37,14 @@
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:window-width="1366"
- inkscape:window-height="706"
+ inkscape:window-width="1920"
+ inkscape:window-height="1030"
id="namedview371"
- showgrid="false"
- inkscape:zoom="0.83364411"
- inkscape:cx="557.77766"
- inkscape:cy="1034.3181"
- inkscape:window-x="-8"
+ showgrid="true"
+ inkscape:zoom="0.5894754"
+ inkscape:cx="841.14285"
+ inkscape:cy="-495.77164"
+ inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
@@ -54,88 +54,81 @@
°C
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#00a0d2;fill-opacity:1">°C
H
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#00a0d2;fill-opacity:1">H
°C
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#00a0d2;fill-opacity:1">°C
LBS
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#00a0d2;fill-opacity:1">LBS
GW
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#ffffff">GW
TAT
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#ffffff">TAT
SAT
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#ffffff">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:end;text-anchor:end;fill:#00ff00">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:end;text-anchor:end;fill:#00ff00">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:end;text-anchor:end;fill:#00ff00">120000
WHEEL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#ffffff">WHEEL
+ x="505.625"
+ y="284"
+ style="font-size:32px;line-height:1.25">
UP LOCK
+ y="370.81567"
+ style="font-size:32px;line-height:1.25">UP LOCK
UP LOCK
+ sodipodi:role="line"
+ style="font-size:32px;line-height:1.25">UP LOCK
UP LOCK
+ y="371.58517"
+ style="font-size:32px;line-height:1.25">UP LOCK
N/W STEERING
+ y="364.52844"
+ style="font-size:32px;line-height:1.25">N/W STEERING
L/G CTL
+ y="447.63568"
+ style="font-size:32px;line-height:1.25">L/G CTL
ANTI SKID
+ y="552.28931"
+ style="font-size:32px;line-height:1.25">ANTI SKID
ALTN BRK
+ y="667.42596"
+ style="font-size:32px;line-height:1.25">ALTN BRK
AUTO BRK
+ y="766.21356"
+ style="font-size:32px;line-height:1.25">AUTO BRK
MED
+ y="801.61115"
+ style="font-size:32px;line-height:1.25">MED
NORM BRK
+ sodipodi:role="line"
+ style="font-size:32px;line-height:1.25">NORM BRK
ACCU PRESS
+ sodipodi:role="line"
+ style="font-size:32px;line-height:1.25">ACCU PRESS
3
+ x="743.59778"
+ y="667.91455"
+ style="font-size:32px;line-height:1.25">3
4
+ x="909.52106"
+ y="668.76947"
+ style="font-size:32px;line-height:1.25">4
1
+ x="104.61599"
+ y="667.99396"
+ style="font-size:32px;line-height:1.25">1
2
+ y="667.69611"
+ style="font-size:32px;line-height:1.25">2
999
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">999
999
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">999
999
+ y="625.87329"
+ style="font-size:32px;line-height:1.25">999
999
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">999
|||
+ x="926.31042"
+ y="555.97632"
+ style="font-size:21.63888741px;line-height:1.25">|||
|||
+ sodipodi:role="line"
+ style="font-size:21.63888741px;line-height:1.25">|||
|||
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.63888741px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">|||
|||
- REL
+ x="804.20532"
+ y="667.86505"
+ style="font-size:32px;line-height:1.25">REL
REL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">REL
|||
+ y="607.25616"
+ style="font-size:23.3301487px;line-height:1.25">|||
|||
+ sodipodi:role="line"
+ style="font-size:23.3301487px;line-height:1.25">|||
|||
+ y="607.25616"
+ style="font-size:23.3301487px;line-height:1.25">|||
|||
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.3301487px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">|||
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
1
+ sodipodi:role="line"
+ style="font-size:43.1136055px;line-height:1.25">1
2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136055px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">2
3
4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136055px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">4
5
1
+ y="113.25016"
+ style="font-size:43.1136055px;line-height:1.25">1
2
3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136055px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">3
4
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136055px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">5
Y
+ y="620.99146"
+ style="font-size:34.50801086px;line-height:1.25">Y
GG
+ id="tspan4332"
+ style="font-size:34.50801086px;line-height:1.25">
2
+ y="554.21948"
+ style="font-size:32px;line-height:1.25">2
1
+ y="554.79913"
+ style="font-size:32px;line-height:1.25">1
Y
+ sodipodi:role="line"
+ style="font-size:34.50801086px;line-height:1.25">Y
+ |||