From f86c4901c667f057b191b6dffac4d4d0e2408388 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Sun, 27 Sep 2020 18:08:34 +0100 Subject: [PATCH] UPPER ECAM: Efficientize. Remove old code that isn't needed, and make the ECAM color switching faster --- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 632 ++++++------------ .../Instruments/Upper-ECAM/res/cfm-eis2.svg | 485 +------------- .../Instruments/Upper-ECAM/res/iae-eis2.svg | 483 +------------ Nasal/ECAM/ECAM-main.nas | 4 - Nasal/Libraries/property-tree-setup.nas | 4 + 5 files changed, 204 insertions(+), 1404 deletions(-) diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 0a94ee83..a633a18f 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -6,18 +6,11 @@ var upperECAM_cfm_eis2 = nil; var upperECAM_iae_eis2 = nil; var upperECAM_test = nil; var upperECAM_display = nil; -var elapsedtime = 0; -var leftmsg = "XX"; -var rightmsg = "XX"; # Conversion factor pounds to kilogram LBS2KGS = 0.4535924; -var flapsPos = 0; - # Create Nodes: -var fuel_1 = props.globals.initNode("/engines/engine[0]/fuel-flow_actual", 0); -var fuel_2 = props.globals.initNode("/engines/engine[1]/fuel-flow_actual", 0); var EPR_1 = props.globals.initNode("/ECAM/Upper/EPR[0]", 0, "DOUBLE"); var EPR_2 = props.globals.initNode("/ECAM/Upper/EPR[1]", 0, "DOUBLE"); var EPR_thr_1 = props.globals.initNode("/ECAM/Upper/EPRthr[0]", 0); @@ -38,29 +31,10 @@ var slatLockFlash = props.globals.initNode("/instrumentation/du/slat-lock-flash" # Fetch nodes: var acconfig_weight_kgs = props.globals.getNode("/systems/acconfig/options/weight-kgs", 1); -var et = props.globals.getNode("/sim/time/elapsed-sec", 1); var acconfig = props.globals.getNode("/systems/acconfig/autoconfig-running", 1); var eng_option = props.globals.getNode("/options/eng", 1); var du3_lgt = props.globals.getNode("/controls/lighting/DU/du3", 1); -var rev_1 = props.globals.getNode("/engines/engine[0]/reverser-pos-norm", 1); -var rev_2 = props.globals.getNode("/engines/engine[1]/reverser-pos-norm", 1); -var fuel = props.globals.getNode("/consumables/fuel/total-fuel-lbs", 1); -var modeautobrake = props.globals.getNode("/controls/autobrake/mode", 1); -var speedbrakearm = props.globals.getNode("/controls/flight/speedbrake-arm", 1); -var ECAMtoconfig = props.globals.getNode("/ECAM/to-config", 1); -var gear = props.globals.getNode("/gear/gear[1]/position-norm", 1); -var smoke = props.globals.getNode("/controls/lighting/no-smoking-sign", 1); -var seatbelt = props.globals.getNode("/controls/lighting/seatbelt-sign", 1); var flaps3_ovr = props.globals.getNode("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override", 1); -var wow0 = props.globals.getNode("/gear/gear[0]/wow"); -var eng1_n1 = props.globals.getNode("/engines/engine[0]/n1-actual", 1); -var eng2_n1 = props.globals.getNode("/engines/engine[1]/n1-actual", 1); -var eng1_n2 = props.globals.getNode("/engines/engine[0]/n2-actual", 1); -var eng2_n2 = props.globals.getNode("/engines/engine[1]/n2-actual", 1); -var eng1_epr = props.globals.getNode("/engines/engine[0]/epr-actual", 1); -var eng2_epr = props.globals.getNode("/engines/engine[1]/epr-actual", 1); -var eng1_egt = props.globals.getNode("/engines/engine[0]/egt-actual", 1); -var eng2_egt = props.globals.getNode("/engines/engine[1]/egt-actual", 1); var fadecpower_1 = props.globals.getNode("/systems/fadec/powered1", 1); var fadecpower_2 = props.globals.getNode("/systems/fadec/powered2", 1); var fadecpowerup = props.globals.getNode("/systems/fadec/powerup", 1); @@ -83,11 +57,57 @@ var ECAM_line5c = props.globals.getNode("/ECAM/msg/linec5", 1); var ECAM_line6c = props.globals.getNode("/ECAM/msg/linec6", 1); var ECAM_line7c = props.globals.getNode("/ECAM/msg/linec7", 1); var ECAM_line8c = props.globals.getNode("/ECAM/msg/linec8", 1); -var ECAMleft = props.globals.getNode("/ECAM/left-msg", 1); -var ECAMright = props.globals.getNode("/ECAM/right-msg", 1); -var slatsLocked = props.globals.getNode("/fdm/jsbsim/fcs/slat-locked", 1); +var ECAM_line1r = props.globals.getNode("/ECAM/rightmsg/line1", 1); +var ECAM_line2r = props.globals.getNode("/ECAM/rightmsg/line2", 1); +var ECAM_line3r = props.globals.getNode("/ECAM/rightmsg/line3", 1); +var ECAM_line4r = props.globals.getNode("/ECAM/rightmsg/line4", 1); +var ECAM_line5r = props.globals.getNode("/ECAM/rightmsg/line5", 1); +var ECAM_line6r = props.globals.getNode("/ECAM/rightmsg/line6", 1); +var ECAM_line7r = props.globals.getNode("/ECAM/rightmsg/line7", 1); +var ECAM_line8r = props.globals.getNode("/ECAM/rightmsg/line8", 1); +var ECAM_line1rc = props.globals.getNode("/ECAM/rightmsg/linec1", 1); +var ECAM_line2rc = props.globals.getNode("/ECAM/rightmsg/linec2", 1); +var ECAM_line3rc = props.globals.getNode("/ECAM/rightmsg/linec3", 1); +var ECAM_line4rc = props.globals.getNode("/ECAM/rightmsg/linec4", 1); +var ECAM_line5rc = props.globals.getNode("/ECAM/rightmsg/linec5", 1); +var ECAM_line6rc = props.globals.getNode("/ECAM/rightmsg/linec6", 1); +var ECAM_line7rc = props.globals.getNode("/ECAM/rightmsg/linec7", 1); +var ECAM_line8rc = props.globals.getNode("/ECAM/rightmsg/linec8", 1); var rate = props.globals.getNode("/systems/acconfig/options/uecam-rate", 1); +# Temporary variables +var cur_eng_option = 0; +var elapsedtime = 0; +var EGT_1_cur = 0; +var EGT_2_cur = 0; +var eprLimit = 0; +var EPR_1_cur = 0; +var EPR_2_cur = 0; +var EPR_1_act = 0; +var EPR_2_act = 0; +var EPR_lim_cur = 0; +var EPR_thr_1_act = 0; +var EPR_thr_2_act = 0; +var flapsPos = 0; +var fuel1 = 0; +var fuel2 = 0; +var fadecPower1 = 0; +var fadecPower2 = 0; +var fadecPowerStart = 0; +var n1Limit = 0; +var N1_1_cur = 0; +var N1_2_cur = 0; +var N1_1_act = 0; +var N1_2_act = 0; +var N1_lim_cur = 0; +var n2cur_1 = 0; +var n2cur_2 = 0; +var rev_1_act = 0; +var rev_2_act = 0; +var rev_1_cur = 0; +var rev_2_cur = 0; +var thrLimit = 0; + var canvas_upperECAM_base = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { @@ -128,16 +148,16 @@ var canvas_upperECAM_base = { return []; }, updateDu3: func() { - var elapsedtime = et.getValue(); + elapsedtime = pts.Sim.Time.elapsedSec.getValue(); if (systems.ELEC.Bus.acEss.getValue() >= 110) { if (du3_offtime.getValue() + 3 < elapsedtime) { - if (wow0.getValue() == 1) { + if (pts.Gear.wow[0].getValue()) { if (acconfig.getValue() != 1 and du3_test.getValue() != 1) { du3_test.setValue(1); du3_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); du3_test_time.setValue(elapsedtime); - } else if (acconfig.getValue() == 1 and du3_test.getValue() != 1) { + } else if (acconfig.getValue() and du3_test.getValue() != 1) { du3_test.setValue(1); du3_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); du3_test_time.setValue(elapsedtime - 30); @@ -154,9 +174,9 @@ var canvas_upperECAM_base = { } }, update: func() { - var elapsedtime = et.getValue(); - + elapsedtime = pts.Sim.Time.elapsedSec.getValue(); cur_eng_option = eng_option.getValue(); + if (systems.ELEC.Bus.acEss.getValue() >= 110 and du3_lgt.getValue() > 0.01) { if (du3_test_time.getValue() + du3_test_amount.getValue() >= elapsedtime) { upperECAM_cfm_eis2.page.hide(); @@ -181,10 +201,27 @@ var canvas_upperECAM_base = { upperECAM_iae_eis2.page.hide(); } }, + getColorString: func(color) { + if (color == "w") { + return [0.8078,0.8039,0.8078]; + } else if (color == "m") { + return [0.6901,0.3333,0.7450]; + } else if (color == "c") { + return [0.0901,0.6039,0.7176]; + } else if (color == "g") { + return [0.0509,0.7529,0.2941]; + } else if (color == "a") { + return [0.7333,0.3803,0]; + } else if (color == "r") { + return [1,0,0]; + } else { + return [1,1,1]; + } + }, updateBase: func() { # Reversers - rev_1_cur = rev_1.getValue(); - rev_2_cur = rev_2.getValue(); + rev_1_cur = pts.Engines.Engine.reverser[0].getValue(); + rev_2_cur = pts.Engines.Engine.reverser[1].getValue(); cur_eng_option = eng_option.getValue(); if (rev_1_cur >= 0.01 and fadec.FADEC.Eng1.n1 == 1 and cur_eng_option == "CFM") { me["REV1"].show(); @@ -242,13 +279,13 @@ var canvas_upperECAM_base = { me["FlapDots"].hide(); } - if (slatsLocked.getValue() == 1) { + if (pts.Fdm.JSBsim.Fcs.slatLocked.getValue()) { if (slatLockGoing == 0) { slatLockGoing = 1; } if (slatLockGoing == 1) { slatLockTimer.start(); - if (slatLockFlash.getValue() == 1) { + if (slatLockFlash.getValue()) { me["SlatAlphaLock"].show(); } else { me["SlatAlphaLock"].hide(); @@ -261,362 +298,38 @@ var canvas_upperECAM_base = { } # FOB - if (acconfig_weight_kgs.getValue() == 1) + if (acconfig_weight_kgs.getValue()) { - me["FOB-LBS"].setText(sprintf("%s", math.round(fuel.getValue() * LBS2KGS, 10))); + me["FOB-LBS"].setText(sprintf("%s", math.round(pts.Consumables.Fuel.totalFuelLbs.getValue() * LBS2KGS, 10))); me["FOB-weight-unit"].setText("KG"); } else { - me["FOB-LBS"].setText(sprintf("%s", math.round(fuel.getValue(), 10))); + me["FOB-LBS"].setText(sprintf("%s", math.round(pts.Consumables.Fuel.totalFuelLbs.getValue(), 10))); me["FOB-weight-unit"].setText("LBS"); } - # Left ECAM Messages - line1c = ECAM_line1c.getValue(); - line2c = ECAM_line2c.getValue(); - line3c = ECAM_line3c.getValue(); - line4c = ECAM_line4c.getValue(); - line5c = ECAM_line5c.getValue(); - line6c = ECAM_line6c.getValue(); - line7c = ECAM_line7c.getValue(); - line8c = ECAM_line8c.getValue(); - leftmsg = ECAMleft.getValue(); - rightmsg = ECAMright.getValue(); + # ECAM Messages - if (leftmsg == "MSG") { - me["ECAML1"].setText(sprintf("%s", ECAM_line1.getValue())); - me["ECAML2"].setText(sprintf("%s", ECAM_line2.getValue())); - me["ECAML3"].setText(sprintf("%s", ECAM_line3.getValue())); - me["ECAML4"].setText(sprintf("%s", ECAM_line4.getValue())); - me["ECAML5"].setText(sprintf("%s", ECAM_line5.getValue())); - me["ECAML6"].setText(sprintf("%s", ECAM_line6.getValue())); - me["ECAML7"].setText(sprintf("%s", ECAM_line7.getValue())); - me["ECAML8"].setText(sprintf("%s", ECAM_line8.getValue())); + me["ECAML1"].setText(sprintf("%s", ECAM_line1.getValue())); + me["ECAML2"].setText(sprintf("%s", ECAM_line2.getValue())); + me["ECAML3"].setText(sprintf("%s", ECAM_line3.getValue())); + me["ECAML4"].setText(sprintf("%s", ECAM_line4.getValue())); + me["ECAML5"].setText(sprintf("%s", ECAM_line5.getValue())); + me["ECAML6"].setText(sprintf("%s", ECAM_line6.getValue())); + me["ECAML7"].setText(sprintf("%s", ECAM_line7.getValue())); + me["ECAML8"].setText(sprintf("%s", ECAM_line8.getValue())); - if (line1c == "w") { - me["ECAML1"].setColor(0.8078,0.8039,0.8078); - } else if (line1c == "c") { - me["ECAML1"].setColor(0.0901,0.6039,0.7176); - } else if (line1c == "g") { - me["ECAML1"].setColor(0.0509,0.7529,0.2941); - } else if (line1c == "a") { - me["ECAML1"].setColor(0.7333,0.3803,0); - } else if (line1c == "r") { - me["ECAML1"].setColor(1,0,0); - } - - if (line2c == "w") { - me["ECAML2"].setColor(0.8078,0.8039,0.8078); - } else if (line2c == "c") { - me["ECAML2"].setColor(0.0901,0.6039,0.7176); - } else if (line2c == "g") { - me["ECAML2"].setColor(0.0509,0.7529,0.2941); - } else if (line2c == "a") { - me["ECAML2"].setColor(0.7333,0.3803,0); - } else if (line2c == "r") { - me["ECAML2"].setColor(1,0,0); - } - - if (line3c == "w") { - me["ECAML3"].setColor(0.8078,0.8039,0.8078); - } else if (line3c == "c") { - me["ECAML3"].setColor(0.0901,0.6039,0.7176); - } else if (line3c == "g") { - me["ECAML3"].setColor(0.0509,0.7529,0.2941); - } else if (line3c == "a") { - me["ECAML3"].setColor(0.7333,0.3803,0); - } else if (line3c == "r") { - me["ECAML3"].setColor(1,0,0); - } - - if (line4c == "w") { - me["ECAML4"].setColor(0.8078,0.8039,0.8078); - } else if (line4c == "c") { - me["ECAML4"].setColor(0.0901,0.6039,0.7176); - } else if (line4c == "g") { - me["ECAML4"].setColor(0.0509,0.7529,0.2941); - } else if (line4c == "a") { - me["ECAML4"].setColor(0.7333,0.3803,0); - } else if (line4c == "r") { - me["ECAML4"].setColor(1,0,0); - } - - if (line5c == "w") { - me["ECAML5"].setColor(0.8078,0.8039,0.8078); - } else if (line5c == "c") { - me["ECAML5"].setColor(0.0901,0.6039,0.7176); - } else if (line5c == "g") { - me["ECAML5"].setColor(0.0509,0.7529,0.2941); - } else if (line5c == "a") { - me["ECAML5"].setColor(0.7333,0.3803,0); - } else if (line5c == "r") { - me["ECAML5"].setColor(1,0,0); - } - - if (line6c == "w") { - me["ECAML6"].setColor(0.8078,0.8039,0.8078); - } else if (line6c == "c") { - me["ECAML6"].setColor(0.0901,0.6039,0.7176); - } else if (line6c == "g") { - me["ECAML6"].setColor(0.0509,0.7529,0.2941); - } else if (line6c == "a") { - me["ECAML6"].setColor(0.7333,0.3803,0); - } else if (line6c == "r") { - me["ECAML6"].setColor(1,0,0); - } - - if (line7c == "w") { - me["ECAML7"].setColor(0.8078,0.8039,0.8078); - } else if (line7c == "c") { - me["ECAML7"].setColor(0.0901,0.6039,0.7176); - } else if (line7c == "g") { - me["ECAML7"].setColor(0.0509,0.7529,0.2941); - } else if (line7c == "a") { - me["ECAML7"].setColor(0.7333,0.3803,0); - } else if (line7c == "r") { - me["ECAML7"].setColor(1,0,0); - } - - if (line8c == "w") { - me["ECAML8"].setColor(0.8078,0.8039,0.8078); - } else if (line8c == "c") { - me["ECAML8"].setColor(0.0901,0.6039,0.7176); - } else if (line8c == "g") { - me["ECAML8"].setColor(0.0509,0.7529,0.2941); - } else if (line8c == "a") { - me["ECAML8"].setColor(0.7333,0.3803,0); - } else if (line8c == "r") { - me["ECAML8"].setColor(1,0,0); - } - - me["TO_Memo"].hide(); - me["LDG_Memo"].hide(); - me["ECAM_Left"].show(); - } else if (leftmsg == "TO-MEMO") { - modebrk = modeautobrake.getValue(); - if (modebrk == 3) { - me["TO_Autobrake"].setText("AUTO BRK MAX"); - me["TO_Autobrake_B"].hide(); - } else { - me["TO_Autobrake"].setText("AUTO BRK"); - me["TO_Autobrake_B"].show(); - } - - if (smoke.getValue() == 1 and seatbelt.getValue() == 1) { - me["TO_Signs"].setText("SIGNS ON"); - me["TO_Signs_B"].hide(); - } else { - me["TO_Signs"].setText("SIGNS"); - me["TO_Signs_B"].show(); - } - - if (speedbrakearm.getValue() == 1) { - me["TO_Spoilers"].setText("SPLRS ARM"); - me["TO_Spoilers_B"].hide(); - } else { - me["TO_Spoilers"].setText("SPLRS"); - me["TO_Spoilers_B"].show(); - } - - if (flapsPos > 0 and flapsPos < 5) { - me["TO_Flaps"].setText("FLAPS T.O"); - me["TO_Flaps_B"].hide(); - } else { - me["TO_Flaps"].setText("FLAPS"); - me["TO_Flaps_B"].show(); - } - - if (ECAMtoconfig.getValue() == 1) { - me["TO_Config"].setText("T.O CONFIG NORMAL"); - me["TO_Config_B"].hide(); - } else { - me["TO_Config"].setText("T.O CONFIG"); - me["TO_Config_B"].show(); - } - - me["ECAM_Left"].hide(); - me["LDG_Memo"].hide(); - me["TO_Memo"].show(); - } else if (leftmsg == "LDG-MEMO") { - if (gear.getValue() == 1) { - me["LDG_Gear"].setText("LDG GEAR DN"); - me["LDG_Gear_B"].hide(); - } else { - me["LDG_Gear"].setText("LDG GEAR"); - me["LDG_Gear_B"].show(); - } - - if (smoke.getValue() == 1 and seatbelt.getValue() == 1) { - me["LDG_Signs"].setText("SIGNS ON"); - me["LDG_Signs_B"].hide(); - } else { - me["LDG_Signs"].setText("SIGNS"); - me["LDG_Signs_B"].show(); - } - - if (speedbrakearm.getValue() == 1) { - me["LDG_Spoilers"].setText("SPLRS ARM"); - me["LDG_Spoilers_B"].hide(); - } else { - me["LDG_Spoilers"].setText("SPLRS"); - me["LDG_Spoilers_B"].show(); - } - - flaps3 = flaps3_ovr.getValue(); - if (flaps3 != 1 and flapsPos == 5) { - me["LDG_Flaps"].setText("FLAPS FULL"); - me["LDG_Flaps_B"].hide(); - me["LDG_Flaps_B3"].hide(); - } else if (flaps3 == 1 and flapsPos >= 4) { - me["LDG_Flaps"].setText("FLAPS 3"); - me["LDG_Flaps_B"].hide(); - me["LDG_Flaps_B3"].hide(); - } else { - me["LDG_Flaps"].setText("FLAPS"); - if (flaps3 == 1) { - me["LDG_Flaps_B"].hide(); - me["LDG_Flaps_B3"].show(); - } else { - me["LDG_Flaps_B3"].hide(); - me["LDG_Flaps_B"].show(); - } - } - - me["ECAM_Left"].hide(); - me["TO_Memo"].hide(); - me["LDG_Memo"].show(); - } else { - me["ECAM_Left"].hide(); - me["TO_Memo"].hide(); - me["LDG_Memo"].hide(); - } + me["ECAM_Left"].show(); - # Right ECAM Messages - if (rightmsg == "MSG") { - me["ECAMR1"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line1"))); - me["ECAMR2"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line2"))); - me["ECAMR3"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line3"))); - me["ECAMR4"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line4"))); - me["ECAMR5"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line5"))); - me["ECAMR6"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line6"))); - me["ECAMR7"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line7"))); - me["ECAMR8"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line8"))); + me["ECAMR1"].setText(sprintf("%s", ECAM_line1r.getValue())); + me["ECAMR2"].setText(sprintf("%s", ECAM_line2r.getValue())); + me["ECAMR3"].setText(sprintf("%s", ECAM_line3r.getValue())); + me["ECAMR4"].setText(sprintf("%s", ECAM_line4r.getValue())); + me["ECAMR5"].setText(sprintf("%s", ECAM_line5r.getValue())); + me["ECAMR6"].setText(sprintf("%s", ECAM_line6r.getValue())); + me["ECAMR7"].setText(sprintf("%s", ECAM_line7r.getValue())); + me["ECAMR8"].setText(sprintf("%s", ECAM_line8r.getValue())); - if (getprop("/ECAM/rightmsg/linec1") == "w") { - me["ECAMR1"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec1") == "c") { - me["ECAMR1"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec1") == "g") { - me["ECAMR1"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec1") == "a") { - me["ECAMR1"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec1") == "r") { - me["ECAMR1"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec1") == "m") { - me["ECAMR1"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec2") == "w") { - me["ECAMR2"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec2") == "c") { - me["ECAMR2"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec2") == "g") { - me["ECAMR2"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec2") == "a") { - me["ECAMR2"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec2") == "r") { - me["ECAMR2"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec2") == "m") { - me["ECAMR2"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec3") == "w") { - me["ECAMR3"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec3") == "c") { - me["ECAMR3"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec3") == "g") { - me["ECAMR3"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec3") == "a") { - me["ECAMR3"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec3") == "r") { - me["ECAMR3"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec3") == "m") { - me["ECAMR3"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec4") == "w") { - me["ECAMR4"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec4") == "c") { - me["ECAMR4"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec4") == "g") { - me["ECAMR4"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec4") == "a") { - me["ECAMR4"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec4") == "r") { - me["ECAMR4"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec4") == "m") { - me["ECAMR4"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec5") == "w") { - me["ECAMR5"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec5") == "c") { - me["ECAMR5"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec5") == "g") { - me["ECAMR5"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec5") == "a") { - me["ECAMR5"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec5") == "r") { - me["ECAMR5"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec5") == "m") { - me["ECAMR5"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec6") == "w") { - me["ECAMR6"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec6") == "c") { - me["ECAMR6"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec6") == "g") { - me["ECAMR6"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec6") == "a") { - me["ECAMR6"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec6") == "r") { - me["ECAMR6"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec6") == "m") { - me["ECAMR6"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec7") == "w") { - me["ECAMR7"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec7") == "c") { - me["ECAMR7"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec7") == "g") { - me["ECAMR7"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec7") == "a") { - me["ECAMR7"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec7") == "r") { - me["ECAMR7"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec7") == "m") { - me["ECAMR7"].setColor(0.6901,0.3333,0.7450); - } - - if (getprop("/ECAM/rightmsg/linec8") == "w") { - me["ECAMR8"].setColor(0.8078,0.8039,0.8078); - } else if (getprop("/ECAM/rightmsg/linec8") == "c") { - me["ECAMR8"].setColor(0.0901,0.6039,0.7176); - } else if (getprop("/ECAM/rightmsg/linec8") == "g") { - me["ECAMR8"].setColor(0.0509,0.7529,0.2941); - } else if (getprop("/ECAM/rightmsg/linec8") == "a") { - me["ECAMR8"].setColor(0.7333,0.3803,0); - } else if (getprop("/ECAM/rightmsg/linec8") == "r") { - me["ECAMR8"].setColor(1,0,0); - } else if (getprop("/ECAM/rightmsg/linec8") == "m") { - me["ECAMR8"].setColor(0.6901,0.3333,0.7450); - } - - me["ECAM_Right"].show(); - } else { - me["ECAM_Right"].hide(); - } + me["ECAM_Right"].show(); }, }; @@ -631,25 +344,24 @@ var canvas_upperECAM_cfm_eis2 = { return ["N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-box","N11-scale","N11-scale2","N11-scaletick","N11-scalenum","N11-XX","N11-XX2","N11-XX-box","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick", "EGT1-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal","N12-box","N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N12-XX2","N12-XX-box","EGT2-needle","EGT2", "EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","FlapTxt","FlapDots","N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1", - "REV1-box","REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","ECAMR1", "ECAMR2", "ECAMR3", "ECAMR4", "ECAMR5", "ECAMR6", "ECAMR7", "ECAMR8", "ECAM_Right", "TO_Memo","TO_Autobrake","TO_Signs","TO_Spoilers","TO_Flaps","TO_Config","TO_Autobrake_B","TO_Signs_B","TO_Spoilers_B","TO_Flaps_B", - "TO_Config_B","LDG_Memo","LDG_Gear","LDG_Signs","LDG_Spoilers","LDG_Flaps","LDG_Gear_B","LDG_Signs_B","LDG_Spoilers_B","LDG_Flaps_B","LDG_Flaps_B3", + "REV1-box","REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","ECAMR1", "ECAMR2", "ECAMR3", "ECAMR4", "ECAMR5", "ECAMR6", "ECAMR7", "ECAMR8", "ECAM_Right", "FOB-weight-unit","FFlow-weight-unit","SlatAlphaLock"]; }, update: func() { # N1 N1_1_cur = N1_1.getValue(); N1_2_cur = N1_2.getValue(); - N1_1_act = eng1_n1.getValue(); - N1_2_act = eng2_n1.getValue(); + N1_1_act = pts.Engines.Engine.n1Actual[0].getValue(); + N1_2_act = pts.Engines.Engine.n1Actual[1].getValue(); N1_lim_cur = N1_lim.getValue(); N1_thr_1_act = N1_thr_1.getValue(); N1_thr_2_act = N1_thr_2.getValue(); - rev_1_act = rev_1.getValue(); - rev_2_act = rev_2.getValue(); + rev_1_act = pts.Engines.Engine.reverser[0].getValue(); + rev_2_act = pts.Engines.Engine.reverser[1].getValue(); EGT_1_cur = EGT_1.getValue(); EGT_2_cur = EGT_2.getValue(); - n2cur_1 = eng1_n2.getValue(); - n2cur_2 = eng2_n2.getValue(); + n2cur_1 = pts.Engines.Engine.n2Actual[0].getValue(); + n2cur_2 = pts.Engines.Engine.n2Actual[1].getValue(); me["N11"].setText(sprintf("%s", math.floor(N1_1_act + 0.05))); me["N11-decimal"].setText(sprintf("%s", int(10 * math.mod(N1_1_act + 0.05, 1)))); @@ -738,8 +450,8 @@ var canvas_upperECAM_cfm_eis2 = { } # EGT - me["EGT1"].setText(sprintf("%s", math.round(eng1_egt.getValue()))); - me["EGT2"].setText(sprintf("%s", math.round(eng2_egt.getValue()))); + me["EGT1"].setText(sprintf("%s", math.round(pts.Engines.Engine.egtActual[0].getValue()))); + me["EGT2"].setText(sprintf("%s", math.round(pts.Engines.Engine.egtActual[1].getValue()))); me["EGT1-needle"].setRotation((EGT_1_cur + 90) * D2R); me["EGT2-needle"].setRotation((EGT_2_cur + 90) * D2R); @@ -812,13 +524,16 @@ var canvas_upperECAM_cfm_eis2 = { } # FF - if (acconfig_weight_kgs.getValue() == 1) { - me["FF1"].setText(sprintf("%s", math.round(fuel_1.getValue() * LBS2KGS, 10))); - me["FF2"].setText(sprintf("%s", math.round(fuel_2.getValue() * LBS2KGS, 10))); + fuel1 = pts.Engines.Engine.fuelFlow[0].getValue(); + fuel2 = pts.Engines.Engine.fuelFlow[1].getValue(); + + if (acconfig_weight_kgs.getValue()) { + me["FF1"].setText(sprintf("%s", math.round(fuel1 * LBS2KGS, 10))); + me["FF2"].setText(sprintf("%s", math.round(fuel2 * LBS2KGS, 10))); me["FFlow-weight-unit"].setText("KG/H"); } else { - me["FF1"].setText(sprintf("%s", math.round(fuel_1.getValue(), 10))); - me["FF2"].setText(sprintf("%s", math.round(fuel_2.getValue(), 10))); + me["FF1"].setText(sprintf("%s", math.round(fuel1, 10))); + me["FF2"].setText(sprintf("%s", math.round(fuel2, 10))); me["FFlow-weight-unit"].setText("LBS/H"); } @@ -839,11 +554,18 @@ var canvas_upperECAM_cfm_eis2 = { } # N1 Limit - me["N1Lim-mode"].setText(sprintf("%s", thr_limit.getValue())); - me["N1Lim"].setText(sprintf("%s", math.floor(n1_limit.getValue() + 0.05))); - me["N1Lim-decimal"].setText(sprintf("%s", int(10 * math.mod(n1_limit.getValue() + 0.05, 1)))); + thrLimit = thr_limit.getValue(); + n1Limit = n1_limit.getValue(); - if (fadecpower_1.getValue() == 1 or fadecpower_2.getValue() == 1 or fadecpowerup.getValue()) { + me["N1Lim-mode"].setText(sprintf("%s", thrLimit)); + me["N1Lim"].setText(sprintf("%s", math.floor(n1Limit + 0.05))); + me["N1Lim-decimal"].setText(sprintf("%s", int(10 * math.mod(n1Limit + 0.05, 1)))); + + fadecPower1 = fadecpower_1.getValue(); + fadecPower2 = fadecpower_2.getValue(); + fadecPowerStart = fadecpowerup.getValue(); + + if (fadecPower1 or fadecPower2 or fadecPowerStart) { me["N1Lim-mode"].show(); me["N1Lim-XX"].hide(); me["N1Lim-XX2"].hide(); @@ -853,7 +575,7 @@ var canvas_upperECAM_cfm_eis2 = { me["N1Lim-XX2"].show(); } - if ((fadecpower_1.getValue() == 1 or fadecpower_2.getValue() == 1 or fadecpowerup.getValue()) and thr_limit.getValue() != "MREV") { + if ((fadecPower1 or fadecPower2 or fadecPowerStart) and thrLimit != "MREV") { me["N1Lim"].show(); me["N1Lim-decpnt"].show(); me["N1Lim-decimal"].show(); @@ -881,28 +603,28 @@ var canvas_upperECAM_iae_eis2 = { "N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-scale","N11-scale2","N11-scaletick","N11-scalenum","N11-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","EPR2-needle","EPR2-thr","EPR2-ylim","EPR2","EPR2-decpnt", "EPR2-decimal","EPR2-box","EPR2-scale","EPR2-scaletick","EPR2-scalenum","EPR2-XX","EPR2-XX2","EGT2-needle","EGT2","EGT2-scale","EGT2-scale2","EGT2-box","EGT2-scaletick","EGT2-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal", "N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","FlapTxt","FlapDots","EPRLim-mode","EPRLim","EPRLim-decpnt","EPRLim-decimal","EPRLim-XX","EPRLim-XX2","REV1","REV1-box", - "REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8", "ECAMR1", "ECAMR2", "ECAMR3", "ECAMR4", "ECAMR5", "ECAMR6", "ECAMR7", "ECAMR8", "ECAM_Right", "TO_Memo","TO_Autobrake","TO_Signs","TO_Spoilers","TO_Flaps","TO_Config","TO_Autobrake_B","TO_Signs_B","TO_Spoilers_B","TO_Flaps_B","TO_Config_B", - "LDG_Memo","LDG_Gear","LDG_Signs","LDG_Spoilers","LDG_Flaps","LDG_Gear_B","LDG_Signs_B","LDG_Spoilers_B","LDG_Flaps_B","LDG_Flaps_B3", "FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock"]; + "REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8", "ECAMR1", "ECAMR2", "ECAMR3", "ECAMR4", "ECAMR5", "ECAMR6", "ECAMR7", "ECAMR8", "ECAM_Right", + "FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock"]; }, update: func() { N1_1_cur = N1_1.getValue(); N1_2_cur = N1_2.getValue(); - N1_1_act = eng1_n1.getValue(); - N1_2_act = eng2_n1.getValue(); + N1_1_act = pts.Engines.Engine.n1Actual[0].getValue(); + N1_2_act = pts.Engines.Engine.n1Actual[1].getValue(); N1_lim_cur = N1_lim.getValue(); EPR_1_cur = EPR_1.getValue(); EPR_2_cur = EPR_2.getValue(); - EPR_1_act = eng1_epr.getValue(); - EPR_2_act = eng2_epr.getValue(); + EPR_1_act = pts.Engines.Engine.eprActual[0].getValue(); + EPR_2_act = pts.Engines.Engine.eprActual[1].getValue(); EPR_lim_cur = EPR_lim.getValue(); EPR_thr_1_act = EPR_thr_1.getValue(); EPR_thr_2_act = EPR_thr_2.getValue(); - rev_1_act = rev_1.getValue(); - rev_2_act = rev_2.getValue(); + rev_1_act = pts.Engines.Engine.reverser[0].getValue(); + rev_2_act = pts.Engines.Engine.reverser[1].getValue(); EGT_1_cur = EGT_1.getValue(); EGT_2_cur = EGT_2.getValue(); - n2cur_1 = eng1_n2.getValue(); - n2cur_2 = eng2_n2.getValue(); + n2cur_1 = pts.Engines.Engine.n2Actual[0].getValue(); + n2cur_2 = pts.Engines.Engine.n2Actual[1].getValue(); # EPR me["EPR1"].setText(sprintf("%1.0f", math.floor(EPR_1_act))); @@ -982,8 +704,8 @@ var canvas_upperECAM_iae_eis2 = { } # EGT - me["EGT1"].setText(sprintf("%s", math.round(eng1_egt.getValue()))); - me["EGT2"].setText(sprintf("%s", math.round(eng2_egt.getValue()))); + me["EGT1"].setText(sprintf("%s", math.round(pts.Engines.Engine.egtActual[0].getValue()))); + me["EGT2"].setText(sprintf("%s", math.round(pts.Engines.Engine.egtActual[1].getValue()))); me["EGT1-needle"].setRotation((EGT_1_cur + 90) * D2R); me["EGT2-needle"].setRotation((EGT_2_cur + 90) * D2R); @@ -1025,11 +747,11 @@ var canvas_upperECAM_iae_eis2 = { } # N1 - me["N11"].setText(sprintf("%s", math.floor(eng1_n1.getValue() + 0.05))); - me["N11-decimal"].setText(sprintf("%s", int(10 * math.mod(eng1_n1.getValue() + 0.05, 1)))); + me["N11"].setText(sprintf("%s", math.floor(pts.Engines.Engine.n1Actual[0].getValue() + 0.05))); + me["N11-decimal"].setText(sprintf("%s", int(10 * math.mod(pts.Engines.Engine.n1Actual[0].getValue() + 0.05, 1)))); - me["N12"].setText(sprintf("%s", math.floor(eng2_n1.getValue() + 0.05))); - me["N12-decimal"].setText(sprintf("%s", int(10 * math.mod(eng2_n1.getValue() + 0.05, 1)))); + me["N12"].setText(sprintf("%s", math.floor(pts.Engines.Engine.n1Actual[1].getValue() + 0.05))); + me["N12-decimal"].setText(sprintf("%s", int(10 * math.mod(pts.Engines.Engine.n1Actual[1].getValue() + 0.05, 1)))); me["N11-needle"].setRotation((N1_1_cur + 90) * D2R); me["N11-thr"].setRotation((N1_thr_1.getValue() + 90) * D2R); @@ -1083,7 +805,7 @@ var canvas_upperECAM_iae_eis2 = { me["N12-XX"].show(); } - if (fadec.FADEC.Eng1.n1 == 1 and fadec.Fadec.n1Mode[0].getValue() == 1) { + if (fadec.FADEC.Eng1.n1 == 1 and fadec.Fadec.n1Mode[0].getValue()) { me["N11-thr"].show(); me["N11-ylim"].hide(); # Keep it hidden, since N1 mode limit calculation is not done yet } else { @@ -1091,7 +813,7 @@ var canvas_upperECAM_iae_eis2 = { me["N11-ylim"].hide(); } - if (fadec.FADEC.Eng2.n1 == 1 and fadec.Fadec.n1Mode[1].getValue() == 1) { + if (fadec.FADEC.Eng2.n1 == 1 and fadec.Fadec.n1Mode[1].getValue()) { me["N12-thr"].show(); me["N12-ylim"].hide(); # Keep it hidden, since N1 mode limit calculation is not done yet } else { @@ -1100,10 +822,10 @@ var canvas_upperECAM_iae_eis2 = { } # N2 - me["N21"].setText(sprintf("%s", math.floor(eng1_n2.getValue() + 0.05))); - me["N21-decimal"].setText(sprintf("%s", int(10 * math.mod(eng1_n2.getValue() + 0.05, 1)))); - me["N22"].setText(sprintf("%s", math.floor(eng2_n2.getValue() + 0.05))); - me["N22-decimal"].setText(sprintf("%s", int(10 * math.mod(eng2_n2.getValue() + 0.05, 1)))); + me["N21"].setText(sprintf("%s", math.floor(pts.Engines.Engine.n2Actual[0].getValue() + 0.05))); + me["N21-decimal"].setText(sprintf("%s", int(10 * math.mod(pts.Engines.Engine.n2Actual[0].getValue() + 0.05, 1)))); + me["N22"].setText(sprintf("%s", math.floor(pts.Engines.Engine.n2Actual[1].getValue() + 0.05))); + me["N22-decimal"].setText(sprintf("%s", int(10 * math.mod(pts.Engines.Engine.n2Actual[1].getValue() + 0.05, 1)))); if (fadec.FADEC.Eng1.n2 == 1) { me["N21"].show(); @@ -1130,14 +852,14 @@ var canvas_upperECAM_iae_eis2 = { } # FF - if (acconfig_weight_kgs.getValue() == 1) { - me["FF1"].setText(sprintf("%s", math.round(fuel_1.getValue() * LBS2KGS, 10))); - me["FF2"].setText(sprintf("%s", math.round(fuel_2.getValue() * LBS2KGS, 10))); + if (acconfig_weight_kgs.getValue()) { + me["FF1"].setText(sprintf("%s", math.round(fuel1 * LBS2KGS, 10))); + me["FF2"].setText(sprintf("%s", math.round(fuel2 * LBS2KGS, 10))); me["FFlow1-weight-unit"].setText("KG/H"); me["FFlow2-weight-unit"].setText("KG/H"); } else { - me["FF1"].setText(sprintf("%s", math.round(fuel_1.getValue(), 10))); - me["FF2"].setText(sprintf("%s", math.round(fuel_2.getValue(), 10))); + me["FF1"].setText(sprintf("%s", math.round(fuel1, 10))); + me["FF2"].setText(sprintf("%s", math.round(fuel2, 10))); me["FFlow1-weight-unit"].setText("LBS/H"); me["FFlow2-weight-unit"].setText("LBS/H"); } @@ -1159,11 +881,18 @@ var canvas_upperECAM_iae_eis2 = { } # EPR Limit - me["EPRLim-mode"].setText(sprintf("%s", thr_limit.getValue())); - me["EPRLim"].setText(sprintf("%1.0f", math.floor(epr_limit.getValue()))); - me["EPRLim-decimal"].setText(sprintf("%03d", (epr_limit.getValue() - int(epr_limit.getValue())) * 1000)); + thrLimit = thr_limit.getValue(); + eprLimit = epr_limit.getValue(); - if (fadecpower_1.getValue() == 1 or fadecpower_2.getValue() == 1 or fadecpowerup.getValue()) { + me["EPRLim-mode"].setText(sprintf("%s", thrLimit)); + me["EPRLim"].setText(sprintf("%1.0f", math.floor(eprLimit))); + me["EPRLim-decimal"].setText(sprintf("%03d", (eprLimit - int(eprLimit)) * 1000)); + + fadecPower1 = fadecpower_1.getValue(); + fadecPower2 = fadecpower_2.getValue(); + fadecPowerStart = fadecpowerup.getValue(); + + if (fadecPower1 or fadecPower2 or fadecPowerStart) { me["EPRLim-mode"].show(); me["EPRLim-XX"].hide(); me["EPRLim-XX2"].hide(); @@ -1173,7 +902,7 @@ var canvas_upperECAM_iae_eis2 = { me["EPRLim-XX2"].show(); } - if ((fadecpower_1.getValue() == 1 or fadecpower_2.getValue() == 1 or fadecpowerup.getValue()) and thr_limit.getValue() != "MREV") { + if ((fadecPower1 or fadecPower2 or fadecPowerStart) and thrLimit != "MREV") { me["EPRLim"].show(); me["EPRLim-decpnt"].show(); me["EPRLim-decimal"].show(); @@ -1214,7 +943,7 @@ var canvas_upperECAM_test = { return ["Test_white","Test_text"]; }, update: func() { - var elapsedtime = et.getValue(); + elapsedtime = pts.Sim.Time.elapsedSec.getValue(); if (du3_test_time.getValue() + 1 >= elapsedtime) { me["Test_white"].show(); me["Test_text"].hide(); @@ -1225,6 +954,17 @@ var canvas_upperECAM_test = { }, }; +var createListenerForLine = func(prop, node, key) { + setlistener(prop, func() { + if (eng_option.getValue() == "IAE") { + upperECAM_iae_eis2[key].setColor(upperECAM_iae_eis2.getColorString(node.getValue())); + } else { + upperECAM_cfm_eis2[key].setColor(upperECAM_cfm_eis2.getColorString(node.getValue())); + } + }, 0, 0); +}; + + setlistener("sim/signals/fdm-initialized", func { upperECAM_display = canvas.new({ "name": "upperECAM", @@ -1241,6 +981,24 @@ setlistener("sim/signals/fdm-initialized", func { upperECAM_iae_eis2 = canvas_upperECAM_iae_eis2.new(group_iae_eis2, "Aircraft/A320-family/Models/Instruments/Upper-ECAM/res/iae-eis2.svg"); upperECAM_test = canvas_upperECAM_test.new(group_test, "Aircraft/A320-family/Models/Instruments/Common/res/du-test.svg"); + createListenerForLine("/ECAM/msg/linec1", ECAM_line1c, "ECAML1"); + createListenerForLine("/ECAM/msg/linec2", ECAM_line2c, "ECAML2"); + createListenerForLine("/ECAM/msg/linec3", ECAM_line3c, "ECAML3"); + createListenerForLine("/ECAM/msg/linec4", ECAM_line4c, "ECAML4"); + createListenerForLine("/ECAM/msg/linec5", ECAM_line5c, "ECAML5"); + createListenerForLine("/ECAM/msg/linec6", ECAM_line6c, "ECAML6"); + createListenerForLine("/ECAM/msg/linec7", ECAM_line7c, "ECAML7"); + createListenerForLine("/ECAM/msg/linec8", ECAM_line8c, "ECAML8"); + + createListenerForLine("/ECAM/rightmsg/linec1", ECAM_line1rc, "ECAMR1"); + createListenerForLine("/ECAM/rightmsg/linec2", ECAM_line2rc, "ECAMR2"); + createListenerForLine("/ECAM/rightmsg/linec3", ECAM_line3rc, "ECAMR3"); + createListenerForLine("/ECAM/rightmsg/linec4", ECAM_line4rc, "ECAMR4"); + createListenerForLine("/ECAM/rightmsg/linec5", ECAM_line5rc, "ECAMR5"); + createListenerForLine("/ECAM/rightmsg/linec6", ECAM_line6rc, "ECAMR6"); + createListenerForLine("/ECAM/rightmsg/linec7", ECAM_line7rc, "ECAMR7"); + createListenerForLine("/ECAM/rightmsg/linec8", ECAM_line8rc, "ECAMR8"); + upperECAM_update.start(); if (rate.getValue() > 1) { u_rateApply(); diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg index ddb88681..78585ba0 100644 --- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg +++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg @@ -41,9 +41,9 @@ inkscape:window-height="705" id="namedview371" showgrid="true" - inkscape:zoom="1.4142136" - inkscape:cx="832.32702" - inkscape:cy="561.61738" + inkscape:zoom="0.50000001" + inkscape:cx="419.64115" + inkscape:cy="1000.4352" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -1264,485 +1264,6 @@ y="943.73566" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.1831665px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 8 - - T.O - - AUTO BRK - SIGNS - SPLRS - FLAPS - T.O CONFIG - - MAX - . . . . . - - - ON - . . . . . . . . . . - - - ARM - . . . . . . . . . - - - T.O - . . . . . . . . . . - - - TEST - . . . - - - - LDG - - LDG GEAR - SIGNS - CABIN READY - SPLRS - FLAPS - - DN - . . . . . . - - - ON - . . . . . . . . . . - - - ARM - . . . . . . . . . - - - FULL - . . . . . . . . - - - 3 - . . . . . . . . . . . . - - @@ -42,7 +42,7 @@ id="namedview371" showgrid="false" inkscape:zoom="0.43942712" - inkscape:cx="568.82143" + inkscape:cx="180.81625" inkscape:cy="433.53356" inkscape:window-x="-8" inkscape:window-y="-8" @@ -1632,485 +1632,6 @@ y="943.73566" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.1831665px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#cecdce">LINE 8 - - T.O - - AUTO BRK - SIGNS - SPLRS - FLAPS - T.O CONFIG - - MAX - . . . . . - - - ON - . . . . . . . . . . - - - ARM - . . . . . . . . . - - - T.O - . . . . . . . . . . - - - TEST - . . . - - - - LDG - - LDG GEAR - SIGNS - CABIN READY - SPLRS - FLAPS - - DN - . . . . . . - - - ON - . . . . . . . . . . - - - ARM - . . . . . . . . . - - - FULL - . . . . . . . . - - - 3 - . . . . . . . . . . . . - -