diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index e579f1ff..7bb54580 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -95,20 +95,22 @@ var canvas_MCDU_base = { }, update: func() { if (getprop("/systems/electrical/bus/ac1") >= 110) { - MCDU_1.page.show(); MCDU_1.update(); + MCDU_1.updateFast(); updateL = 1; + MCDU_1.page.show(); } else { - MCDU_1.page.hide(); updateL = 0; + MCDU_1.page.hide(); } if (getprop("/systems/electrical/bus/ac2") >= 110) { - MCDU_2.page.show(); MCDU_2.update(); + MCDU_2.updateFast(); updateR = 1; + MCDU_2.page.show(); } else { - MCDU_2.page.hide(); updateR = 0; + MCDU_2.page.hide(); } }, updateFast: func() { diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas index 73c6eceb..374085b2 100644 --- a/Models/Instruments/ND/canvas/framework/navdisplay.nas +++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas @@ -447,22 +447,18 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec var vorheading = userHdgTru; var adfheading = userHdgMag; } - if (getprop("/instrumentation/nav[2]/heading-deg") != nil and me.get_switch("toggle_true_north") == 0) { - var nav0hdg = getprop("/instrumentation/nav[2]/heading-deg") - getprop("/orientation/heading-magnetic-deg"); - } else if (getprop("/instrumentation/nav[2]/heading-deg") != nil and me.get_switch("toggle_true_north") == 1) { + if (getprop("/instrumentation/nav[2]/heading-deg") != nil) { var nav0hdg = getprop("/instrumentation/nav[2]/heading-deg") - getprop("/orientation/heading-deg"); } else { var nav0hdg = 0; } - if (getprop("/instrumentation/nav[3]/heading-deg") != nil and me.get_switch("toggle_true_north") == 0) { - var nav1hdg = getprop("/instrumentation/nav[3]/heading-deg") - getprop("/orientation/heading-magnetic-deg"); - } else if (getprop("/instrumentation/nav[3]/heading-deg") != nil and me.get_switch("toggle_true_north") == 1) { + if (getprop("/instrumentation/nav[3]/heading-deg") != nil) { var nav1hdg = getprop("/instrumentation/nav[3]/heading-deg") - getprop("/orientation/heading-deg"); } else { var nav1hdg = 0; } - var adf0hdg=getprop("instrumentation/adf/indicated-bearing-deg"); - var adf1hdg=getprop("instrumentation/adf[1]/indicated-bearing-deg"); + var adf0hdg = getprop("instrumentation/adf/indicated-bearing-deg"); + var adf1hdg = getprop("instrumentation/adf[1]/indicated-bearing-deg"); if(!me.get_switch("toggle_centered")) { if(me.in_mode("toggle_display_mode", ["PLAN"])) diff --git a/Models/Instruments/ND/canvas/res/airbusNDNoMap.png b/Models/Instruments/ND/canvas/res/airbusNDNoMap.png deleted file mode 100644 index d8ca13ac..00000000 Binary files a/Models/Instruments/ND/canvas/res/airbusNDNoMap.png and /dev/null differ diff --git a/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg b/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg deleted file mode 100644 index 520a97a8..00000000 --- a/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg +++ /dev/null @@ -1,236 +0,0 @@ - - - -image/svg+xmlGijs de Rooy--- ---- -GS -TAS -NO MAP AVAIL -HDG - \ No newline at end of file diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index ebfea309..01865e2c 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -163,59 +163,61 @@ var canvas_PFD_base = { 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) { - PFD_1.page.hide(); - PFD_1_test.page.show(); 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) { - PFD_1.page.hide(); - PFD_1_test.page.show(); PFD_1_test.update(); updateL = 0; + PFD_1.page.hide(); + PFD_1_test.page.show(); } else { + PFD_1.updateFast(); + PFD_1.update(); + updateL = 1; PFD_1_test.page.hide(); PFD_1.page.show(); - PFD_1.updateFast(); - updateL = 1; } } else { + updateL = 0; PFD_1_test.page.hide(); PFD_1.page.hide(); - updateL = 0; } 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) { - PFD_2.page.hide(); - PFD_2_test.page.show(); 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) { - PFD_2.page.hide(); - PFD_2_test.page.show(); PFD_2_test.update(); updateR = 0; + PFD_2.page.hide(); + PFD_2_test.page.show(); } else { + PFD_2.updateFast(); + PFD_2.update(); + updateR = 1; PFD_2_test.page.hide(); PFD_2.page.show(); - PFD_2.updateFast(); - updateR = 1; } } else { + updateR = 0; PFD_2_test.page.hide(); PFD_2.page.hide(); - updateR = 0; } } else { + updateL = 0; + updateR = 0; PFD_1_test.page.hide(); PFD_1.page.hide(); PFD_2_test.page.hide(); PFD_2.page.hide(); - PFD_1_mismatch.page.show(); - PFD_2_mismatch.page.show(); PFD_1_mismatch.update(); PFD_2_mismatch.update(); - updateL = 0; - updateR = 0; + PFD_1_mismatch.page.show(); + PFD_2_mismatch.page.show(); } }, updateSlow: func() { diff --git a/revision.txt b/revision.txt index 9f85bfe1..1b4cea18 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4615 \ No newline at end of file +4617 \ No newline at end of file