diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index e68b8cdf..c4827781 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -22,62 +22,131 @@ var ASItrgtdiff = 0; var ASImax = 0; var ASItrend = 0; var altTens = 0; -var state1 = getprop("/systems/thrust/state1"); -var state2 = getprop("/systems/thrust/state2"); -var ap1 = getprop("/it-autoflight/output/ap1"); -var ap2 = getprop("/it-autoflight/output/ap2"); -var fd1 = getprop("/it-autoflight/output/fd1"); -var fd2 = getprop("/it-autoflight/output/fd2"); -var athr = getprop("/it-autoflight/output/athr"); -var throttle_mode = getprop("/modes/pfd/fma/throttle-mode"); -var pitch_mode = getprop("/modes/pfd/fma/pitch-mode"); -var pitch_mode_armed = getprop("/modes/pfd/fma/pitch-mode-armed"); -var pitch_mode2_armed = getprop("/modes/pfd/fma/pitch-mode2-armed"); -var roll_mode = getprop("/modes/pfd/fma/roll-mode"); -var roll_mode_armed = getprop("/modes/pfd/fma/roll-mode-armed"); -var thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); -var thr2 = getprop("/controls/engines/engine[1]/throttle-pos"); -var wow1 = getprop("/gear/gear[1]/wow"); -var wow2 = getprop("/gear/gear[2]/wow"); -var pitch = 0; -var roll = 0; -setprop("/instrumentation/pfd/vs-needle", 0); -setprop("/instrumentation/pfd/vs-digit-trans", 0); -setprop("/it-autoflight/input/spd-managed", 0); -setprop("/FMGC/internal/target-ias-pfd", 0); -setprop("/it-autoflight/output/ap1", 0); -setprop("/it-autoflight/output/ap2", 0); -setprop("/it-autoflight/output/fd1", 0); -setprop("/it-autoflight/output/fd2", 0); -setprop("/it-autoflight/output/athr", 0); -setprop("/instrumentation/pfd/alt-diff", 0); -setprop("/instrumentation/pfd/heading-deg", 0); -setprop("/instrumentation/pfd/horizon-pitch", 0); -setprop("/instrumentation/pfd/horizon-ground", 0); -setprop("/instrumentation/pfd/hdg-diff", 0); -setprop("/instrumentation/pfd/heading-scale", 0); -setprop("/instrumentation/pfd/track-deg", 0); -setprop("/instrumentation/pfd/track-hdg-diff", 0); -setprop("/instrumentation/pfd/speed-lookahead", 0); -setprop("/instrumentation/du/du1-test", 0); -setprop("/instrumentation/du/du1-test-time", 0); -setprop("/instrumentation/du/du1-test-amount", 0); -setprop("/instrumentation/du/du6-test", 0); -setprop("/instrumentation/du/du6-test-time", 0); -setprop("/instrumentation/du/du6-test-amount", 0); -setprop("/it-autoflight/internal/vert-speed-fpm-pfd", 0); -setprop("/position/gear-agl-ft", 0); -setprop("/controls/flight/aileron-input-fast", 0); -setprop("/controls/flight/elevator-input-fast", 0); -setprop("/instrumentation/adirs/adr[0]/active", 0); -setprop("/instrumentation/adirs/adr[1]/active", 0); -setprop("/instrumentation/adirs/adr[2]/active", 0); -setprop("/instrumentation/adirs/ir[0]/aligned", 0); -setprop("/instrumentation/adirs/ir[1]/aligned", 0); -setprop("/instrumentation/adirs/ir[2]/aligned", 0); -setprop("/controls/switching/ATTHDG", 0); -setprop("/controls/switching/AIRDATA", 0); +# Fetch nodes: +var state1 = props.globals.getNode("/systems/thrust/state1", 1); +var state2 = props.globals.getNode("/systems/thrust/state2", 1); +var throttle_mode = props.globals.getNode("/modes/pfd/fma/throttle-mode", 1); +var pitch_mode = props.globals.getNode("/modes/pfd/fma/pitch-mode", 1); +var pitch_mode_armed = props.globals.getNode("/modes/pfd/fma/pitch-mode-armed", 1); +var pitch_mode2_armed = props.globals.getNode("/modes/pfd/fma/pitch-mode2-armed", 1); +var pitch_mode_armed_box = props.globals.getNode("/modes/pfd/fma/pitch-mode-armed-box", 1); +var pitch_mode2_armed_box = props.globals.getNode("/modes/pfd/fma/pitch-mode2-armed-box", 1); +var roll_mode = props.globals.getNode("/modes/pfd/fma/roll-mode", 1); +var roll_mode_armed = props.globals.getNode("/modes/pfd/fma/roll-mode-armed", 1); +var roll_mode_box = props.globals.getNode("/modes/pfd/fma/roll-mode-box", 1); +var roll_mode_armed_box = props.globals.getNode("/modes/pfd/fma/roll-mode-armed-box", 1); +var thr1 = props.globals.getNode("/controls/engines/engine[0]/throttle-pos", 1); +var thr2 = props.globals.getNode("/controls/engines/engine[1]/throttle-pos", 1); +var wow1 = props.globals.getNode("/gear/gear[1]/wow", 1); +var wow2 = props.globals.getNode("/gear/gear[2]/wow", 1); +var pitch = props.globals.getNode("/orientation/pitch-deg", 1); +var roll = props.globals.getNode("/orientation/roll-deg", 1); +var elapsedtime = props.globals.getNode("/sim/time/elapsed-sec", 1); +var acess = props.globals.getNode("/systems/electrical/bus/ac-ess", 1); +var ac2 = props.globals.getNode("/systems/electrical/bus/ac2", 1); +var du1_lgt = props.globals.getNode("/controls/lighting/DU/du1", 1); +var du6_lgt = props.globals.getNode("/controls/lighting/DU/du6", 1); +var acconfig = props.globals.getNode("/systems/acconfig/autoconfig-running", 1); +var acconfig_mismatch = props.globals.getNode("/systems/acconfig/mismatch-code", 1); +var cpt_du_xfr = props.globals.getNode("/modes/cpt-du-xfr", 1); +var fo_du_xfr = props.globals.getNode("/modes/fo-du-xfr", 1); +var eng_out = props.globals.getNode("/systems/thrust/eng-out", 1); +var eng0_state = props.globals.getNode("/engines/engine[0]/state", 1); +var eng1_state = props.globals.getNode("/engines/engine[1]/state", 1); +var alpha_floor = props.globals.getNode("/systems/thrust/alpha-floor", 1); +var toga_lk = props.globals.getNode("/systems/thrust/toga-lk", 1); +var thrust_limit = props.globals.getNode("/controls/engines/thrust-limit", 1); +var flex = props.globals.getNode("/FMGC/internal/flex", 1); +var lvr_clb = props.globals.getNode("/systems/thrust/lvrclb", 1); +var throt_box = props.globals.getNode("/modes/pfd/fma/throttle-mode-box", 1); +var pitch_box = props.globals.getNode("/modes/pfd/fma/pitch-mode-box", 1); +var ap_box = props.globals.getNode("/modes/pfd/fma/ap-mode-box", 1); +var fd_box = props.globals.getNode("/modes/pfd/fma/fd-mode-box", 1); +var at_box = props.globals.getNode("/modes/pfd/fma/athr-mode-box", 1); +var fbw_law = props.globals.getNode("/it-fbw/law", 1); +var ap_mode = props.globals.getNode("/modes/pfd/fma/ap-mode", 1); +var fd_mode = props.globals.getNode("/modes/pfd/fma/fd-mode", 1); +var at_mode = props.globals.getNode("/modes/pfd/fma/at-mode", 1); +var alt_std_mode = props.globals.getNode("/modes/altimeter/std", 1); +var alt_inhg_mode = props.globals.getNode("/modes/altimeter/inhg", 1); +var alt_hpa = props.globals.getNode("/instrumentation/altimeter/setting-hpa", 1); +var alt_inhg = props.globals.getNode("/instrumentation/altimeter/setting-inhg", 1); +var altitude = props.globals.getNode("/instrumentation/altimeter/indicated-altitude-ft", 1); +var altitude_pfd = props.globals.getNode("/instrumentation/altimeter/indicated-altitude-ft-pfd", 1); +var alt_diff = props.globals.getNode("/instrumentation/pfd/alt-diff", 1); +var ap_alt = props.globals.getNode("/it-autoflight/internal/alt", 1); +var vs_needle = props.globals.getNode("/instrumentation/pfd/vs-needle", 1); +var vs_digit = props.globals.getNode("/instrumentation/pfd/vs-digit-trans", 1); +var ap_vs_pfd = props.globals.getNode("/it-autoflight/internal/vert-speed-fpm-pfd", 1); +var athr_arm = props.globals.getNode("/modes/pfd/fma/athr-armed", 1); +var FMGC_max_spd = props.globals.getNode("/FMGC/internal/maxspeed", 1); +var ind_spd_kt = props.globals.getNode("/instrumentation/airspeed-indicator/indicated-speed-kt", 1); +var ind_spd_mach = props.globals.getNode("/instrumentation/airspeed-indicator/indicated-mach", 1); +var at_mach_mode = props.globals.getNode("/it-autoflight/input/kts-mach", 1); +var at_input_spd_mach = props.globals.getNode("/it-autoflight/input/spd-mach", 1); +var at_input_spd_kts = props.globals.getNode("/it-autoflight/input/spd-kts", 1); +var fd_roll = props.globals.getNode("/it-autoflight/fd/roll-bar", 1); +var fd_pitch = props.globals.getNode("/it-autoflight/fd/pitch-bar", 1); +var decision = props.globals.getNode("/instrumentation/mk-viii/inputs/arinc429/decision-height", 1); +var skid_slip = props.globals.getNode("/instrumentation/slip-skid-ball/indicated-slip-skid", 1); +var FMGCphase = props.globals.getNode("/FMGC/status/phase", 1); +var loc = props.globals.getNode("/instrumentation/nav[0]/heading-needle-deflection-norm", 1); +var gs = props.globals.getNode("/instrumentation/nav[0]/gs-needle-deflection-norm", 1); +var show_hdg = props.globals.getNode("/it-autoflight/custom/show-hdg", 1); +var ap_hdg = props.globals.getNode("/it-autoflight/input/hdg", 1); +var ap_trk_sw = props.globals.getNode("/it-autoflight/custom/trk-fpa", 1); +var ap_ils_mode = props.globals.getNode("/modes/pfd/ILS1", 1); +var ap_ils_mode2 = props.globals.getNode("/modes/pfd/ILS2", 1); +var loc_in_range = props.globals.getNode("/instrumentation/nav[0]/in-range", 1); +var gs_in_range = props.globals.getNode("/instrumentation/nav[0]/gs-in-range", 1); +var nav0_signalq = props.globals.getNode("/instrumentation/nav[0]/signal-quality-norm", 1); +var hasloc = props.globals.getNode("/instrumentation/nav[0]/nav-loc", 1); +var hasgs = props.globals.getNode("/instrumentation/nav[0]/has-gs", 1); +var pfdrate = props.globals.getNode("/systems/acconfig/options/pfd-rate", 1); +var managed_spd = props.globals.getNode("/it-autoflight/input/spd-managed", 1); +var at_tgt_ias = props.globals.getNode("/FMGC/internal/target-ias-pfd", 1); +var ap1 = props.globals.getNode("/it-autoflight/output/ap1", 1); +var ap2 = props.globals.getNode("/it-autoflight/output/ap2", 1); +var fd1 = props.globals.getNode("/it-autoflight/output/fd1", 1); +var fd2 = props.globals.getNode("/it-autoflight/output/fd2", 1); +var athr = props.globals.getNode("/it-autoflight/output/athr", 1); +var gear_agl = props.globals.getNode("/position/gear-agl-ft", 1); +var aileron_input = props.globals.getNode("/controls/flight/aileron-input-fast", 1); +var elevator_input = props.globals.getNode("/controls/flight/elevator-input-fast", 1); +var adirs0_active = props.globals.getNode("/instrumentation/adirs/adr[0]/active", 1); +var adirs1_active = props.globals.getNode("/instrumentation/adirs/adr[1]/active", 1); +var adirs2_active = props.globals.getNode("/instrumentation/adirs/adr[2]/active", 1); +var ir0_aligned = props.globals.getNode("/instrumentation/adirs/ir[0]/aligned", 1); +var ir1_aligned = props.globals.getNode("/instrumentation/adirs/ir[1]/aligned", 1); +var ir2_aligned = props.globals.getNode("/instrumentation/adirs/ir[2]/aligned", 1); +var att_switch = props.globals.getNode("/controls/switching/ATTHDG", 1); +var air_switch = props.globals.getNode("/controls/switching/AIRDATA", 1); + +# Create Nodes: +var vs_needle = props.globals.initNode("/instrumentation/pfd/vs-needle", 0.0, "DOUBLE"); +var vs_needle_trans = props.globals.initNode("/instrumentation/pfd/vs-digit-trans", 0.0, "DOUBLE"); +var alt_diff = props.globals.initNode("/instrumentation/pfd/alt-diff", 0.0, "DOUBLE"); +var heading = props.globals.initNode("/instrumentation/pfd/heading-deg", 0.0, "DOUBLE"); +var horizon_pitch = props.globals.initNode("/instrumentation/pfd/horizon-pitch", 0.0, "DOUBLE"); +var horizon_ground = props.globals.initNode("/instrumentation/pfd/horizon-ground", 0.0, "DOUBLE"); +var hdg_diff = props.globals.initNode("/instrumentation/pfd/hdg-diff", 0.0, "DOUBLE"); +var hdg_scale = props.globals.initNode("/instrumentation/pfd/heading-scale", 0.0, "DOUBLE"); +var track = props.globals.initNode("/instrumentation/pfd/track-deg", 0.0, "DOUBLE"); +var track_diff = props.globals.initNode("/instrumentation/pfd/track-hdg-diff", 0.0, "DOUBLE"); +var speed_pred = props.globals.initNode("/instrumentation/pfd/speed-lookahead", 0.0, "DOUBLE"); +var du1_test = props.globals.initNode("/instrumentation/du/du1-test", 0, "BOOL"); +var du1_test_time = props.globals.initNode("/instrumentation/du/du1-test-time", 0.0, "DOUBLE"); +var du1_test_amount = props.globals.initNode("/instrumentation/du/du1-test-amount", 0.0, "DOUBLE"); +var du2_test = props.globals.initNode("/instrumentation/du/du2-test", 0, "BOOL"); +var du2_test_time = props.globals.initNode("/instrumentation/du/du2-test-time", 0.0, "DOUBLE"); +var du2_test_amount = props.globals.initNode("/instrumentation/du/du2-test-amount", 0.0, "DOUBLE"); +var du5_test = props.globals.initNode("/instrumentation/du/du5-test", 0, "BOOL"); +var du5_test_time = props.globals.initNode("/instrumentation/du/du5-test-time", 0.0, "DOUBLE"); +var du5_test_amount = props.globals.initNode("/instrumentation/du/du5-test-amount", 0.0, "DOUBLE"); +var du6_test = props.globals.initNode("/instrumentation/du/du6-test", 0, "BOOL"); +var du6_test_time = props.globals.initNode("/instrumentation/du/du6-test-time", 0.0, "DOUBLE"); +var du6_test_amount = props.globals.initNode("/instrumentation/du/du6-test-amount", 0.0, "DOUBLE"); var canvas_PFD_base = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { @@ -131,44 +200,45 @@ var canvas_PFD_base = { "TRK_pointer"]; }, update: func() { - elapsedtime = getprop("/sim/time/elapsed-sec"); - if (getprop("/systems/electrical/bus/ac-ess") >= 110) { - if (getprop("/systems/acconfig/autoconfig-running") != 1 and getprop("/instrumentation/du/du1-test") != 1) { - setprop("/instrumentation/du/du1-test", 1); - setprop("/instrumentation/du/du1-test-amount", math.round((rand() * 5 ) + 35, 0.1)); - setprop("/instrumentation/du/du1-test-time", getprop("/sim/time/elapsed-sec")); - } else if (getprop("/systems/acconfig/autoconfig-running") == 1 and getprop("/instrumentation/du/du1-test") != 1) { - setprop("/instrumentation/du/du1-test", 1); - setprop("/instrumentation/du/du1-test-amount", math.round((rand() * 5 ) + 35, 0.1)); - setprop("/instrumentation/du/du1-test-time", getprop("/sim/time/elapsed-sec") - 30); + elapsedtime_act = elapsedtime.getValue(); + if (acess.getValue() >= 110) { + if (acconfig.getValue() != 1 and du1_test.getValue() != 1) { + du1_test.setValue(1); + du1_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); + du1_test_time.setValue(elapsedtime_act); + } else if (acconfig.getValue() == 1 and du1_test.getValue() != 1) { + du1_test.setValue(1); + du1_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); + du1_test_time.setValue(elapsedtime_act - 30); } } else { - setprop("/instrumentation/du/du1-test", 0); - } - if (getprop("/systems/electrical/bus/ac2") >= 110) { - if (getprop("/systems/acconfig/autoconfig-running") != 1 and getprop("/instrumentation/du/du6-test") != 1) { - setprop("/instrumentation/du/du6-test", 1); - setprop("/instrumentation/du/du6-test-amount", math.round((rand() * 5 ) + 35, 0.1)); - setprop("/instrumentation/du/du6-test-time", getprop("/sim/time/elapsed-sec")); - } else if (getprop("/systems/acconfig/autoconfig-running") == 1 and getprop("/instrumentation/du/du6-test") != 1) { - setprop("/instrumentation/du/du6-test", 1); - setprop("/instrumentation/du/du6-test-amount", math.round((rand() * 5 ) + 35, 0.1)); - setprop("/instrumentation/du/du6-test-time", getprop("/sim/time/elapsed-sec") - 30); - } - } else { - setprop("/instrumentation/du/du6-test", 0); + du1_test.setValue(0); } - if (getprop("/systems/acconfig/mismatch-code") == "0x000") { + if (ac2.getValue() >= 110) { + if (acconfig.getValue != 1 and du6_test.getValue() != 1) { + du6_test.setValue(1); + du6_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); + du6_test_time.setValue(elapsedtime_act); + } else if (acconfig.getValue() == 1 and du6_test.getValue() != 1) { + du6_test.setValue(1); + du6_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1)); + du6_test_time.setValue(elapsedtime_act - 30); + } + } else { + du6_test.setValue(0); + } + + if (acconfig_mismatch.getValue() == "0x000") { PFD_1_mismatch.page.hide(); PFD_2_mismatch.page.hide(); - if (getprop("/systems/electrical/bus/ac-ess") >= 110 and getprop("/controls/lighting/DU/du1") > 0) { - if (getprop("/instrumentation/du/du1-test-time") + getprop("/instrumentation/du/du1-test-amount") >= elapsedtime and getprop("/modes/cpt-du-xfr") != 1) { + if (acess.getValue() >= 110 and du1_lgt.getValue() > 0) { + if (du1_test_time.getValue() + du1_test_amount.getValue() >= elapsedtime_act and cpt_du_xfr.getValue() != 1) { PFD_1_test.update(); updateL = 0; PFD_1.page.hide(); PFD_1_test.page.show(); - } else if (getprop("/instrumentation/du/du2-test-time") + getprop("/instrumentation/du/du2-test-amount") >= elapsedtime and getprop("/modes/cpt-du-xfr") == 1) { + } else if (du2_test_time.getValue() + du2_test_amount.getValue() >= elapsedtime_act and cpt_du_xfr.getValue() == 1) { PFD_1_test.update(); updateL = 0; PFD_1.page.hide(); @@ -185,13 +255,13 @@ var canvas_PFD_base = { PFD_1_test.page.hide(); PFD_1.page.hide(); } - if (getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/du6") > 0) { - if (getprop("/instrumentation/du/du6-test-time") + getprop("/instrumentation/du/du6-test-amount") >= elapsedtime and getprop("/modes/fo-du-xfr") != 1) { + if (ac2.getValue() >= 110 and du6_lgt.getValue() > 0) { + if (du6_test_time.getValue() + du6_test_amount.getValue() >= elapsedtime_act and fo_du_xfr.getValue() != 1) { PFD_2_test.update(); updateR = 0; PFD_2.page.hide(); PFD_2_test.page.show(); - } else if (getprop("/instrumentation/du/du5-test-time") + getprop("/instrumentation/du/du5-test-amount") >= elapsedtime and getprop("/modes/fo-du-xfr") == 1) { + } else if (du5_test_time.getValue() + du5_test_amount.getValue() >= elapsedtime_act and fo_du_xfr.getValue() == 1) { PFD_2_test.update(); updateR = 0; PFD_2.page.hide(); @@ -230,81 +300,69 @@ var canvas_PFD_base = { } }, updateCommon: func () { - state1 = getprop("/systems/thrust/state1"); - state2 = getprop("/systems/thrust/state2"); - ap1 = getprop("/it-autoflight/output/ap1"); - ap2 = getprop("/it-autoflight/output/ap2"); - fd1 = getprop("/it-autoflight/output/fd1"); - fd2 = getprop("/it-autoflight/output/fd2"); - athr = getprop("/it-autoflight/output/athr"); - throttle_mode = getprop("/modes/pfd/fma/throttle-mode"); - pitch_mode = getprop("/modes/pfd/fma/pitch-mode"); - pitch_mode_armed = getprop("/modes/pfd/fma/pitch-mode-armed"); - pitch_mode2_armed = getprop("/modes/pfd/fma/pitch-mode2-armed"); - roll_mode = getprop("/modes/pfd/fma/roll-mode"); - roll_mode_armed = getprop("/modes/pfd/fma/roll-mode-armed"); - thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); - thr2 = getprop("/controls/engines/engine[1]/throttle-pos"); - pitch = getprop("/orientation/pitch-deg"); - roll = getprop("/orientation/roll-deg"); - wow1 = getprop("/gear/gear[1]/wow"); - wow2 = getprop("/gear/gear[2]/wow"); - # FMA MAN TOGA MCT FLX THR - if (athr == 1 and (state1 == "TOGA" or state1 == "MCT" or state1 == "MAN THR" or state2 == "TOGA" or state2 == "MCT" or state2 == "MAN THR") and getprop("/systems/thrust/eng-out") != 1 and getprop("/systems/thrust/alpha-floor") != 1 and - getprop("/systems/thrust/toga-lk") != 1) { + # Set properties used a lot to a variable to avoid calling getValue() multiple times + state1_act = state1.getValue(); + state2_act = state2.getValue(); + thrust_limit_act = thrust_limit.getValue(); + alpha_floor_act = alpha_floor.getValue(); + toga_lk_act = toga_lk.getValue(); + thr1_act = thr1.getValue(); + thr2_act = thr2.getValue(); + if (athr.getValue() == 1 and (state1_act == "TOGA" or state1_act == "MCT" or state1_act == "MAN THR" or state2_act == "TOGA" or state2_act == "MCT" or state2_act == "MAN THR") and eng_out.getValue() != 1 and alpha_floor_act != 1 and + toga_lk_act != 1) { me["FMA_man"].show(); me["FMA_manmode"].show(); - if (state1 == "TOGA" or state2 == "TOGA") { + if (state1_act == "TOGA" or state2_act == "TOGA") { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("TOGA"); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); - } else if ((state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) { + } else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("THR"); me["FMA_man_box"].setColor(0.7333,0.3803,0); - } else if ((state1 == "MCT" or state2 == "MCT") and getprop("/controls/engines/thrust-limit") != "FLX") { + } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act != "FLX") { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("MCT"); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); - } else if ((state1 == "MCT" or state2 == "MCT") and getprop("/controls/engines/thrust-limit") == "FLX") { - me["FMA_flxtemp"].setText(sprintf("%s", "+" ~ getprop("/FMGC/internal/flex"))); + } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") { + me["FMA_flxtemp"].setText(sprintf("%s", "+" ~ flex.getValue())); me["FMA_man_box"].hide(); me["FMA_flx_box"].show(); me["FMA_flxtemp"].show(); me["FMA_manmode"].setText("FLX "); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); - } else if ((state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) { + } else if ((state1_act == "MAN THR" and thr1_act < 0.83) or (state2_act == "MAN THR" and thr2_act < 0.83)) { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("THR"); me["FMA_man_box"].setColor(0.7333,0.3803,0); } - } else if (athr == 1 and (state1 == "TOGA" or (state1 == "MCT" and getprop("/controls/engines/thrust-limit") == "FLX") or (state1 == "MAN THR" and thr1 >= 0.83) or state2 == "TOGA" or (state2 == "MCT" and - getprop("/controls/engines/thrust-limit") == "FLX") or (state2 == "MAN THR" and thr2 >= 0.83)) and getprop("/systems/thrust/eng-out") == 1 and getprop("/systems/thrust/alpha-floor") != 1 and getprop("/systems/thrust/toga-lk") != 1) { + } else if (athr.getValue() == 1 and (state1_act == "TOGA" or (state1_act == "MCT" and thrust_limit_act == "FLX") or (state1_act == "MAN THR" and thr1_act >= 0.83) or state2_act == "TOGA" or (state2_act == "MCT" and + thrust_limit_act == "FLX") or (state2_act == "MAN THR" and thr2_act >= 0.83)) and eng_out.getValue() == 1 and alpha_floor_act != 1 and toga_lk_act != 1) { me["FMA_man"].show(); me["FMA_manmode"].show(); - if (state1 == "TOGA" or state2 == "TOGA") { + if (state1_act == "TOGA" or state2_act == "TOGA") { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("TOGA"); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); - } else if ((state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) { + } else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) { me["FMA_flx_box"].hide(); me["FMA_flxtemp"].hide(); me["FMA_man_box"].show(); me["FMA_manmode"].setText("THR"); me["FMA_man_box"].setColor(0.7333,0.3803,0); - } else if ((state1 == "MCT" or state2 == "MCT") and getprop("/controls/engines/thrust-limit") == "FLX") { - me["FMA_flxtemp"].setText(sprintf("%s", "+" ~ getprop("/FMGC/internal/flex"))); + } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") { + me["FMA_flxtemp"].setText(sprintf("%s", "+" ~ flex.getValue())); me["FMA_man_box"].hide(); me["FMA_flx_box"].show(); me["FMA_flxtemp"].show(); @@ -319,35 +377,35 @@ var canvas_PFD_base = { me["FMA_flxtemp"].hide(); } - if ((state1 == "CL" and state2 != "CL") or (state1 != "CL" and state2 == "CL") and getprop("/systems/thrust/eng-out") != 1) { + if ((state1_act == "CL" and state2_act != "CL") or (state1_act != "CL" and state2_act == "CL") and eng_out.getValue() != 1) { me["FMA_lvrclb"].setText("LVR ASYM"); } else { - if (getprop("/systems/thrust/eng-out") == 1) { + if (eng_out.getValue() == 1) { me["FMA_lvrclb"].setText("LVR MCT"); } else { me["FMA_lvrclb"].setText("LVR CLB"); } } - if (athr == 1 and getprop("/systems/thrust/lvrclb") == 1) { + if (athr.getValue() == 1 and lvr_clb.getValue() == 1) { me["FMA_lvrclb"].show(); } else { me["FMA_lvrclb"].hide(); } # FMA A/THR - if (getprop("/systems/thrust/alpha-floor") != 1 and getprop("/systems/thrust/toga-lk") != 1) { - if (athr == 1 and getprop("/systems/thrust/eng-out") != 1 and (state1 == "MAN" or state1 == "CL") and (state2 == "MAN" or state2 == "CL")) { + if (alpha_floor_act != 1 and toga_lk_act != 1) { + if (athr.getValue() == 1 and eng_out.getValue() != 1 and (state1_act == "MAN" or state1_act == "CL") and (state2_act == "MAN" or state2_act == "CL")) { me["FMA_thrust"].show(); - if (getprop("/modes/pfd/fma/throttle-mode-box") == 1 and throttle_mode != " ") { + if (throt_box.getValue() == 1 and throttle_mode.getValue() != " ") { me["FMA_thrust_box"].show(); } else { me["FMA_thrust_box"].hide(); } - } else if (athr == 1 and getprop("/systems/thrust/eng-out") == 1 and (state1 == "MAN" or state1 == "CL" or (state1 == "MAN THR" and thr1 < 0.83) or (state1 == "MCT" and getprop("/controls/engines/thrust-limit") != "FLX")) and - (state2 == "MAN" or state2 == "CL" or (state2 == "MAN THR" and thr2 < 0.83) or (state2 == "MCT" and getprop("/controls/engines/thrust-limit") != "FLX"))) { + } else if (athr.getValue() == 1 and eng_out.getValue() == 1 and (state1_act == "MAN" or state1_act == "CL" or (state1_act == "MAN THR" and thr1_act < 0.83) or (state1_act == "MCT" and thrust_limit_act != "FLX")) and + (state2_act == "MAN" or state2_act == "CL" or (state2_act == "MAN THR" and thr2_act < 0.83) or (state2_act == "MCT" and thrust_limit_act != "FLX"))) { me["FMA_thrust"].show(); - if (getprop("/modes/pfd/fma/throttle-mode-box") == 1 and throttle_mode != " ") { + if (throt_box.getValue() == 1 and throttle_mode.getValue() != " ") { me["FMA_thrust_box"].show(); } else { me["FMA_thrust_box"].hide(); @@ -361,21 +419,28 @@ var canvas_PFD_base = { me["FMA_thrust_box"].show(); } - if (getprop("/systems/thrust/alpha-floor") == 1) { + if (alpha_floor_act == 1) { me["FMA_thrust"].setText("A.FLOOR"); me["FMA_thrust_box"].setColor(0.7333,0.3803,0); - } else if (getprop("/systems/thrust/toga-lk") == 1) { + } else if (toga_lk_act == 1) { me["FMA_thrust"].setText("TOGA LK"); me["FMA_thrust_box"].setColor(0.7333,0.3803,0); } else { - me["FMA_thrust"].setText(sprintf("%s", throttle_mode)); + me["FMA_thrust"].setText(sprintf("%s", throttle_mode.getValue())); me["FMA_thrust_box"].setColor(0.8078,0.8039,0.8078); } # FMA Pitch Roll Common - me["FMA_combined"].setText(sprintf("%s", pitch_mode)); + pitch_mode_act = pitch_mode.getValue(); # only call getValue once per loop, not multiple times + pitch_mode_armed_act = pitch_mode_armed.getValue(); + pitch_mode2_armed_act = pitch_mode2_armed.getValue(); + roll_mode_act = roll_mode.getValue(); + roll_mode_armed_act = roll_mode_armed.getValue(); + fbw_curlaw = fbw_law.getValue(); + me["FMA_combined"].setText(sprintf("%s", pitch_mode_act)); - if (pitch_mode == "LAND" or pitch_mode == "FLARE" or pitch_mode == "ROLL OUT") { + + if (pitch_mode_act == "LAND" or pitch_mode_act == "FLARE" or pitch_mode_act == "ROLL OUT") { me["FMA_pitch"].hide(); me["FMA_roll"].hide(); me["FMA_pitch_box"].hide(); @@ -384,11 +449,11 @@ var canvas_PFD_base = { me["FMA_rollarm_box"].hide(); me["FMA_Middle1"].hide(); me["FMA_Middle2"].hide(); - if (getprop("/it-fbw/law") == 2) { + if (fbw_curlaw == 2) { me["FMA_ctr_msg"].setText("USE MAN PITCH TRIM"); me["FMA_ctr_msg"].setColor(0.7333,0.3803,0); me["FMA_ctr_msg"].show(); - } else if (getprop("/it-fbw/law") == 3) { + } else if (fbw_curlaw == 3) { me["FMA_ctr_msg"].setText("MAN PITCH TRIM ONLY"); me["FMA_ctr_msg"].setColor(1,0,0); me["FMA_ctr_msg"].show(); @@ -396,7 +461,7 @@ var canvas_PFD_base = { me["FMA_ctr_msg"].hide(); } me["FMA_combined"].show(); - if (getprop("/modes/pfd/fma/pitch-mode-box") == 1 and pitch_mode != " ") { + if (pitch_box.getValue() == 1 and pitch_mode_act != " ") { me["FMA_combined_box"].show(); } else { me["FMA_combined_box"].hide(); @@ -404,13 +469,13 @@ var canvas_PFD_base = { } else { me["FMA_combined"].hide(); me["FMA_combined_box"].hide(); - if (getprop("/it-fbw/law") == 2) { + if (fbw_curlaw == 2) { me["FMA_ctr_msg"].setText("USE MAN PITCH TRIM"); me["FMA_ctr_msg"].setColor(0.7333,0.3803,0); me["FMA_Middle1"].hide(); me["FMA_Middle2"].show(); me["FMA_ctr_msg"].show(); - } else if (getprop("/it-fbw/law") == 3) { + } else if (fbw_curlaw == 3) { me["FMA_ctr_msg"].setText("MAN PITCH TRIM ONLY"); me["FMA_ctr_msg"].setColor(1,0,0); me["FMA_Middle1"].hide(); @@ -422,40 +487,40 @@ var canvas_PFD_base = { me["FMA_Middle2"].hide(); } - if (ap1 or ap2 or fd1 or fd2) { + if (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1) { me["FMA_pitch"].show(); me["FMA_roll"].show(); } else { me["FMA_pitch"].hide(); me["FMA_roll"].hide(); } - if (getprop("/modes/pfd/fma/pitch-mode-box") == 1 and pitch_mode != " " and (ap1 or ap2 or fd1 or fd2)) { + if (pitch_box.getValue() == 1 and pitch_mode_act != " " and (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1)) { me["FMA_pitch_box"].show(); } else { me["FMA_pitch_box"].hide(); } - if (pitch_mode_armed == " " and pitch_mode2_armed == " ") { + if (pitch_mode_armed_act == " " and pitch_mode2_armed_act == " ") { me["FMA_pitcharm_box"].hide(); } else { - if ((getprop("/modes/pfd/fma/pitch-mode-armed-box") == 1 or getprop("/modes/pfd/fma/pitch-mode2-armed-box") == 1) and (ap1 or ap2 or fd1 or fd2)) { + if ((pitch_mode_armed_box.getValue() == 1 or pitch_mode2_armed_box.getValue() == 1) and (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1)) { me["FMA_pitcharm_box"].show(); } else { me["FMA_pitcharm_box"].hide(); } } - if (getprop("/modes/pfd/fma/roll-mode-box") == 1 and roll_mode != " " and (ap1 or ap2 or fd1 or fd2)) { + if (roll_mode_box.getValue() == 1 and roll_mode_act != " " and (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1)) { me["FMA_roll_box"].show(); } else { me["FMA_roll_box"].hide(); } - if (getprop("/modes/pfd/fma/roll-mode-armed-box") == 1 and roll_mode_armed != " " and (ap1 or ap2 or fd1 or fd2)) { + if (roll_mode_armed_box.getValue() == 1 and roll_mode_armed_act != " " and (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1)) { me["FMA_rollarm_box"].show(); } else { me["FMA_rollarm_box"].hide(); } } - if (ap1 or ap2 or fd1 or fd2) { + if (ap1.getValue() == 1 or ap2.getValue() == 1 or fd1.getValue() == 1 or fd2.getValue() == 1) { me["FMA_pitcharm"].show(); me["FMA_pitcharm2"].show(); me["FMA_rollarm"].show(); @@ -466,13 +531,13 @@ var canvas_PFD_base = { } # FMA Pitch - me["FMA_pitch"].setText(sprintf("%s", pitch_mode)); - me["FMA_pitcharm"].setText(sprintf("%s", pitch_mode_armed)); - me["FMA_pitcharm2"].setText(sprintf("%s", pitch_mode2_armed)); + me["FMA_pitch"].setText(sprintf("%s", pitch_mode_act)); + me["FMA_pitcharm"].setText(sprintf("%s", pitch_mode_armed_act)); + me["FMA_pitcharm2"].setText(sprintf("%s", pitch_mode2_armed_act)); # FMA Roll - me["FMA_roll"].setText(sprintf("%s", roll_mode)); - me["FMA_rollarm"].setText(sprintf("%s", roll_mode_armed)); + me["FMA_roll"].setText(sprintf("%s", roll_mode_act)); + me["FMA_rollarm"].setText(sprintf("%s", roll_mode_armed_act)); # FMA CAT DH me["FMA_catmode"].hide(); @@ -484,48 +549,48 @@ var canvas_PFD_base = { me["FMA_dh_box"].hide(); # FMA AP FD ATHR - me["FMA_ap"].setText(sprintf("%s", getprop("/modes/pfd/fma/ap-mode"))); - me["FMA_fd"].setText(sprintf("%s", getprop("/modes/pfd/fma/fd-mode"))); - me["FMA_athr"].setText(sprintf("%s", getprop("/modes/pfd/fma/at-mode"))); + me["FMA_ap"].setText(sprintf("%s", ap_mode.getValue())); + me["FMA_fd"].setText(sprintf("%s", fd_mode.getValue())); + me["FMA_athr"].setText(sprintf("%s", at_mode.getValue())); - if (getprop("/modes/pfd/fma/athr-armed") != 1) { + if (athr_arm.getValue() != 1) { me["FMA_athr"].setColor(0.8078,0.8039,0.8078); } else { me["FMA_athr"].setColor(0.0901,0.6039,0.7176); } - if (getprop("/modes/pfd/fma/ap-mode-box") == 1 and getprop("/modes/pfd/fma/ap-mode") != " ") { + if (ap_box.getValue() == 1 and ap_mode.getValue() != " ") { me["FMA_ap_box"].show(); } else { me["FMA_ap_box"].hide(); } - if (getprop("/modes/pfd/fma/fd-mode-box") == 1 and getprop("/modes/pfd/fma/fd-mode") != " ") { + if (fd_box.getValue() == 1 and fd_mode.getValue() != " ") { me["FMA_fd_box"].show(); } else { me["FMA_fd_box"].hide(); } - if (getprop("/modes/pfd/fma/athr-mode-box") == 1 and getprop("/modes/pfd/fma/at-mode") != " ") { + if (at_box.getValue() == 1 and at_mode.getValue() != " ") { me["FMA_athr_box"].show(); } else { me["FMA_athr_box"].hide(); } # QNH - if (getprop("/modes/altimeter/std") == 1) { + if (alt_std_mode.getValue() == 1) { me["QNH"].hide(); me["QNH_setting"].hide(); me["QNH_std"].show(); me["QNH_box"].show(); - } else if (getprop("/modes/altimeter/inhg") == 0) { - me["QNH_setting"].setText(sprintf("%4.0f", getprop("/instrumentation/altimeter/setting-hpa"))); + } else if (alt_inhg_mode.getValue() == 0) { + me["QNH_setting"].setText(sprintf("%4.0f", alt_hpa.getValue())); me["QNH"].show(); me["QNH_setting"].show(); me["QNH_std"].hide(); me["QNH_box"].hide(); - } else if (getprop("/modes/altimeter/inhg") == 1) { - me["QNH_setting"].setText(sprintf("%2.2f", getprop("/instrumentation/altimeter/setting-inhg"))); + } else if (alt_inhg_mode.getValue() == 1) { + me["QNH_setting"].setText(sprintf("%2.2f", alt_inhg.getValue())); me["QNH"].show(); me["QNH_setting"].show(); me["QNH_std"].hide(); @@ -534,27 +599,30 @@ var canvas_PFD_base = { }, updateCommonFast: func() { # Airspeed + ind_spd = ind_spd_kt.getValue(); # Subtract 30, since the scale starts at 30, but don"t allow less than 0, or more than 420 situations - if (getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") <= 30) { + if (ind_spd <= 30) { ASI = 0; - } else if (getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") >= 420) { + } else if (ind_spd >= 420) { ASI = 390; } else { - ASI = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") - 30; + ASI = ind_spd - 30; } - if (getprop("/FMGC/internal/maxspeed") <= 30) { + FMGC_max = FMGC_max_spd.getValue(); + if (FMGC_max <= 30) { ASImax = 0 - ASI; - } else if (getprop("/FMGC/internal/maxspeed") >= 420) { + } else if (FMGC_max >= 420) { ASImax = 390 - ASI; } else { - ASImax = getprop("/FMGC/internal/maxspeed") - 30 - ASI; + ASImax = FMGC_max - 30 - ASI; } me["ASI_scale"].setTranslation(0, ASI * 6.6); me["ASI_max"].setTranslation(0, ASImax * -6.6); - if (getprop("/instrumentation/airspeed-indicator/indicated-mach") >= 0.5) { + ind_mach = ind_spd_mach.getValue(); + if (ind_mach >= 0.5) { me["ASI_mach_decimal"].show(); me["ASI_mach"].show(); } else { @@ -562,13 +630,13 @@ var canvas_PFD_base = { me["ASI_mach"].hide(); } - if (getprop("/instrumentation/airspeed-indicator/indicated-mach") >= 0.999) { + if (ind_mach >= 0.999) { me["ASI_mach"].setText("999"); } else { - me["ASI_mach"].setText(sprintf("%3.0f", getprop("/instrumentation/airspeed-indicator/indicated-mach") * 1000)); + me["ASI_mach"].setText(sprintf("%3.0f", ind_mach * 1000)); } - if (getprop("/it-autoflight/input/spd-managed") == 1) { + if (managed_spd.getValue() == 1) { me["ASI_target"].setColor(0.6901,0.3333,0.7450); me["ASI_digit_UP"].setColor(0.6901,0.3333,0.7450); me["ASI_decimal_UP"].setColor(0.6901,0.3333,0.7450); @@ -582,15 +650,16 @@ var canvas_PFD_base = { me["ASI_decimal_DN"].setColor(0.0901,0.6039,0.7176); } - if (getprop("/FMGC/internal/target-ias-pfd") <= 30) { + tgt_ias = at_tgt_ias.getValue(); + if (tgt_ias <= 30) { ASItrgt = 0 - ASI; - } else if (getprop("/FMGC/internal/target-ias-pfd") >= 420) { + } else if (tgt_ias >= 420) { ASItrgt = 390 - ASI; } else { - ASItrgt = getprop("/FMGC/internal/target-ias-pfd") - 30 - ASI; + ASItrgt = tgt_ias - 30 - ASI; } - ASItrgtdiff = getprop("/FMGC/internal/target-ias-pfd") - getprop("/instrumentation/airspeed-indicator/indicated-speed-kt"); + ASItrgtdiff = tgt_ias - ind_spd; if (ASItrgtdiff >= -42 and ASItrgtdiff <= 42) { me["ASI_target"].setTranslation(0, ASItrgt * -6.6); @@ -600,12 +669,12 @@ var canvas_PFD_base = { me["ASI_decimal_DN"].hide(); me["ASI_target"].show(); } else if (ASItrgtdiff < -42) { - if (getprop("/it-autoflight/input/kts-mach") == 1) { - me["ASI_digit_DN"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/spd-mach") * 1000)); + if (at_mach_mode.getValue() == 1) { + me["ASI_digit_DN"].setText(sprintf("%3.0f", at_input_spd_mach.getValue() * 1000)); me["ASI_decimal_UP"].hide(); me["ASI_decimal_DN"].show(); } else { - me["ASI_digit_DN"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/spd-kts"))); + me["ASI_digit_DN"].setText(sprintf("%3.0f", at_input_spd_kts.getValue())); me["ASI_decimal_UP"].hide(); me["ASI_decimal_DN"].hide(); } @@ -613,12 +682,12 @@ var canvas_PFD_base = { me["ASI_digit_UP"].hide(); me["ASI_target"].hide(); } else if (ASItrgtdiff > 42) { - if (getprop("/it-autoflight/input/kts-mach") == 1) { - me["ASI_digit_UP"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/spd-mach") * 1000)); + if (at_mach_mode.getValue() == 1) { + me["ASI_digit_UP"].setText(sprintf("%3.0f", at_input_spd_mach.getValue() * 1000)); me["ASI_decimal_UP"].show(); me["ASI_decimal_DN"].hide(); } else { - me["ASI_digit_UP"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/spd-kts"))); + me["ASI_digit_UP"].setText(sprintf("%3.0f", at_input_spd_kts.getValue())); me["ASI_decimal_UP"].hide(); me["ASI_decimal_DN"].hide(); } @@ -627,7 +696,7 @@ var canvas_PFD_base = { me["ASI_target"].hide(); } - ASItrend = getprop("/instrumentation/pfd/speed-lookahead") - ASI; + ASItrend = speed_pred.getValue() - ASI; me["ASI_trend_up"].setTranslation(0, math.clamp(ASItrend, 0, 50) * -6.6); me["ASI_trend_down"].setTranslation(0, math.clamp(ASItrend, -50, 0) * -6.6); @@ -643,19 +712,19 @@ var canvas_PFD_base = { } # Attitude Indicator - pitch = getprop("/orientation/pitch-deg") or 0; - roll = getprop("/orientation/roll-deg") or 0; + pitch_cur = pitch.getValue(); + roll_cur = roll.getValue(); - me.AI_horizon_trans.setTranslation(0, pitch * 11.825); - me.AI_horizon_rot.setRotation(-roll * D2R, me["AI_center"].getCenter()); - me.AI_horizon_ground_trans.setTranslation(0, getprop("/instrumentation/pfd/horizon-ground") * 11.825); - me.AI_horizon_ground_rot.setRotation(-roll * D2R, me["AI_center"].getCenter()); - me.AI_horizon_sky_rot.setRotation(-roll * D2R, me["AI_center"].getCenter()); + me.AI_horizon_trans.setTranslation(0, pitch_cur * 11.825); + me.AI_horizon_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter()); + me.AI_horizon_ground_trans.setTranslation(0, horizon_ground.getValue() * 11.825); + me.AI_horizon_ground_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter()); + me.AI_horizon_sky_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter()); - me["AI_slipskid"].setTranslation(math.clamp(getprop("/instrumentation/slip-skid-ball/indicated-slip-skid"), -7, 7) * -15, 0); - me["AI_bank"].setRotation(-roll * D2R); + me["AI_slipskid"].setTranslation(math.clamp(skid_slip.getValue(), -7, 7) * -15, 0); + me["AI_bank"].setRotation(-roll_cur * D2R); - if (getprop("/it-fbw/law") == 0) { + if (fbw_law.getValue() == 0) { me["AI_bank_lim"].show(); me["AI_pitch_lim"].show(); me["AI_bank_lim_X"].hide(); @@ -667,33 +736,39 @@ var canvas_PFD_base = { me["AI_pitch_lim_X"].show(); } - if (getprop("/it-autoflight/fd/roll-bar") != nil) { - me["FD_roll"].setTranslation((getprop("/it-autoflight/fd/roll-bar")) * 2.2, 0); + fd_roll_cur = fd_roll.getValue(); + fd_pitch_cur = fd_pitch.getValue(); + if (fd_roll_cur != nil) { + me["FD_roll"].setTranslation((fd_roll_cur) * 2.2, 0); } - if (getprop("/it-autoflight/fd/pitch-bar") != nil) { - me["FD_pitch"].setTranslation(0, -(getprop("/it-autoflight/fd/pitch-bar")) * 3.8); + if (fd_pitch_cur != nil) { + me["FD_pitch"].setTranslation(0, -(fd_pitch_cur) * 3.8); } - me["AI_agl"].setText(sprintf("%s", math.round(getprop("/position/gear-agl-ft")))); + gear_agl_cur = gear_agl.getValue(); - if (getprop("/position/gear-agl-ft") <= getprop("/instrumentation/mk-viii/inputs/arinc429/decision-height")) { + me["AI_agl"].setText(sprintf("%s", math.round(gear_agl_cur))); + + if (gear_agl_cur <= decision.getValue()) { me["AI_agl"].setColor(0.7333,0.3803,0); } else { me["AI_agl"].setColor(0.0509,0.7529,0.2941); } - if (getprop("/position/gear-agl-ft") <= 2500) { + if (gear_agl_cur <= 2500) { me["AI_agl"].show(); } else { me["AI_agl"].hide(); } - me["AI_agl_g"].setRotation(-roll * D2R); + me["AI_agl_g"].setRotation(-roll_cur * D2R); - if ((wow1 or wow2) and getprop("/FMGC/status/phase") != 0 and getprop("/FMGC/status/phase") != 1) { + FMGCphase_act = FMGCphase.getValue(); + if ((wow1.getValue() == 1 or wow2.getValue() == 1) and FMGCphase_act != 0 and FMGCphase_act != 1) { me["AI_stick"].show(); me["AI_stick_pos"].show(); - } else if ((wow1 or wow2) and (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) and (getprop("/engines/engine[0]/state") == 3 or getprop("/engines/engine[1]/state") == 3)) { + + } else if ((wow1.getValue() == 1 or wow2.getValue() == 1) and (FMGCphase_act == 0 or FMGCphase_act == 1) and (eng0_state.getValue() == 3 or eng1_state.getValue() == 3)) { me["AI_stick"].show(); me["AI_stick_pos"].show(); } else { @@ -701,10 +776,10 @@ var canvas_PFD_base = { me["AI_stick_pos"].hide(); } - me["AI_stick_pos"].setTranslation(getprop("/controls/flight/aileron-input-fast") * 196.8, getprop("/controls/flight/elevator-input-fast") * 151.5); + me["AI_stick_pos"].setTranslation(aileron_input.getValue() * 196.8, elevator_input.getValue() * 151.5); # Altitude - me.altitude = getprop("/instrumentation/altimeter/indicated-altitude-ft"); + me.altitude = altitude.getValue(); me.altOffset = me.altitude / 500 - int(me.altitude / 500); me.middleAltText = roundaboutAlt(me.altitude / 100); me.middleAltOffset = nil; @@ -721,38 +796,40 @@ var canvas_PFD_base = { me["ALT_two"].setText(sprintf("%03d", abs(me.middleAltText-5))); me["ALT_one"].setText(sprintf("%03d", abs(me.middleAltText-10))); - me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd"))); - altTens = num(right(sprintf("%02d", getprop("/instrumentation/altimeter/indicated-altitude-ft")), 2)); + me["ALT_digits"].setText(sprintf("%s", altitude_pfd.getValue())); + altTens = num(right(sprintf("%02d", altitude.getValue()), 2)); me["ALT_tens"].setTranslation(0, altTens * 1.392); - if (getprop("/instrumentation/pfd/alt-diff") >= -565 and getprop("/instrumentation/pfd/alt-diff") <= 565) { - me["ALT_target"].setTranslation(0, (getprop("/instrumentation/pfd/alt-diff") / 100) * -48.66856); - me["ALT_target_digit"].setText(sprintf("%03d", math.round(getprop("/it-autoflight/internal/alt") / 100))); + ap_alt_cur = ap_alt.getValue(); + alt_diff_cur = alt_diff.getValue(); + if (alt_diff_cur >= -565 and alt_diff_cur <= 565) { + me["ALT_target"].setTranslation(0, (alt_diff_cur / 100) * -48.66856); + me["ALT_target_digit"].setText(sprintf("%03d", math.round(ap_alt_cur / 100))); me["ALT_digit_UP"].hide(); me["ALT_digit_DN"].hide(); me["ALT_target"].show(); - } else if (getprop("/instrumentation/pfd/alt-diff") < -565) { - if (getprop("/modes/altimeter/std") == 1) { - if (getprop("/it-autoflight/internal/alt") < 10000) { - me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100)); + } else if (alt_diff_cur < -565) { + if (alt_std_mode.getValue() == 1) { + if (ap_alt_cur < 10000) { + me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ ap_alt_cur / 100)); } else { - me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100)); + me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ ap_alt_cur / 100)); } } else { - me["ALT_digit_DN"].setText(sprintf("%5.0f", getprop("/it-autoflight/internal/alt"))); + me["ALT_digit_DN"].setText(sprintf("%5.0f", ap_alt_cur)); } me["ALT_digit_DN"].show(); me["ALT_digit_UP"].hide(); me["ALT_target"].hide(); - } else if (getprop("/instrumentation/pfd/alt-diff") > 565) { - if (getprop("/modes/altimeter/std") == 1) { - if (getprop("/it-autoflight/internal/alt") < 10000) { - me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100)); + } else if (alt_diff_cur > 565) { + if (alt_std_mode.getValue() == 1) { + if (ap_alt_cur < 10000) { + me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ ap_alt_cur / 100)); } else { - me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100)); + me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ ap_alt_cur / 100)); } } else { - me["ALT_digit_UP"].setText(sprintf("%5.0f", getprop("/it-autoflight/internal/alt"))); + me["ALT_digit_UP"].setText(sprintf("%5.0f", ap_alt_cur)); } me["ALT_digit_UP"].show(); me["ALT_digit_DN"].hide(); @@ -760,29 +837,30 @@ var canvas_PFD_base = { } # Vertical Speed - me["VS_pointer"].setRotation(getprop("/instrumentation/pfd/vs-needle") * D2R); + me["VS_pointer"].setRotation(vs_needle.getValue() * D2R); - me["VS_box"].setTranslation(0, getprop("/instrumentation/pfd/vs-digit-trans")); + me["VS_box"].setTranslation(0, vs_digit.getValue()); - if (getprop("/it-autoflight/internal/vert-speed-fpm-pfd") < 2) { + var vs_pfd_cur = ap_vs_pfd.getValue(); + if (vs_pfd_cur < 2) { me["VS_box"].hide(); } else { me["VS_box"].show(); } - if (getprop("/it-autoflight/internal/vert-speed-fpm-pfd") < 10) { - me["VS_digit"].setText(sprintf("%02d", "0" ~ getprop("/it-autoflight/internal/vert-speed-fpm-pfd"))); + if (vs_pfd_cur < 10) { + me["VS_digit"].setText(sprintf("%02d", "0" ~ vs_pfd_cur)); } else { - me["VS_digit"].setText(sprintf("%02d", getprop("/it-autoflight/internal/vert-speed-fpm-pfd"))); + me["VS_digit"].setText(sprintf("%02d", vs_pfd_cur)); } # ILS - me["LOC_pointer"].setTranslation(getprop("/instrumentation/nav[0]/heading-needle-deflection-norm") * 197, 0); + me["LOC_pointer"].setTranslation(loc.getValue() * 197, 0); - me["GS_pointer"].setTranslation(0, getprop("/instrumentation/nav[0]/gs-needle-deflection-norm") * -197); + me["GS_pointer"].setTranslation(0, gs.getValue() * -197); # Heading - me.heading = getprop("/instrumentation/pfd/heading-scale"); + me.heading = hdg_scale.getValue(); me.headOffset = me.heading / 10 - int(me.heading / 10); me.middleText = roundabout(me.heading / 10); me.middleOffset = nil; @@ -818,18 +896,20 @@ var canvas_PFD_base = { me["HDG_seven"].setFontSize(fontSizeHDG(me.rightText3), 1); me["HDG_one"].setFontSize(fontSizeHDG(me.leftText3), 1); - if (getprop("/it-autoflight/custom/show-hdg") == 1 and getprop("/instrumentation/pfd/hdg-diff") >= -23.62 and getprop("/instrumentation/pfd/hdg-diff") <= 23.62) { - me["HDG_target"].setTranslation((getprop("/instrumentation/pfd/hdg-diff") / 10) * 98.5416, 0); + show_hdg_act = show_hdg.getValue(); + hdg_diff_act = hdg_diff.getValue(); + if (show_hdg_act == 1 and hdg_diff_act >= -23.62 and hdg_diff_act <= 23.62) { + me["HDG_target"].setTranslation((hdg_diff_act / 10) * 98.5416, 0); me["HDG_digit_L"].hide(); me["HDG_digit_R"].hide(); me["HDG_target"].show(); - } else if (getprop("/it-autoflight/custom/show-hdg") == 1 and getprop("/instrumentation/pfd/hdg-diff") < -23.62 and getprop("/instrumentation/pfd/hdg-diff") >= -180) { - me["HDG_digit_L"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/hdg"))); + } else if (show_hdg_act == 1 and hdg_diff_act < -23.62 and hdg_diff_act >= -180) { + me["HDG_digit_L"].setText(sprintf("%3.0f", ap_hdg.getValue())); me["HDG_digit_L"].show(); me["HDG_digit_R"].hide(); me["HDG_target"].hide(); - } else if (getprop("/it-autoflight/custom/show-hdg") == 1 and getprop("/instrumentation/pfd/hdg-diff") > 23.62 and getprop("/instrumentation/pfd/hdg-diff") <= 180) { - me["HDG_digit_R"].setText(sprintf("%3.0f", getprop("/it-autoflight/input/hdg"))); + } else if (show_hdg_act == 1 and hdg_diff_act > 23.62 and hdg_diff_act <= 180) { + me["HDG_digit_R"].setText(sprintf("%3.0f", ap_hdg.getValue())); me["HDG_digit_R"].show(); me["HDG_digit_L"].hide(); me["HDG_target"].hide(); @@ -839,13 +919,13 @@ var canvas_PFD_base = { me["HDG_target"].hide(); } - me["TRK_pointer"].setTranslation((getprop("/instrumentation/pfd/track-hdg-diff") / 10) * 98.5416, 0); + me["TRK_pointer"].setTranslation((track_diff.getValue() / 10) * 98.5416, 0); me["CRS_pointer"].hide(); # AI HDG - me.AI_horizon_hdg_trans.setTranslation(me.middleOffset, getprop("/instrumentation/pfd/horizon-pitch") * 11.825); - me.AI_horizon_hdg_rot.setRotation(-roll * D2R, me["AI_center"].getCenter()); + me.AI_horizon_hdg_trans.setTranslation(me.middleOffset, horizon_pitch.getValue() * 11.825); + me.AI_horizon_hdg_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter()); me["AI_heading"].update(); }, }; @@ -858,17 +938,16 @@ var canvas_PFD_1 = { return m; }, update: func() { - fd1 = getprop("/it-autoflight/output/fd1"); - fd2 = getprop("/it-autoflight/output/fd2"); - pitch_mode = getprop("/modes/pfd/fma/pitch-mode"); - roll_mode = getprop("/modes/pfd/fma/roll-mode"); - pitch = getprop("/orientation/pitch-deg"); - roll = getprop("/orientation/roll-deg"); - wow1 = getprop("/gear/gear[1]/wow"); - wow2 = getprop("/gear/gear[2]/wow"); + fd1_act = fd1.getValue(); + pitch_mode_cur = pitch_mode.getValue(); + roll_mode_cur = roll_mode.getValue(); + pitch_cur = pitch.getValue(); + roll_cur = roll.getValue(); + wow1_act = wow1.getValue(); + wow2_act = wow2.getValue(); # Errors - if ((getprop("/instrumentation/adirs/adr[0]/active") == 1) or (getprop("/controls/switching/AIRDATA") == -1 and getprop("/instrumentation/adirs/adr[2]/active") == 1)) { + if ((adirs0_active.getValue() == 1) or (air_switch.getValue() == -1 and adirs2_active.getValue() == 1)) { me["ASI_group"].show(); me["ALT_group"].show(); me["ALT_group2"].show(); @@ -892,7 +971,7 @@ var canvas_PFD_1 = { me["VS_group"].hide(); } - if ((getprop("/instrumentation/adirs/ir[0]/aligned") == 1) or (getprop("/instrumentation/adirs/ir[2]/aligned") == 1 and getprop("/controls/switching/ATTHDG") == -1)) { + if ((ir0_aligned.getValue() == 1) or (ir2_aligned.getValue() == 1 and att_switch.getValue() == -1)) { me["AI_group"].show(); me["HDG_group"].show(); me["AI_error"].hide(); @@ -907,20 +986,20 @@ var canvas_PFD_1 = { } # FD - if (fd1 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { + if (fd1_act == 1 and ((!wow1_act and !wow2_act and roll_mode_cur != " ") or roll_mode_cur != " ") and ap_trk_sw.getValue() == 0 and pitch_cur < 25 and pitch_cur > -13 and roll_cur < 45 and roll_cur > -45) { me["FD_roll"].show(); } else { me["FD_roll"].hide(); } - if (fd1 == 1 and ((!wow1 and !wow2 and pitch_mode != " ") or pitch_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { + if (fd1_act == 1 and ((!wow1_act and !wow2_act and pitch_mode_cur != " ") or pitch_mode_cur != " ") and ap_trk_sw.getValue() == 0 and pitch_cur < 25 and pitch_cur > -13 and roll_cur < 45 and roll_cur > -45) { me["FD_pitch"].show(); } else { me["FD_pitch"].hide(); } # ILS - if (getprop("/modes/pfd/ILS1") == 1) { + if (ap_ils_mode.getValue() == 1) { me["LOC_scale"].show(); me["GS_scale"].show(); } else { @@ -928,12 +1007,12 @@ var canvas_PFD_1 = { me["GS_scale"].hide(); } - if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) { + if (ap_ils_mode.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) { me["LOC_pointer"].show(); } else { me["LOC_pointer"].hide(); } - if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) { + if (ap_ils_mode.getValue() == 1 and gs_in_range.getValue() == 1 and hasgs.getValue() == 1 and nav0_signalq.getValue() > 0.99) { me["GS_pointer"].show(); } else { me["GS_pointer"].hide(); @@ -954,17 +1033,16 @@ var canvas_PFD_2 = { return m; }, update: func() { - fd1 = getprop("/it-autoflight/output/fd1"); - fd2 = getprop("/it-autoflight/output/fd2"); - pitch_mode = getprop("/modes/pfd/fma/pitch-mode"); - roll_mode = getprop("/modes/pfd/fma/roll-mode"); - pitch = getprop("/orientation/pitch-deg"); - roll = getprop("/orientation/roll-deg"); - wow1 = getprop("/gear/gear[1]/wow"); - wow2 = getprop("/gear/gear[2]/wow"); + fd2_act = fd2.getValue(); + pitch_mode_cur = pitch_mode.getValue(); + roll_mode_cur = roll_mode.getValue(); + pitch_cur = pitch.getValue(); + roll_cur = roll.getValue(); + wow1_act = wow1.getValue(); + wow2_act = wow2.getValue(); # Errors - if ((getprop("/instrumentation/adirs/adr[1]/active") == 1) or (getprop("/controls/switching/AIRDATA") == 1 and getprop("/instrumentation/adirs/adr[2]/active") == 1)) { + if ((adirs1_active.getValue() == 1) or (air_switch.getValue() == 1 and adirs2_active.getValue() == 1)) { me["ASI_group"].show(); me["ALT_group"].show(); me["ALT_group2"].show(); @@ -988,7 +1066,7 @@ var canvas_PFD_2 = { me["VS_group"].hide(); } - if ((getprop("/instrumentation/adirs/ir[1]/aligned") == 1) or (getprop("/instrumentation/adirs/ir[2]/aligned") == 1 and getprop("/controls/switching/ATTHDG") == 1)) { + if ((ir1_aligned.getValue() == 1) or (ir2_aligned.getValue() == 1 and att_switch.getValue() == 1)) { me["AI_group"].show(); me["HDG_group"].show(); me["AI_error"].hide(); @@ -1003,20 +1081,20 @@ var canvas_PFD_2 = { } # FD - if (fd2 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { + if (fd2_act == 1 and ((!wow1_act and !wow2_act and roll_mode_cur != " ") or roll_mode_cur != " ") and ap_trk_sw.getValue() == 0 and pitch_cur < 25 and pitch_cur > -13 and roll_cur < 45 and roll_cur > -45) { me["FD_roll"].show(); } else { me["FD_roll"].hide(); } - if (fd2 == 1 and ((!wow1 and !wow2 and pitch_mode != " ") or pitch_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { + if (fd2_act == 1 and ((!wow1_act and !wow2_act and pitch_mode_cur != " ") or pitch_mode_cur != " ") and ap_trk_sw.getValue() == 0 and pitch_cur < 25 and pitch_cur > -13 and roll_cur < 45 and roll_cur > -45) { me["FD_pitch"].show(); } else { me["FD_pitch"].hide(); } # ILS - if (getprop("/modes/pfd/ILS2") == 1) { + if (ap_ils_mode2.getValue() == 1) { me["LOC_scale"].show(); me["GS_scale"].show(); } else { @@ -1024,12 +1102,12 @@ var canvas_PFD_2 = { me["GS_scale"].hide(); } - if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) { + if (ap_ils_mode2.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) { me["LOC_pointer"].show(); } else { me["LOC_pointer"].hide(); } - if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) { + if (ap_ils_mode2.getValue() == 1 and gs_in_range.getValue() == 1 and hasgs.getValue() == 1 and nav0_signalq.getValue() > 0.99) { me["GS_pointer"].show(); } else { me["GS_pointer"].hide(); @@ -1069,10 +1147,14 @@ var canvas_PFD_1_test = { return ["Test_white","Test_text"]; }, update: func() { - if (getprop("/instrumentation/du/du1-test-time") + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") != 1) { + et = elapsedtime.getValue() or 0; + if ((du1_test_time.getValue() + 1 >= et) and cpt_du_xfr.getValue() != 1) { me["Test_white"].show(); me["Test_text"].hide(); - } else if (getprop("/instrumentation/du/du2-test-time") + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") == 1) { + } else if ((du2_test_time.getValue() + 1 >= et) and cpt_du_xfr.getValue() != 0) { + print(du2_test_time.getValue()); + print(elapsedtime.getValue()); + print(cpt_du_xfr.getValue()); me["Test_white"].show(); me["Test_text"].hide(); } else { @@ -1109,10 +1191,11 @@ var canvas_PFD_2_test = { return ["Test_white","Test_text"]; }, update: func() { - if (getprop("/instrumentation/du/du6-test-time") + 1 >= elapsedtime and getprop("/modes/fo-du-xfr") != 1) { + et = elapsedtime.getValue() or 0; + if ((du6_test_time.getValue() + 1 >= et) and fo_du_xfr.getValue() != 1) { me["Test_white"].show(); me["Test_text"].hide(); - } else if (getprop("/instrumentation/du/du5-test-time") + 1 >= elapsedtime and getprop("/modes/fo-du-xfr") == 1) { + } else if ((du5_test_time.getValue() + 1 >= et) and fo_du_xfr.getValue() != 0) { me["Test_white"].show(); me["Test_text"].hide(); } else { @@ -1149,7 +1232,7 @@ var canvas_PFD_1_mismatch = { return ["ERRCODE"]; }, update: func() { - me["ERRCODE"].setText(getprop("/systems/acconfig/mismatch-code")); + me["ERRCODE"].setText(acconfig_mismatch.getValue()); }, }; @@ -1180,7 +1263,7 @@ var canvas_PFD_2_mismatch = { return ["ERRCODE"]; }, update: func() { - me["ERRCODE"].setText(getprop("/systems/acconfig/mismatch-code")); + me["ERRCODE"].setText(acconfig_mismatch.getValue()); }, }; @@ -1215,14 +1298,15 @@ setlistener("sim/signals/fdm-initialized", func { PFD_update.start(); PFD_update_fast.start(); - if (getprop("/systems/acconfig/options/pfd-rate") > 1) { + + if (pfdrate.getValue() == 1) { rateApply(); } }); var rateApply = func { - PFD_update.restart(0.15 * getprop("/systems/acconfig/options/pfd-rate")); - PFD_update_fast.restart(0.05 * getprop("/systems/acconfig/options/pfd-rate")); + PFD_update.restart(0.15 * pfdrate.getValue()); + PFD_update_fast.restart(0.05 * pfdrate.getValue()); } var PFD_update = maketimer(0.15, func { @@ -1260,4 +1344,4 @@ var fontSizeHDG = func(input) { } else { return 32; } -}; +}; \ No newline at end of file diff --git a/revision.txt b/revision.txt index 3231dc6f..67cb751d 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4641 \ No newline at end of file +4642 \ No newline at end of file