diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index 2205402b..9851331f 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -162,15 +162,15 @@ var canvas_lowerECAM_apu = {
# APU Gen
if (getprop("/systems/electrical/extra/apu-volts") > 110) {
- me["APUGenVolt"].setColor(0,1,0);
+ me["APUGenVolt"].setColor(0.0667,0.7294,0.3137);
} else {
- me["APUGenVolt"].setColor(1,0.6,0);
+ me["APUGenVolt"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/electrical/extra/apu-hz") > 380) {
- me["APUGenHz"].setColor(0,1,0);
+ me["APUGenHz"].setColor(0.0667,0.7294,0.3137);
} else {
- me["APUGenHz"].setColor(1,0.6,0);
+ me["APUGenHz"].setColor(0.7333,0.3803,0);
}
if (getprop("/controls/APU/master") == 1 or getprop("/systems/apu/rpm") >= 94.9) {
@@ -198,9 +198,9 @@ var canvas_lowerECAM_apu = {
}
if ((getprop("/controls/APU/master") == 0) or ((getprop("/controls/APU/master") == 1) and (getprop("/controls/electrical/switches/gen-apu") == 1) and (getprop("/systems/apu/rpm") > 94.9))) {
- me["APUGentext"].setColor(1,1,1);
+ me["APUGentext"].setColor(0.8078,0.8039,0.8078);
} else if ((getprop("/controls/APU/master") == 1) and (getprop("/controls/electrical/switches/gen-apu") == 0) and (getprop("/systems/apu/rpm") < 94.9)) {
- me["APUGentext"].setColor(1,0.6,0);
+ me["APUGentext"].setColor(0.7333,0.3803,0);
}
me["APUGenLoad"].setText(sprintf("%s", math.round(getprop("/systems/electrical/extra/apu-load"))));
@@ -209,10 +209,10 @@ var canvas_lowerECAM_apu = {
# APU Bleed
if (getprop("/controls/adirs/ir[1]/knob") != 1 and (getprop("/controls/APU/master") == 1 or getprop("/systems/pneumatic/bleedapu") > 0)) {
- me["APUBleedPSI"].setColor(0,1,0);
+ me["APUBleedPSI"].setColor(0.0667,0.7294,0.3137);
me["APUBleedPSI"].setText(sprintf("%s", math.round(getprop("/systems/pneumatic/bleedapu"))));
} else {
- me["APUBleedPSI"].setColor(1,0.6,0);
+ me["APUBleedPSI"].setColor(0.7333,0.3803,0);
me["APUBleedPSI"].setText(sprintf("%s", "XX"));
}
@@ -226,19 +226,19 @@ var canvas_lowerECAM_apu = {
# APU N and EGT
if (getprop("/controls/APU/master") == 1) {
- me["APUN"].setColor(0,1,0);
+ me["APUN"].setColor(0.0667,0.7294,0.3137);
me["APUN"].setText(sprintf("%s", math.round(getprop("/systems/apu/rpm"))));
- me["APUEGT"].setColor(0,1,0);
+ me["APUEGT"].setColor(0.0667,0.7294,0.3137);
me["APUEGT"].setText(sprintf("%s", math.round(getprop("/systems/apu/egt"))));
} else if (getprop("/systems/apu/rpm") >= 1) {
- me["APUN"].setColor(0,1,0);
+ me["APUN"].setColor(0.0667,0.7294,0.3137);
me["APUN"].setText(sprintf("%s", math.round(getprop("/systems/apu/rpm"))));
- me["APUEGT"].setColor(0,1,0);
+ me["APUEGT"].setColor(0.0667,0.7294,0.3137);
me["APUEGT"].setText(sprintf("%s", math.round(getprop("/systems/apu/egt"))));
} else {
- me["APUN"].setColor(1,0.6,0);
+ me["APUN"].setColor(0.7333,0.3803,0);
me["APUN"].setText(sprintf("%s", "XX"));
- me["APUEGT"].setColor(1,0.6,0);
+ me["APUEGT"].setColor(0.7333,0.3803,0);
me["APUEGT"].setText(sprintf("%s", "XX"));
}
me["APUN-needle"].setRotation((getprop("/ECAM/Lower/APU-N") + 90)*D2R);
@@ -270,16 +270,16 @@ var canvas_lowerECAM_eng1 = {
# Oil Pressure
if (getprop("/engines/engine[0]/oil-psi-actual") >= 20) {
- me["OilPSI1"].setColor(0,1,0);
- me["OilPSI1-needle"].setColorFill(0,1,0);
+ me["OilPSI1"].setColor(0.0667,0.7294,0.3137);
+ me["OilPSI1-needle"].setColorFill(0.0667,0.7294,0.3137);
} else {
me["OilPSI1"].setColor(1,0,0);
me["OilPSI1-needle"].setColorFill(1,0,0);
}
if (getprop("/engines/engine[1]/oil-psi-actual") >= 20) {
- me["OilPSI2"].setColor(0,1,0);
- me["OilPSI2-needle"].setColorFill(0,1,0);
+ me["OilPSI2"].setColor(0.0667,0.7294,0.3137);
+ me["OilPSI2-needle"].setColorFill(0.0667,0.7294,0.3137);
} else {
me["OilPSI2"].setColor(1,0,0);
me["OilPSI2-needle"].setColorFill(1,0,0);
@@ -317,16 +317,16 @@ var canvas_lowerECAM_eng = {
# Oil Pressure
if (getprop("/engines/engine[0]/oil-psi-actual") >= 20) {
- me["OilPSI1"].setColor(0,1,0);
- me["OilPSI1-needle"].setColorFill(0,1,0);
+ me["OilPSI1"].setColor(0.0667,0.7294,0.3137);
+ me["OilPSI1-needle"].setColorFill(0.0667,0.7294,0.3137);
} else {
me["OilPSI1"].setColor(1,0,0);
me["OilPSI1-needle"].setColorFill(1,0,0);
}
if (getprop("/engines/engine[1]/oil-psi-actual") >= 20) {
- me["OilPSI2"].setColor(0,1,0);
- me["OilPSI2-needle"].setColorFill(0,1,0);
+ me["OilPSI2"].setColor(0.0667,0.7294,0.3137);
+ me["OilPSI2-needle"].setColorFill(0.0667,0.7294,0.3137);
} else {
me["OilPSI2"].setColor(1,0,0);
me["OilPSI2-needle"].setColorFill(1,0,0);
@@ -371,13 +371,13 @@ var canvas_lowerECAM_fctl = {
}
if (green_psi < 1500 and yellow_psi < 1500) {
- me["PT"].setColor(1,0.6,0);
- me["PTupdn"].setColor(1,0.6,0);
- me["PTcc"].setColor(1,0.6,0);
+ me["PT"].setColor(0.7333,0.3803,0);
+ me["PTupdn"].setColor(0.7333,0.3803,0);
+ me["PTcc"].setColor(0.7333,0.3803,0);
} else {
- me["PT"].setColor(0,1,0);
- me["PTupdn"].setColor(0,1,0);
- me["PTcc"].setColor(0,1,0);
+ me["PT"].setColor(0.0667,0.7294,0.3137);
+ me["PTupdn"].setColor(0.0667,0.7294,0.3137);
+ me["PTcc"].setColor(0.0667,0.7294,0.3137);
}
# Ailerons
@@ -385,11 +385,11 @@ var canvas_lowerECAM_fctl = {
me["ailR"].setTranslation(0,getprop("/ECAM/Lower/aileron-ind-right")*(-100));
if (blue_psi < 1500 and green_psi < 1500) {
- me["ailL"].setColor(1,0.6,0);
- me["ailR"].setColor(1,0.6,0);
+ me["ailL"].setColor(0.7333,0.3803,0);
+ me["ailR"].setColor(0.7333,0.3803,0);
} else {
- me["ailL"].setColor(0,1,0);
- me["ailR"].setColor(0,1,0);
+ me["ailL"].setColor(0.0667,0.7294,0.3137);
+ me["ailR"].setColor(0.0667,0.7294,0.3137);
}
# Elevators
@@ -397,24 +397,24 @@ var canvas_lowerECAM_fctl = {
me["elevR"].setTranslation(0,getprop("/ECAM/Lower/elevator-ind-right")*100);
if (blue_psi < 1500 and green_psi < 1500) {
- me["elevL"].setColor(1,0.6,0);
+ me["elevL"].setColor(0.7333,0.3803,0);
} else {
- me["elevL"].setColor(0,1,0);
+ me["elevL"].setColor(0.0667,0.7294,0.3137);
}
if (blue_psi < 1500 and yellow_psi < 1500) {
- me["elevR"].setColor(1,0.6,0);
+ me["elevR"].setColor(0.7333,0.3803,0);
} else {
- me["elevR"].setColor(0,1,0);
+ me["elevR"].setColor(0.0667,0.7294,0.3137);
}
# Rudder
me["rudder"].setRotation(getprop("/controls/flight/rudder-fdm")*(-0.6));
if (blue_psi < 1500 and yellow_psi < 1500 and green_psi < 1500) {
- me["rudder"].setColor(1,0.6,0);
+ me["rudder"].setColor(0.7333,0.3803,0);
} else {
- me["rudder"].setColor(0,1,0);
+ me["rudder"].setColor(0.0667,0.7294,0.3137);
}
# Spoilers
@@ -500,229 +500,229 @@ var canvas_lowerECAM_fctl = {
# Spoiler Fail
if (getprop("/controls/flight/spoiler-l1-failed") or green_psi < 1500) {
- me["spoiler1Lex"].setColor(1,0.6,0);
- me["spoiler1Lrt"].setColor(1,0.6,0);
+ me["spoiler1Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler1Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l1") < 0.033) {
me["spoiler1Lf"].show();
} else {
me["spoiler1Lf"].hide();
}
} else {
- me["spoiler1Lex"].setColor(0,1,0);
- me["spoiler1Lrt"].setColor(0,1,0);
+ me["spoiler1Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler1Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler1Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l2-failed") or yellow_psi < 1500) {
- me["spoiler2Lex"].setColor(1,0.6,0);
- me["spoiler2Lrt"].setColor(1,0.6,0);
+ me["spoiler2Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler2Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l2") < 0.033) {
me["spoiler2Lf"].show();
} else {
me["spoiler2Lf"].hide();
}
} else {
- me["spoiler2Lex"].setColor(0,1,0);
- me["spoiler2Lrt"].setColor(0,1,0);
+ me["spoiler2Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler2Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler2Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l3-failed") or blue_psi < 1500) {
- me["spoiler3Lex"].setColor(1,0.6,0);
- me["spoiler3Lrt"].setColor(1,0.6,0);
+ me["spoiler3Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler3Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l3") < 0.033) {
me["spoiler3Lf"].show();
} else {
me["spoiler3Lf"].hide();
}
} else {
- me["spoiler3Lex"].setColor(0,1,0);
- me["spoiler3Lrt"].setColor(0,1,0);
+ me["spoiler3Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler3Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler3Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l4-failed") or yellow_psi < 1500) {
- me["spoiler4Lex"].setColor(1,0.6,0);
- me["spoiler4Lrt"].setColor(1,0.6,0);
+ me["spoiler4Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler4Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l4") < 0.033) {
me["spoiler4Lf"].show();
} else {
me["spoiler4Lf"].hide();
}
} else {
- me["spoiler4Lex"].setColor(0,1,0);
- me["spoiler4Lrt"].setColor(0,1,0);
+ me["spoiler4Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler4Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler4Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l5-failed") or green_psi < 1500) {
- me["spoiler5Lex"].setColor(1,0.6,0);
- me["spoiler5Lrt"].setColor(1,0.6,0);
+ me["spoiler5Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler5Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l5") < 0.033) {
me["spoiler5Lf"].show();
} else {
me["spoiler5Lf"].hide();
}
} else {
- me["spoiler5Lex"].setColor(0,1,0);
- me["spoiler5Lrt"].setColor(0,1,0);
+ me["spoiler5Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler5Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler5Lf"].hide();
}
if (getprop("/controls/flight/spoiler-r1-failed") or green_psi < 1500) {
- me["spoiler1Rex"].setColor(1,0.6,0);
- me["spoiler1Rrt"].setColor(1,0.6,0);
+ me["spoiler1Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler1Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r1") < 0.033) {
me["spoiler1Rf"].show();
} else {
me["spoiler1Rf"].hide();
}
} else {
- me["spoiler1Rex"].setColor(0,1,0);
- me["spoiler1Rrt"].setColor(0,1,0);
+ me["spoiler1Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler1Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler1Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r2-failed") or yellow_psi < 1500) {
- me["spoiler2Rex"].setColor(1,0.6,0);
- me["spoiler2Rrt"].setColor(1,0.6,0);
+ me["spoiler2Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler2Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r2") < 0.033) {
me["spoiler2Rf"].show();
} else {
me["spoiler2Rf"].hide();
}
} else {
- me["spoiler2Rex"].setColor(0,1,0);
- me["spoiler2Rrt"].setColor(0,1,0);
+ me["spoiler2Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler2Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler2Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r3-failed") or blue_psi < 1500) {
- me["spoiler3Rex"].setColor(1,0.6,0);
- me["spoiler3Rrt"].setColor(1,0.6,0);
+ me["spoiler3Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler3Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r3") < 0.033) {
me["spoiler3Rf"].show();
} else {
me["spoiler3Rf"].hide();
}
} else {
- me["spoiler3Rex"].setColor(0,1,0);
- me["spoiler3Rrt"].setColor(0,1,0);
+ me["spoiler3Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler3Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler3Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r4-failed") or yellow_psi < 1500) {
- me["spoiler4Rex"].setColor(1,0.6,0);
- me["spoiler4Rrt"].setColor(1,0.6,0);
+ me["spoiler4Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler4Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r4") < 0.033) {
me["spoiler4Rf"].show();
} else {
me["spoiler4Rf"].hide();
}
} else {
- me["spoiler4Rex"].setColor(0,1,0);
- me["spoiler4Rrt"].setColor(0,1,0);
+ me["spoiler4Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler4Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler4Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r5-failed") or green_psi < 1500) {
- me["spoiler5Rex"].setColor(1,0.6,0);
- me["spoiler5Rrt"].setColor(1,0.6,0);
+ me["spoiler5Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler5Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r5") < 0.033) {
me["spoiler5Rf"].show();
} else {
me["spoiler5Rf"].hide();
}
} else {
- me["spoiler5Rex"].setColor(0,1,0);
- me["spoiler5Rrt"].setColor(0,1,0);
+ me["spoiler5Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler5Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler5Rf"].hide();
}
# Flight Computers
if (getprop("/systems/fctl/elac1")) {
- me["elac1"].setColor(0,1,0);
- me["path4249"].setColor(0,1,0);
+ me["elac1"].setColor(0.0667,0.7294,0.3137);
+ me["path4249"].setColor(0.0667,0.7294,0.3137);
} else if ((getprop("/systems/fctl/elac1") == 0) or (getprop("/systems/failures/elac1") == 1)) {
- me["elac1"].setColor(1,0.6,0);
- me["path4249"].setColor(1,0.6,0);
+ me["elac1"].setColor(0.7333,0.3803,0);
+ me["path4249"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/fctl/elac2")) {
- me["elac2"].setColor(0,1,0);
- me["path4249-3"].setColor(0,1,0);
+ me["elac2"].setColor(0.0667,0.7294,0.3137);
+ me["path4249-3"].setColor(0.0667,0.7294,0.3137);
} else if ((getprop("/systems/fctl/elac2") == 0) or (getprop("/systems/failures/elac2") == 1)) {
- me["elac2"].setColor(1,0.6,0);
- me["path4249-3"].setColor(1,0.6,0);
+ me["elac2"].setColor(0.7333,0.3803,0);
+ me["path4249-3"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/fctl/sec1")) {
- me["sec1"].setColor(0,1,0);
- me["path4249-3-6-7"].setColor(0,1,0);
+ me["sec1"].setColor(0.0667,0.7294,0.3137);
+ me["path4249-3-6-7"].setColor(0.0667,0.7294,0.3137);
} else if ((getprop("/systems/fctl/sec1") == 0) or (getprop("/systems/failures/sec1") == 1)) {
- me["sec1"].setColor(1,0.6,0);
- me["path4249-3-6-7"].setColor(1,0.6,0);
+ me["sec1"].setColor(0.7333,0.3803,0);
+ me["path4249-3-6-7"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/fctl/sec2")) {
- me["sec2"].setColor(0,1,0);
- me["path4249-3-6-7-5"].setColor(0,1,0);
+ me["sec2"].setColor(0.0667,0.7294,0.3137);
+ me["path4249-3-6-7-5"].setColor(0.0667,0.7294,0.3137);
} else if ((getprop("/systems/fctl/sec2") == 0) or (getprop("/systems/failures/sec2") == 1)) {
- me["sec2"].setColor(1,0.6,0);
- me["path4249-3-6-7-5"].setColor(1,0.6,0);
+ me["sec2"].setColor(0.7333,0.3803,0);
+ me["path4249-3-6-7-5"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/fctl/sec3")) {
- me["sec3"].setColor(0,1,0);
- me["path4249-3-6"].setColor(0,1,0);
+ me["sec3"].setColor(0.0667,0.7294,0.3137);
+ me["path4249-3-6"].setColor(0.0667,0.7294,0.3137);
} else if ((getprop("/systems/fctl/sec3") == 0) or (getprop("/systems/failures/sec3") == 1)) {
- me["sec3"].setColor(1,0.6,0);
- me["path4249-3-6"].setColor(1,0.6,0);
+ me["sec3"].setColor(0.7333,0.3803,0);
+ me["path4249-3-6"].setColor(0.7333,0.3803,0);
}
# Hydraulic Indicators
if (getprop("/systems/hydraulic/blue-psi") > 1500) {
- me["ailLblue"].setColor(0,1,0);
- me["ailRblue"].setColor(0,1,0);
- me["elevLblue"].setColor(0,1,0);
- me["elevRblue"].setColor(0,1,0);
- me["rudderblue"].setColor(0,1,0);
- me["spdbrkblue"].setColor(0,1,0);
+ me["ailLblue"].setColor(0.0667,0.7294,0.3137);
+ me["ailRblue"].setColor(0.0667,0.7294,0.3137);
+ me["elevLblue"].setColor(0.0667,0.7294,0.3137);
+ me["elevRblue"].setColor(0.0667,0.7294,0.3137);
+ me["rudderblue"].setColor(0.0667,0.7294,0.3137);
+ me["spdbrkblue"].setColor(0.0667,0.7294,0.3137);
} else {
- me["ailLblue"].setColor(1,0.6,0);
- me["ailRblue"].setColor(1,0.6,0);
- me["elevLblue"].setColor(1,0.6,0);
- me["elevRblue"].setColor(1,0.6,0);
- me["rudderblue"].setColor(1,0.6,0);
- me["spdbrkblue"].setColor(1,0.6,0);
+ me["ailLblue"].setColor(0.7333,0.3803,0);
+ me["ailRblue"].setColor(0.7333,0.3803,0);
+ me["elevLblue"].setColor(0.7333,0.3803,0);
+ me["elevRblue"].setColor(0.7333,0.3803,0);
+ me["rudderblue"].setColor(0.7333,0.3803,0);
+ me["spdbrkblue"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/hydraulic/green-psi") > 1500) {
- me["ailLgreen"].setColor(0,1,0);
- me["ailRgreen"].setColor(0,1,0);
- me["elevLgreen"].setColor(0,1,0);
- me["ruddergreen"].setColor(0,1,0);
- me["PTgreen"].setColor(0,1,0);
- me["spdbrkgreen"].setColor(0,1,0);
+ me["ailLgreen"].setColor(0.0667,0.7294,0.3137);
+ me["ailRgreen"].setColor(0.0667,0.7294,0.3137);
+ me["elevLgreen"].setColor(0.0667,0.7294,0.3137);
+ me["ruddergreen"].setColor(0.0667,0.7294,0.3137);
+ me["PTgreen"].setColor(0.0667,0.7294,0.3137);
+ me["spdbrkgreen"].setColor(0.0667,0.7294,0.3137);
} else {
- me["ailLgreen"].setColor(1,0.6,0);
- me["ailRgreen"].setColor(1,0.6,0);
- me["elevLgreen"].setColor(1,0.6,0);
- me["ruddergreen"].setColor(1,0.6,0);
- me["PTgreen"].setColor(1,0.6,0);
- me["spdbrkgreen"].setColor(1,0.6,0);
+ me["ailLgreen"].setColor(0.7333,0.3803,0);
+ me["ailRgreen"].setColor(0.7333,0.3803,0);
+ me["elevLgreen"].setColor(0.7333,0.3803,0);
+ me["ruddergreen"].setColor(0.7333,0.3803,0);
+ me["PTgreen"].setColor(0.7333,0.3803,0);
+ me["spdbrkgreen"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/hydraulic/yellow-psi") > 1500) {
- me["elevRyellow"].setColor(0,1,0);
- me["rudderyellow"].setColor(0,1,0);
- me["PTyellow"].setColor(0,1,0);
- me["spdbrkyellow"].setColor(0,1,0);
+ me["elevRyellow"].setColor(0.0667,0.7294,0.3137);
+ me["rudderyellow"].setColor(0.0667,0.7294,0.3137);
+ me["PTyellow"].setColor(0.0667,0.7294,0.3137);
+ me["spdbrkyellow"].setColor(0.0667,0.7294,0.3137);
} else {
- me["elevRyellow"].setColor(1,0.6,0);
- me["rudderyellow"].setColor(1,0.6,0);
- me["PTyellow"].setColor(1,0.6,0);
- me["spdbrkyellow"].setColor(1,0.6,0);
+ me["elevRyellow"].setColor(0.7333,0.3803,0);
+ me["rudderyellow"].setColor(0.7333,0.3803,0);
+ me["PTyellow"].setColor(0.7333,0.3803,0);
+ me["spdbrkyellow"].setColor(0.7333,0.3803,0);
}
me.updateBottomStatus();
@@ -850,158 +850,158 @@ var canvas_lowerECAM_wheel = {
# Spoiler Fail
if (getprop("/controls/flight/spoiler-l1-failed") or green_psi < 1500) {
- me["spoiler1Lex"].setColor(1,0.6,0);
- me["spoiler1Lrt"].setColor(1,0.6,0);
+ me["spoiler1Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler1Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l1") < 0.033) {
me["spoiler1Lf"].show();
} else {
me["spoiler1Lf"].hide();
}
} else {
- me["spoiler1Lex"].setColor(0,1,0);
- me["spoiler1Lrt"].setColor(0,1,0);
+ me["spoiler1Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler1Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler1Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l2-failed") or yellow_psi < 1500) {
- me["spoiler2Lex"].setColor(1,0.6,0);
- me["spoiler2Lrt"].setColor(1,0.6,0);
+ me["spoiler2Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler2Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l2") < 0.033) {
me["spoiler2Lf"].show();
} else {
me["spoiler2Lf"].hide();
}
} else {
- me["spoiler2Lex"].setColor(0,1,0);
- me["spoiler2Lrt"].setColor(0,1,0);
+ me["spoiler2Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler2Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler2Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l3-failed") or blue_psi < 1500) {
- me["spoiler3Lex"].setColor(1,0.6,0);
- me["spoiler3Lrt"].setColor(1,0.6,0);
+ me["spoiler3Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler3Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l3") < 0.033) {
me["spoiler3Lf"].show();
} else {
me["spoiler3Lf"].hide();
}
} else {
- me["spoiler3Lex"].setColor(0,1,0);
- me["spoiler3Lrt"].setColor(0,1,0);
+ me["spoiler3Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler3Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler3Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l4-failed") or yellow_psi < 1500) {
- me["spoiler4Lex"].setColor(1,0.6,0);
- me["spoiler4Lrt"].setColor(1,0.6,0);
+ me["spoiler4Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler4Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l4") < 0.033) {
me["spoiler4Lf"].show();
} else {
me["spoiler4Lf"].hide();
}
} else {
- me["spoiler4Lex"].setColor(0,1,0);
- me["spoiler4Lrt"].setColor(0,1,0);
+ me["spoiler4Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler4Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler4Lf"].hide();
}
if (getprop("/controls/flight/spoiler-l5-failed") or green_psi < 1500) {
- me["spoiler5Lex"].setColor(1,0.6,0);
- me["spoiler5Lrt"].setColor(1,0.6,0);
+ me["spoiler5Lex"].setColor(0.7333,0.3803,0);
+ me["spoiler5Lrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-l5") < 0.033) {
me["spoiler5Lf"].show();
} else {
me["spoiler5Lf"].hide();
}
} else {
- me["spoiler5Lex"].setColor(0,1,0);
- me["spoiler5Lrt"].setColor(0,1,0);
+ me["spoiler5Lex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler5Lrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler5Lf"].hide();
}
if (getprop("/controls/flight/spoiler-r1-failed") or green_psi < 1500) {
- me["spoiler1Rex"].setColor(1,0.6,0);
- me["spoiler1Rrt"].setColor(1,0.6,0);
+ me["spoiler1Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler1Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r1") < 0.033) {
me["spoiler1Rf"].show();
} else {
me["spoiler1Rf"].hide();
}
} else {
- me["spoiler1Rex"].setColor(0,1,0);
- me["spoiler1Rrt"].setColor(0,1,0);
+ me["spoiler1Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler1Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler1Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r2-failed") or yellow_psi < 1500) {
- me["spoiler2Rex"].setColor(1,0.6,0);
- me["spoiler2Rrt"].setColor(1,0.6,0);
+ me["spoiler2Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler2Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r2") < 0.033) {
me["spoiler2Rf"].show();
} else {
me["spoiler2Rf"].hide();
}
} else {
- me["spoiler2Rex"].setColor(0,1,0);
- me["spoiler2Rrt"].setColor(0,1,0);
+ me["spoiler2Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler2Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler2Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r3-failed") or blue_psi < 1500) {
- me["spoiler3Rex"].setColor(1,0.6,0);
- me["spoiler3Rrt"].setColor(1,0.6,0);
+ me["spoiler3Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler3Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r3") < 0.033) {
me["spoiler3Rf"].show();
} else {
me["spoiler3Rf"].hide();
}
} else {
- me["spoiler3Rex"].setColor(0,1,0);
- me["spoiler3Rrt"].setColor(0,1,0);
+ me["spoiler3Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler3Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler3Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r4-failed") or yellow_psi < 1500) {
- me["spoiler4Rex"].setColor(1,0.6,0);
- me["spoiler4Rrt"].setColor(1,0.6,0);
+ me["spoiler4Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler4Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r4") < 0.033) {
me["spoiler4Rf"].show();
} else {
me["spoiler4Rf"].hide();
}
} else {
- me["spoiler4Rex"].setColor(0,1,0);
- me["spoiler4Rrt"].setColor(0,1,0);
+ me["spoiler4Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler4Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler4Rf"].hide();
}
if (getprop("/controls/flight/spoiler-r5-failed") or green_psi < 1500) {
- me["spoiler5Rex"].setColor(1,0.6,0);
- me["spoiler5Rrt"].setColor(1,0.6,0);
+ me["spoiler5Rex"].setColor(0.7333,0.3803,0);
+ me["spoiler5Rrt"].setColor(0.7333,0.3803,0);
if (getprop("/controls/flight/spoiler-r5") < 0.033) {
me["spoiler5Rf"].show();
} else {
me["spoiler5Rf"].hide();
}
} else {
- me["spoiler5Rex"].setColor(0,1,0);
- me["spoiler5Rrt"].setColor(0,1,0);
+ me["spoiler5Rex"].setColor(0.0667,0.7294,0.3137);
+ me["spoiler5Rrt"].setColor(0.0667,0.7294,0.3137);
me["spoiler5Rf"].hide();
}
# Hydraulic Boxes
if (getprop("/systems/hydraulic/green-psi") > 1500) {
- me["normbrkgreen"].setColor(0,1,0);
+ me["normbrkgreen"].setColor(0.0667,0.7294,0.3137);
} else {
- me["normbrkgreen"].setColor(1,0.6,0);
+ me["normbrkgreen"].setColor(0.7333,0.3803,0);
}
if (getprop("/systems/hydraulic/yellow-psi") > 1500) {
- me["altnbrkyellow"].setColor(0,1,0);
- me["NWSyellowrect"].setColor(0,1,0);
+ me["altnbrkyellow"].setColor(0.0667,0.7294,0.3137);
+ me["NWSyellowrect"].setColor(0.0667,0.7294,0.3137);
} else {
- me["altnbrkyellow"].setColor(1,0.6,0);
- me["NWSyellowrect"].setColor(1,0.6,0);
+ me["altnbrkyellow"].setColor(0.7333,0.3803,0);
+ me["NWSyellowrect"].setColor(0.7333,0.3803,0);
}
# Hide not yet implemented stuff
diff --git a/Models/Instruments/Lower-ECAM/res/apu.svg b/Models/Instruments/Lower-ECAM/res/apu.svg
index e5c91321..b8bd54f6 100644
--- a/Models/Instruments/Lower-ECAM/res/apu.svg
+++ b/Models/Instruments/Lower-ECAM/res/apu.svg
@@ -78,7 +78,7 @@
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
APU
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">APU
APU GEN
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">APU GEN
%
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#238995;fill-opacity:1">%
V
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#238995;fill-opacity:1">V
HZ
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#238995;fill-opacity:1">HZ
%
+ 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';fill:#238995;fill-opacity:1">%
N
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N
EGT
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">EGT
°C
+ 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';fill:#238995;fill-opacity:1">°C
BLEED
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">BLEED
PSI
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;fill:#238995;fill-opacity:1">PSI
1
0
+ 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';letter-spacing:0px;word-spacing:0px;fill:#cecdce">0
1
0
+ 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';letter-spacing:0px;word-spacing:0px;fill:#cecdce">0
7
+ 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';letter-spacing:0px;word-spacing:0px;fill:#cecdce">7
0
+ 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';letter-spacing:0px;word-spacing:0px;fill:#cecdce">0
3
+ 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';letter-spacing:0px;word-spacing:0px;fill:#cecdce">3
+ style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:4.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">0
115
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">115
400
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">400
AVAIL
FLAP OPEN
100
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">100
400
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">400
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
34
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">34
FUEL LO PR
+ style="font-size:48px;line-height:1.25;fill:#bb6100;fill-opacity:1">FUEL LO PR
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
diff --git a/Models/Instruments/Lower-ECAM/res/eng-eis1.svg b/Models/Instruments/Lower-ECAM/res/eng-eis1.svg
index af756f9d..2d14c265 100644
--- a/Models/Instruments/Lower-ECAM/res/eng-eis1.svg
+++ b/Models/Instruments/Lower-ECAM/res/eng-eis1.svg
@@ -78,7 +78,7 @@
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
ENGINE
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">ENGINE
F.USED
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">F.USED
LBS
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#238995;fill-opacity:1">LBS
°C
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">°C
VIB (N1)
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">VIB (N1)
PSI
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">PSI
QT
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">QT
OIL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">OIL
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
VIB (N2)
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
100
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">100
0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">0
0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">0
25
0
+ 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';text-align:center;text-anchor:middle;fill:#11ba50">0
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">25
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
ENGINE
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">ENGINE
F.USED
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">F.USED
LBS
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#238995;fill-opacity:1">LBS
°C
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">°C
VIB N1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">VIB N1
N2
+ style="font-size:36px;line-height:1.25;text-align:center;text-anchor:middle;fill:#cecdce">N2
PSI
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">PSI
QT
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#238995;fill-opacity:1">QT
OIL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">OIL
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#11ba50">0
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
F/CTL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">F/CTL
1
+ style="font-size:39.1399231px;line-height:1.25;fill:#11ba50;fill-opacity:1">1
2
1
+ style="font-size:39.1399231px;line-height:1.25;fill:#11ba50;fill-opacity:1">1
@@ -435,7 +435,7 @@
id="tspan4333"
x="594.52124"
y="350.0433"
- style="font-size:33.51122284px;line-height:1.25;fill:#ffffff;fill-opacity:1">SEC
+ style="font-size:33.51122284px;line-height:1.25;fill:#cecdce;fill-opacity:1">SEC
SPD BRK
+ style="font-size:34.58100891px;line-height:1.25;fill:#cecdce;fill-opacity:1">SPD BRK
Y
DN
Y
AIL
+ style="font-size:38.63742447px;line-height:1.25;fill:#cecdce;fill-opacity:1">AIL
AIL
+ style="font-size:38.63742447px;line-height:1.25;fill:#cecdce;fill-opacity:1">AIL
G
G
L
Y
ELEV
ELEV
Y
1
3
5
2
4
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
STATUS
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">STATUS
NORMAL
+ style="font-size:46px;line-height:1.25;fill:#11ba50;fill-opacity:1">NORMAL
diff --git a/Models/Instruments/Lower-ECAM/res/wheel.svg b/Models/Instruments/Lower-ECAM/res/wheel.svg
index 291d66fc..a50583ff 100644
--- a/Models/Instruments/Lower-ECAM/res/wheel.svg
+++ b/Models/Instruments/Lower-ECAM/res/wheel.svg
@@ -78,7 +78,7 @@
°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:#238995;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:#238995;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:#238995;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:#238995;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:#cecdce">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:#cecdce">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:#cecdce">SAT
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
25
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">25
120000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">120000
WHEEL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce">WHEEL
UP LOCK
UP LOCK
N/W STEERING
L/G CTL
ANTI SKID
ALTN BRK
AUTO BRK
ACCU PRESS
3
4
1
2
999
999
|||
REL
|||
|||
+ style="fill:#11ba50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#cecdce;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:none;fill-rule:evenodd;stroke:#11ba50;stroke-width:2.55999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:none;fill-rule:evenodd;stroke:#11ba50;stroke-width:2.55999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#cecdce;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#cecdce;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:1.16106236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1
3
5
2
4
2
Y
+
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 303501e1..ad7b5fc6 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -93,9 +93,9 @@ var canvas_upperECAM_base = {
}
if (getprop("/engines/engine[0]/reverser-pos-norm") >= 0.95) {
- me["REV1"].setColor(0,1,0);
+ me["REV1"].setColor(0.0667,0.7294,0.3137);
} else {
- me["REV1"].setColor(1,0.6,0);
+ me["REV1"].setColor(0.7333,0.3803,0);
}
if (getprop("/engines/engine[1]/reverser-pos-norm") >= 0.01 and getprop("/systems/fadec/eng2/n1") == 1 and getprop("/options/eng") == "CFM") {
@@ -110,9 +110,9 @@ var canvas_upperECAM_base = {
}
if (getprop("/engines/engine[1]/reverser-pos-norm") >= 0.95) {
- me["REV2"].setColor(0,1,0);
+ me["REV2"].setColor(0.0667,0.7294,0.3137);
} else {
- me["REV2"].setColor(1,0.6,0);
+ me["REV2"].setColor(0.7333,0.3803,0);
}
# Flap Indicator
@@ -138,97 +138,97 @@ var canvas_upperECAM_base = {
me["ECAML8"].setText(sprintf("%s", getprop("/ECAM/msg/line8")));
if (getprop("/ECAM/msg/line1c") == "w") {
- me["ECAML1"].setColor(1,1,1);
+ me["ECAML1"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line1c") == "b") {
- me["ECAML1"].setColor(0,0.5,0.7);
+ me["ECAML1"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line1c") == "g") {
- me["ECAML1"].setColor(0,1,0);
+ me["ECAML1"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line1c") == "a") {
- me["ECAML1"].setColor(1,0.6,0);
+ me["ECAML1"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line1c") == "r") {
me["ECAML1"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line2c") == "w") {
- me["ECAML2"].setColor(1,1,1);
+ me["ECAML2"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line2c") == "b") {
- me["ECAML2"].setColor(0,0.5,0.7);
+ me["ECAML2"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line2c") == "g") {
- me["ECAML2"].setColor(0,1,0);
+ me["ECAML2"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line2c") == "a") {
- me["ECAML2"].setColor(1,0.6,0);
+ me["ECAML2"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line2c") == "r") {
me["ECAML2"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line3c") == "w") {
- me["ECAML3"].setColor(1,1,1);
+ me["ECAML3"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line3c") == "b") {
- me["ECAML3"].setColor(0,0.5,0.7);
+ me["ECAML3"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line3c") == "g") {
- me["ECAML3"].setColor(0,1,0);
+ me["ECAML3"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line3c") == "a") {
- me["ECAML3"].setColor(1,0.6,0);
+ me["ECAML3"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line3c") == "r") {
me["ECAML3"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line4c") == "w") {
- me["ECAML4"].setColor(1,1,1);
+ me["ECAML4"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line4c") == "b") {
- me["ECAML4"].setColor(0,0.5,0.7);
+ me["ECAML4"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line4c") == "g") {
- me["ECAML4"].setColor(0,1,0);
+ me["ECAML4"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line4c") == "a") {
- me["ECAML4"].setColor(1,0.6,0);
+ me["ECAML4"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line4c") == "r") {
me["ECAML4"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line5c") == "w") {
- me["ECAML5"].setColor(1,1,1);
+ me["ECAML5"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line5c") == "b") {
- me["ECAML5"].setColor(0,0.5,0.7);
+ me["ECAML5"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line5c") == "g") {
- me["ECAML5"].setColor(0,1,0);
+ me["ECAML5"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line5c") == "a") {
- me["ECAML5"].setColor(1,0.6,0);
+ me["ECAML5"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line5c") == "r") {
me["ECAML5"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line6c") == "w") {
- me["ECAML6"].setColor(1,1,1);
+ me["ECAML6"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line6c") == "b") {
- me["ECAML6"].setColor(0,0.5,0.7);
+ me["ECAML6"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line6c") == "g") {
- me["ECAML6"].setColor(0,1,0);
+ me["ECAML6"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line6c") == "a") {
- me["ECAML6"].setColor(1,0.6,0);
+ me["ECAML6"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line6c") == "r") {
me["ECAML6"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line7c") == "w") {
- me["ECAML7"].setColor(1,1,1);
+ me["ECAML7"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line7c") == "b") {
- me["ECAML7"].setColor(0,0.5,0.7);
+ me["ECAML7"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line7c") == "g") {
- me["ECAML7"].setColor(0,1,0);
+ me["ECAML7"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line7c") == "a") {
- me["ECAML7"].setColor(1,0.6,0);
+ me["ECAML7"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line7c") == "r") {
me["ECAML7"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line8c") == "w") {
- me["ECAML8"].setColor(1,1,1);
+ me["ECAML8"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line8c") == "b") {
- me["ECAML8"].setColor(0,0.5,0.7);
+ me["ECAML8"].setColor(0.1372,0.5372,0.5843);
} else if (getprop("/ECAM/msg/line8c") == "g") {
- me["ECAML8"].setColor(0,1,0);
+ me["ECAML8"].setColor(0.0667,0.7294,0.3137);
} else if (getprop("/ECAM/msg/line8c") == "a") {
- me["ECAML8"].setColor(1,0.6,0);
+ me["ECAML8"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line8c") == "r") {
me["ECAML8"].setColor(1,0,0);
}
@@ -285,7 +285,7 @@ var canvas_upperECAM_cfm_eis1 = {
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) {
- me["N11-scale"].setColor(1,1,1);
+ me["N11-scale"].setColor(0.8078,0.8039,0.8078);
me["N11-scale2"].setColor(1,0,0);
me["N11"].show();
me["N11-decimal"].show();
@@ -295,8 +295,8 @@ var canvas_upperECAM_cfm_eis1 = {
me["N11-scalenum"].show();
me["N11-XX"].hide();
} else {
- me["N11-scale"].setColor(1,0.6,0);
- me["N11-scale2"].setColor(1,0.6,0);
+ me["N11-scale"].setColor(0.7333,0.3803,0);
+ me["N11-scale2"].setColor(0.7333,0.3803,0);
me["N11"].hide();
me["N11-decimal"].hide();
me["N11-decpnt"].hide();
@@ -313,7 +313,7 @@ var canvas_upperECAM_cfm_eis1 = {
}
if (getprop("/systems/fadec/eng2/n1") == 1) {
- me["N12-scale"].setColor(1,1,1);
+ me["N12-scale"].setColor(0.8078,0.8039,0.8078);
me["N12-scale2"].setColor(1,0,0);
me["N12"].show();
me["N12-decimal"].show();
@@ -323,8 +323,8 @@ var canvas_upperECAM_cfm_eis1 = {
me["N12-scalenum"].show();
me["N12-XX"].hide();
} else {
- me["N12-scale"].setColor(1,0.6,0);
- me["N12-scale2"].setColor(1,0.6,0);
+ me["N12-scale"].setColor(0.7333,0.3803,0);
+ me["N12-scale2"].setColor(0.7333,0.3803,0);
me["N12"].hide();
me["N12-decimal"].hide();
me["N12-decpnt"].hide();
@@ -348,14 +348,14 @@ var canvas_upperECAM_cfm_eis1 = {
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) {
- me["EGT1-scale"].setColor(1,1,1);
+ me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT1-scale2"].show();
me["EGT1"].show();
me["EGT1-needle"].show();
me["EGT1-scalenum"].show();
me["EGT1-XX"].hide();
} else {
- me["EGT1-scale"].setColor(1,0.6,0);
+ me["EGT1-scale"].setColor(0.7333,0.3803,0);
me["EGT1-scale2"].hide();
me["EGT1"].hide();
me["EGT1-needle"].hide();
@@ -364,14 +364,14 @@ var canvas_upperECAM_cfm_eis1 = {
}
if (getprop("/systems/fadec/eng2/egt") == 1) {
- me["EGT2-scale"].setColor(1,1,1);
+ me["EGT2-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT2-scale2"].show();
me["EGT2"].show();
me["EGT2-needle"].show();
me["EGT2-scalenum"].show();
me["EGT2-XX"].hide();
} else {
- me["EGT2-scale"].setColor(1,0.6,0);
+ me["EGT2-scale"].setColor(0.7333,0.3803,0);
me["EGT2-scale2"].hide();
me["EGT2"].hide();
me["EGT2-needle"].hide();
@@ -486,7 +486,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) {
- me["N11-scale"].setColor(1,1,1);
+ me["N11-scale"].setColor(0.8078,0.8039,0.8078);
me["N11-scale2"].setColor(1,0,0);
me["N11"].show();
me["N11-decimal"].show();
@@ -499,8 +499,8 @@ var canvas_upperECAM_cfm_eis2 = {
me["N11-XX2"].hide();
me["N11-XX-box"].hide();
} else {
- me["N11-scale"].setColor(1,0.6,0);
- me["N11-scale2"].setColor(1,0.6,0);
+ me["N11-scale"].setColor(0.7333,0.3803,0);
+ me["N11-scale2"].setColor(0.7333,0.3803,0);
me["N11"].hide();
me["N11-decimal"].hide();
me["N11-decpnt"].hide();
@@ -520,7 +520,7 @@ var canvas_upperECAM_cfm_eis2 = {
}
if (getprop("/systems/fadec/eng2/n1") == 1) {
- me["N12-scale"].setColor(1,1,1);
+ me["N12-scale"].setColor(0.8078,0.8039,0.8078);
me["N12-scale2"].setColor(1,0,0);
me["N12"].show();
me["N12-decimal"].show();
@@ -533,8 +533,8 @@ var canvas_upperECAM_cfm_eis2 = {
me["N12-XX2"].hide();
me["N12-XX-box"].hide();
} else {
- me["N12-scale"].setColor(1,0.6,0);
- me["N12-scale2"].setColor(1,0.6,0);
+ me["N12-scale"].setColor(0.7333,0.3803,0);
+ me["N12-scale2"].setColor(0.7333,0.3803,0);
me["N12"].hide();
me["N12-decimal"].hide();
me["N12-decpnt"].hide();
@@ -561,7 +561,7 @@ var canvas_upperECAM_cfm_eis2 = {
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) {
- me["EGT1-scale"].setColor(1,1,1);
+ me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT1-scale2"].setColor(1,0,0);
me["EGT1"].show();
me["EGT1-needle"].show();
@@ -569,8 +569,8 @@ var canvas_upperECAM_cfm_eis2 = {
me["EGT1-box"].show();
me["EGT1-XX"].hide();
} else {
- me["EGT1-scale"].setColor(1,0.6,0);
- me["EGT1-scale2"].setColor(1,0.6,0);
+ me["EGT1-scale"].setColor(0.7333,0.3803,0);
+ me["EGT1-scale2"].setColor(0.7333,0.3803,0);
me["EGT1"].hide();
me["EGT1-needle"].hide();
me["EGT1-scaletick"].hide();
@@ -579,7 +579,7 @@ var canvas_upperECAM_cfm_eis2 = {
}
if (getprop("/systems/fadec/eng2/egt") == 1) {
- me["EGT2-scale"].setColor(1,1,1);
+ me["EGT2-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT2-scale2"].setColor(1,0,0);
me["EGT2"].show();
me["EGT2-needle"].show();
@@ -587,8 +587,8 @@ var canvas_upperECAM_cfm_eis2 = {
me["EGT2-box"].show();
me["EGT2-XX"].hide();
} else {
- me["EGT2-scale"].setColor(1,0.6,0);
- me["EGT2-scale2"].setColor(1,0.6,0);
+ me["EGT2-scale"].setColor(0.7333,0.3803,0);
+ me["EGT2-scale2"].setColor(0.7333,0.3803,0);
me["EGT2"].hide();
me["EGT2-needle"].hide();
me["EGT2-scaletick"].hide();
@@ -699,7 +699,7 @@ var canvas_upperECAM_iae_eis1 = {
me["EPR2-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/epr") == 1) {
- me["EPR1-scale"].setColor(1,1,1);
+ me["EPR1-scale"].setColor(0.8078,0.8039,0.8078);
me["EPR1"].show();
me["EPR1-needle"].show();
me["EPR1-ylim"].show();
@@ -708,7 +708,7 @@ var canvas_upperECAM_iae_eis1 = {
me["EPR1-XX"].hide();
me["EPR1-XX2"].hide();
} else {
- me["EPR1-scale"].setColor(1,0.6,0);
+ me["EPR1-scale"].setColor(0.7333,0.3803,0);
me["EPR1"].hide();
me["EPR1-needle"].hide();
me["EPR1-ylim"].hide();
@@ -725,7 +725,7 @@ var canvas_upperECAM_iae_eis1 = {
}
if (getprop("/systems/fadec/eng2/epr") == 1) {
- me["EPR2-scale"].setColor(1,1,1);
+ me["EPR2-scale"].setColor(0.8078,0.8039,0.8078);
me["EPR2"].show();
me["EPR2-needle"].show();
me["EPR2-ylim"].show();
@@ -734,7 +734,7 @@ var canvas_upperECAM_iae_eis1 = {
me["EPR2-XX"].hide();
me["EPR2-XX2"].hide();
} else {
- me["EPR2-scale"].setColor(1,0.6,0);
+ me["EPR2-scale"].setColor(0.7333,0.3803,0);
me["EPR2"].hide();
me["EPR2-needle"].hide();
me["EPR2-ylim"].hide();
@@ -758,14 +758,14 @@ var canvas_upperECAM_iae_eis1 = {
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) {
- me["EGT1-scale"].setColor(1,1,1);
+ me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT1-scale2"].show();
me["EGT1"].show();
me["EGT1-needle"].show();
me["EGT1-scalenum"].show();
me["EGT1-XX"].hide();
} else {
- me["EGT1-scale"].setColor(1,0.6,0);
+ me["EGT1-scale"].setColor(0.7333,0.3803,0);
me["EGT1-scale2"].hide();
me["EGT1"].hide();
me["EGT1-needle"].hide();
@@ -774,14 +774,14 @@ var canvas_upperECAM_iae_eis1 = {
}
if (getprop("/systems/fadec/eng2/egt") == 1) {
- me["EGT2-scale"].setColor(1,1,1);
+ me["EGT2-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT2-scale2"].show();
me["EGT2"].show();
me["EGT2-needle"].show();
me["EGT2-scalenum"].show();
me["EGT2-XX"].hide();
} else {
- me["EGT2-scale"].setColor(1,0.6,0);
+ me["EGT2-scale"].setColor(0.7333,0.3803,0);
me["EGT2-scale2"].hide();
me["EGT2"].hide();
me["EGT2-needle"].hide();
@@ -805,7 +805,7 @@ var canvas_upperECAM_iae_eis1 = {
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) {
- me["N11-scale"].setColor(1,1,1);
+ me["N11-scale"].setColor(0.8078,0.8039,0.8078);
me["N11-scale2"].setColor(1,0,0);
me["N11"].show();
me["N11-decimal"].show();
@@ -814,8 +814,8 @@ var canvas_upperECAM_iae_eis1 = {
me["N11-scalenum"].show();
me["N11-XX"].hide();
} else {
- me["N11-scale"].setColor(1,0.6,0);
- me["N11-scale2"].setColor(1,0.6,0);
+ me["N11-scale"].setColor(0.7333,0.3803,0);
+ me["N11-scale2"].setColor(0.7333,0.3803,0);
me["N11"].hide();
me["N11-decimal"].hide();
me["N11-decpnt"].hide();
@@ -825,7 +825,7 @@ var canvas_upperECAM_iae_eis1 = {
}
if (getprop("/systems/fadec/eng2/n1") == 1) {
- me["N12-scale"].setColor(1,1,1);
+ me["N12-scale"].setColor(0.8078,0.8039,0.8078);
me["N12-scale2"].setColor(1,0,0);
me["N12"].show();
me["N12-decimal"].show();
@@ -834,8 +834,8 @@ var canvas_upperECAM_iae_eis1 = {
me["N12-scalenum"].show();
me["N12-XX"].hide();
} else {
- me["N12-scale"].setColor(1,0.6,0);
- me["N12-scale2"].setColor(1,0.6,0);
+ me["N12-scale"].setColor(0.7333,0.3803,0);
+ me["N12-scale2"].setColor(0.7333,0.3803,0);
me["N12"].hide();
me["N12-decimal"].hide();
me["N12-decpnt"].hide();
@@ -956,7 +956,7 @@ var canvas_upperECAM_iae_eis2 = {
me["EPR2-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/epr") == 1) {
- me["EPR1-scale"].setColor(1,1,1);
+ me["EPR1-scale"].setColor(0.8078,0.8039,0.8078);
me["EPR1"].show();
me["EPR1-needle"].show();
me["EPR1-ylim"].show();
@@ -965,7 +965,7 @@ var canvas_upperECAM_iae_eis2 = {
me["EPR1-XX"].hide();
me["EPR1-XX2"].hide();
} else {
- me["EPR1-scale"].setColor(1,0.6,0);
+ me["EPR1-scale"].setColor(0.7333,0.3803,0);
me["EPR1"].hide();
me["EPR1-needle"].hide();
me["EPR1-ylim"].hide();
@@ -982,7 +982,7 @@ var canvas_upperECAM_iae_eis2 = {
}
if (getprop("/systems/fadec/eng2/epr") == 1) {
- me["EPR2-scale"].setColor(1,1,1);
+ me["EPR2-scale"].setColor(0.8078,0.8039,0.8078);
me["EPR2"].show();
me["EPR2-needle"].show();
me["EPR2-ylim"].show();
@@ -991,7 +991,7 @@ var canvas_upperECAM_iae_eis2 = {
me["EPR2-XX"].hide();
me["EPR2-XX2"].hide();
} else {
- me["EPR2-scale"].setColor(1,0.6,0);
+ me["EPR2-scale"].setColor(0.7333,0.3803,0);
me["EPR2"].hide();
me["EPR2-needle"].hide();
me["EPR2-ylim"].hide();
@@ -1015,7 +1015,7 @@ var canvas_upperECAM_iae_eis2 = {
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) {
- me["EGT1-scale"].setColor(1,1,1);
+ me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT1-scale2"].setColor(1,0,0);
me["EGT1"].show();
me["EGT1-needle"].show();
@@ -1023,8 +1023,8 @@ var canvas_upperECAM_iae_eis2 = {
me["EGT1-box"].show();
me["EGT1-XX"].hide();
} else {
- me["EGT1-scale"].setColor(1,0.6,0);
- me["EGT1-scale2"].setColor(1,0.6,0);
+ me["EGT1-scale"].setColor(0.7333,0.3803,0);
+ me["EGT1-scale2"].setColor(0.7333,0.3803,0);
me["EGT1"].hide();
me["EGT1-needle"].hide();
me["EGT1-scaletick"].hide();
@@ -1033,7 +1033,7 @@ var canvas_upperECAM_iae_eis2 = {
}
if (getprop("/systems/fadec/eng2/egt") == 1) {
- me["EGT2-scale"].setColor(1,1,1);
+ me["EGT2-scale"].setColor(0.8078,0.8039,0.8078);
me["EGT2-scale2"].setColor(1,0,0);
me["EGT2"].show();
me["EGT2-needle"].show();
@@ -1041,8 +1041,8 @@ var canvas_upperECAM_iae_eis2 = {
me["EGT2-box"].show();
me["EGT2-XX"].hide();
} else {
- me["EGT2-scale"].setColor(1,0.6,0);
- me["EGT2-scale2"].setColor(1,0.6,0);
+ me["EGT2-scale"].setColor(0.7333,0.3803,0);
+ me["EGT2-scale2"].setColor(0.7333,0.3803,0);
me["EGT2"].hide();
me["EGT2-needle"].hide();
me["EGT2-scaletick"].hide();
@@ -1066,7 +1066,7 @@ var canvas_upperECAM_iae_eis2 = {
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) {
- me["N11-scale"].setColor(1,1,1);
+ me["N11-scale"].setColor(0.8078,0.8039,0.8078);
me["N11-scale2"].setColor(1,0,0);
me["N11"].show();
me["N11-decimal"].show();
@@ -1075,8 +1075,8 @@ var canvas_upperECAM_iae_eis2 = {
me["N11-scalenum"].show();
me["N11-XX"].hide();
} else {
- me["N11-scale"].setColor(1,0.6,0);
- me["N11-scale2"].setColor(1,0.6,0);
+ me["N11-scale"].setColor(0.7333,0.3803,0);
+ me["N11-scale2"].setColor(0.7333,0.3803,0);
me["N11"].hide();
me["N11-decimal"].hide();
me["N11-decpnt"].hide();
@@ -1086,7 +1086,7 @@ var canvas_upperECAM_iae_eis2 = {
}
if (getprop("/systems/fadec/eng2/n1") == 1) {
- me["N12-scale"].setColor(1,1,1);
+ me["N12-scale"].setColor(0.8078,0.8039,0.8078);
me["N12-scale2"].setColor(1,0,0);
me["N12"].show();
me["N12-decimal"].show();
@@ -1095,8 +1095,8 @@ var canvas_upperECAM_iae_eis2 = {
me["N12-scalenum"].show();
me["N12-XX"].hide();
} else {
- me["N12-scale"].setColor(1,0.6,0);
- me["N12-scale2"].setColor(1,0.6,0);
+ me["N12-scale"].setColor(0.7333,0.3803,0);
+ me["N12-scale2"].setColor(0.7333,0.3803,0);
me["N12"].hide();
me["N12-decimal"].hide();
me["N12-decpnt"].hide();
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
index 8049f3f3..23f38e03 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
@@ -55,7 +55,7 @@
id="grid5153" />
N1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N1
%
+ 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';fill:#238995;fill-opacity:1">%
FOB :
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">FOB :
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">5
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
00000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#11ba50">00000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
LINE 1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 1
LINE 3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 3
LINE 5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 5
LINE 7
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 7
LINE 8
10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">10
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">5
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
REV
+ style="font-size:38px;line-height:1.25;fill:#bb6100;fill-opacity:1;">REV
00000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">10
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">5
000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#000000;stroke:#cecdce;stroke-width:2.88800001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
REV
FLAP
+ style="font-size:40px;line-height:1.25;fill:#cecdce">FLAP
@@ -1148,50 +1148,50 @@
inkscape:connector-curvature="0"
id="path4638"
d="m 707.1421,468.99188 c 0,3.43661 -2.78593,6.22254 -6.22254,6.22254 -3.43661,0 -6.22254,-2.78593 -6.22254,-6.22254 0,-3.43661 2.78593,-6.22254 6.22254,-6.22254 3.43661,0 6.22254,2.78593 6.22254,6.22254 z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
F
+ style="font-size:32px;line-height:1.25;fill:#cecdce">F
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
index 14797673..498482c1 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
@@ -82,7 +82,7 @@
x="507.66565"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve">N1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N1
%
+ 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';fill:#238995;fill-opacity:1">%
FOB :
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">FOB :
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">5
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
00000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#11ba50">00000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
LINE 1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 1
LINE 3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 3
LINE 5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 5
LINE 7
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 7
LINE 8
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
S
+ style="font-size:32px;line-height:1.25;fill:#cecdce">S
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
REV
+ style="font-size:38px;line-height:1.25;fill:#bb6100;fill-opacity:1;">REV
00000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
XX
10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">10
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
+ style="fill:#000000;stroke:#238995;stroke-width:2.88800001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
N1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N1
%
+ 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';fill:#238995;fill-opacity:1">%
FOB :
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">FOB :
1.4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.4
1.6
00000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#11ba50">00000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
LINE 1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 1
LINE 3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 3
LINE 5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 5
LINE 7
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 7
LINE 8
8
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">8
4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">4
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
00000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
FLAP
+ style="font-size:40px;line-height:1.25;fill:#cecdce">FLAP
@@ -735,50 +735,50 @@
inkscape:connector-curvature="0"
id="path4638"
d="m 707.1421,468.99188 c 0,3.43661 -2.78593,6.22254 -6.22254,6.22254 -3.43661,0 -6.22254,-2.78593 -6.22254,-6.22254 0,-3.43661 2.78593,-6.22254 6.22254,-6.22254 3.43661,0 6.22254,2.78593 6.22254,6.22254 z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
F
+ style="font-size:32px;line-height:1.25;fill:#cecdce">F
1.000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1">1.000
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
1.000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#11ba50">1.000
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
REV
+ style="font-size:38px;line-height:1.25;fill:#bb6100;fill-opacity:1;">REV
4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">4
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#000000;stroke:#cecdce;stroke-width:2.88800001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1
+ 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';fill:#cecdce">1
1.2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.2
1.6
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.6
000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#000000;stroke:#cecdce;stroke-width:2.88800001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1.000
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
REV
10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">10
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
EPR
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">EPR
diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
index ead6f108..e011158e 100644
--- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
@@ -86,14 +86,14 @@
id="tspan4281"
x="506.79999"
y="131.31715"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">EPR
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">EPR
N1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N1
%
+ 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';fill:#238995;fill-opacity:1">%
N2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">N2
%
+ 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';fill:#238995;fill-opacity:1">%
FF
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">FF
LBS/H
+ 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';fill:#238995;fill-opacity:1">LBS/H
FOB :
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">FOB :
1.4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.4
1.000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#11ba50">1.000
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">4
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
00000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
LINE 1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 1
LINE 3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 3
LINE 5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 5
LINE 7
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 7
LINE 8
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
1.000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1">1.000
XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">00
0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
1
+ 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';fill:#cecdce">1
1.2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.2
1.6
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">1.6
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">10
000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#11ba50">000
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#11ba50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
0
+ 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';text-align:end;text-anchor:end;fill:#11ba50">0
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
XX
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#bb6100;fill-opacity:1">XX
+ style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
REV
+ style="font-size:38px;line-height:1.25;fill:#bb6100;fill-opacity:1;">REV
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
S
+ style="font-size:32px;line-height:1.25;fill:#cecdce">S