From 328b11980c19e86f743d688cb541815616f622e6 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Mon, 2 Aug 2021 17:47:42 +0100 Subject: [PATCH 01/31] Remove battery failure --- A320-main.xml | 2 -- AircraftConfig/fail.xml | 20 -------------------- Nasal/Systems/electrical.nas | 4 ---- Systems/a320-electrical.xml | 24 ++++++++++-------------- 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 1905d347..e37243c5 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -1298,8 +1298,6 @@ 0 0 0 - 0 - 0 0 0 0 diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index 2f821e17..aaf02c67 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -412,26 +412,6 @@ true - - - left - /systems/failures/electrical/bat-1 - - dialog-apply - - true - - - - - left - /systems/failures/electrical/bat-2 - - dialog-apply - - true - - left diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas index 2849bb63..300cfc89 100644 --- a/Nasal/Systems/electrical.nas +++ b/Nasal/Systems/electrical.nas @@ -32,8 +32,6 @@ var ELEC = { acEssBusFault: props.globals.getNode("/systems/failures/electrical/ac-ess-bus"), ac1BusFault: props.globals.getNode("/systems/failures/electrical/ac-1-bus"), ac2BusFault: props.globals.getNode("/systems/failures/electrical/ac-2-bus"), - bat1Fault: props.globals.getNode("/systems/failures/electrical/bat-1"), - bat2Fault: props.globals.getNode("/systems/failures/electrical/bat-2"), dcEssBusFault: props.globals.getNode("/systems/failures/electrical/dc-ess-bus"), dc1BusFault: props.globals.getNode("/systems/failures/electrical/dc-1-bus"), dc2BusFault: props.globals.getNode("/systems/failures/electrical/dc-2-bus"), @@ -194,8 +192,6 @@ var ELEC = { me.Fail.acEssBusFault.setBoolValue(0); me.Fail.ac1BusFault.setBoolValue(0); me.Fail.ac2BusFault.setBoolValue(0); - me.Fail.bat1Fault.setBoolValue(0); - me.Fail.bat2Fault.setBoolValue(0); me.Fail.dcEssBusFault.setBoolValue(0); me.Fail.dc1BusFault.setBoolValue(0); me.Fail.dc2BusFault.setBoolValue(0); diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index e9f1d84f..95ebf1db 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -25,14 +25,12 @@ /systems/electrical/sources/bat-1/percent - /systems/failures/electrical/bat-1 - 0 1 - 0 0.0 0.0 - 10 24.0 4.0 - 50 25.5 5.0 - 85 26.5 6.0 - 100 31.0 7.0 + 0 0.0 + 10 24.0 + 50 25.5 + 85 26.5 + 100 31.0
@@ -270,14 +268,12 @@ /systems/electrical/sources/bat-2/percent - /systems/failures/electrical/bat-2 - 0 1 - 0 0.0 0.0 - 10 24.0 4.0 - 50 25.5 5.0 - 85 26.5 6.0 - 100 31.0 7.0 + 0 0.0 + 10 24.0 + 50 25.5 + 85 26.5 + 100 31.0
From 2611f3d3a210155bca8e84e0f32aea2af2e0ba37 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 12:00:39 +0100 Subject: [PATCH 02/31] Hydraulics: init with some accumulator pressure --- Nasal/Systems/hydraulics.nas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Nasal/Systems/hydraulics.nas b/Nasal/Systems/hydraulics.nas index 7e75f138..9de480f2 100644 --- a/Nasal/Systems/hydraulics.nas +++ b/Nasal/Systems/hydraulics.nas @@ -7,7 +7,7 @@ var HYD = { lcont: 0, rcont: 0, Brakes: { - accumPressPsi: props.globals.initNode("/systems/hydraulic/yellow-accumulator-psi-cmd", 0, "INT"), + accumPressPsi: props.globals.initNode("/systems/hydraulic/yellow-accumulator-psi-cmd", 3000, "INT"), leftPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-left-psi", 0, "INT"), rightPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-right-psi", 0, "INT"), mode: props.globals.initNode("/systems/hydraulic/brakes/mode", 0, "INT"), @@ -74,6 +74,7 @@ var HYD = { me.Switch.rat.setValue(0); me.Switch.yellowEDP.setValue(1); me.Switch.yellowElec.setValue(0); + me.Brakes.accumPressPsi.setValue(3000); }, resetFail: func() { me.Fail.blueElec.setBoolValue(0); @@ -109,7 +110,7 @@ var HYD = { me.Brakes.accumPressPsi.setValue(0); } } - + # Braking Pressure if (notification.brakesMode == 1 or (notification.brakesMode == 2 and notification.green >= 2500)) { # Normal braking - Green OK From c7f2ebdc959a038edf0fa99326b3d8445d0e4c8d Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 14:02:25 +0100 Subject: [PATCH 03/31] PFD: add tailstrike indicator --- Models/Instruments/PFD/PFD.nas | 8 +++++++- Models/Instruments/PFD/res/pfd.svg | 15 +++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index e5c2fee4..4fd4074b 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -221,7 +221,7 @@ var canvas_PFD_base = { "AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP", "ALT_digit_DN","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale", "HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L", - "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate"]; + "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd"]; }, off: 0, on: 0, @@ -395,6 +395,12 @@ var canvas_PFD_base = { me["AI_agl"].setText(sprintf("%s", math.round(math.clamp(gear_agl_cur, 0, 2500)))); + if (gear_agl_cur < 400 and pts.Velocities.groundspeed.getValue() > 50 and pts.Controls.Engines.Engine.throttlePos[0].getValue() < 0.78 and pts.Controls.Engines.Engine.throttlePos[1].getValue() < 0.78) { + me["tailstrikeInd"].show(); + } else { + me["tailstrikeInd"].hide(); + } + if (fmgc.FMGCInternal.phase < 3 or fmgc.flightPlanController.arrivalDist >= 250) { me["FMA_dh_box"].hide(); me["FMA_dh"].hide(); diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index 23653432..7eb9c07a 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -41,9 +41,9 @@ inkscape:window-maximized="1" inkscape:window-y="-8" inkscape:window-x="-8" - inkscape:cy="683.12157" - inkscape:cx="1026.1197" - inkscape:zoom="1.8101934" + inkscape:cy="876.13786" + inkscape:cx="522.86542" + inkscape:zoom="5.6568542" showgrid="true" id="namedview371" inkscape:window-height="705" @@ -580,6 +580,13 @@ id="path886" d="m 448.25473,1194.8172 66.90422,59.142 h -59.49742 v -14.7583 h 11.11022 l -18.51702,-19.615 -18.51702,19.615 h 11.11022 v 14.7583 h -59.49741 z" style="fill:none;stroke:#ff0000;stroke-width:7.42499971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + G - Date: Tue, 3 Aug 2021 16:14:37 +0100 Subject: [PATCH 04/31] Remove un-needed file --- A320-main.xml | 1 - Nasal/MCDU/DATA.nas | 12 ++++++++++++ Nasal/MCDU/DATA2.nas | 15 --------------- 3 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 Nasal/MCDU/DATA2.nas diff --git a/A320-main.xml b/A320-main.xml index e37243c5..84da58bb 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -4731,7 +4731,6 @@ Aircraft/A320-family/Nasal/MCDU/PERFTO.nas Aircraft/A320-family/Nasal/MCDU/RADNAV.nas Aircraft/A320-family/Nasal/MCDU/DATA.nas - Aircraft/A320-family/Nasal/MCDU/DATA2.nas Aircraft/A320-family/Nasal/MCDU/STATUS.nas diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas index 8093bcc3..7afe6763 100644 --- a/Nasal/MCDU/DATA.nas +++ b/Nasal/MCDU/DATA.nas @@ -60,3 +60,15 @@ var printInput2 = func(key, i) { setprop("FMGC/print/mcdu/page2/R4req", 1); } } + +var data2Input = func(key, i) { + if (key == "L5") { + if (canvas_mcdu.myCLBWIND[i] == nil) { + canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i); + } else { + canvas_mcdu.myCLBWIND[i].reload(); + } + fmgc.windController.accessPage[i] = "DATA2"; + setprop("MCDU[" ~ i ~ "]/page", "WINDCLB"); + } +} diff --git a/Nasal/MCDU/DATA2.nas b/Nasal/MCDU/DATA2.nas deleted file mode 100644 index 650f8bd7..00000000 --- a/Nasal/MCDU/DATA2.nas +++ /dev/null @@ -1,15 +0,0 @@ -# A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) - -# Copyright (c) 2020 Matthew Maring (mattmaring) - -var data2Input = func(key, i) { - if (key == "L5") { - if (canvas_mcdu.myCLBWIND[i] == nil) { - canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i); - } else { - canvas_mcdu.myCLBWIND[i].reload(); - } - fmgc.windController.accessPage[i] = "DATA2"; - setprop("MCDU[" ~ i ~ "]/page", "WINDCLB"); - } -} From 22b76cf0a8643c041a4037df140b427606564686 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 16:17:20 +0100 Subject: [PATCH 05/31] mcdu_reset should reset trans altitude --- Nasal/MCDU/MCDU.nas | 1 + 1 file changed, 1 insertion(+) diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index 5e130ad7..29e5a1af 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -168,6 +168,7 @@ var MCDU_reset = func(i) { setprop("/FMGC/internal/eng-out-reduc", "1500"); setprop("/MCDUC/reducacc-set", 0); fmgc.FMGCInternal.transAlt = 18000; + fmgc.FMGCInternal.transAltSet = 0; # CLB PERF setprop("/FMGC/internal/activate-once", 0); From 250d177d1723ec75a9539cbaeb0121dd4d885f60 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 16:56:35 +0100 Subject: [PATCH 06/31] Add trigonometric wind speed calculation to navdisplay; bugfix WPT / DECEL symbol files; correct how the wind arrow / TAS / GS display on the ND and improve the dashed route line --- Models/Instruments/ND/canvas/map/DECEL.symbol | 3 +- .../ND/canvas/map/WPT-airbus.symbol | 2 +- Models/Instruments/ND/canvas/style.nas | 49 ++++----- Nasal/Libraries/property-tree-setup.nas | 4 + Systems/a320-adr.xml | 2 +- Systems/libraries.xml | 8 -- Systems/pfd.xml | 103 ++++++++++++++++++ 7 files changed, 130 insertions(+), 41 deletions(-) diff --git a/Models/Instruments/ND/canvas/map/DECEL.symbol b/Models/Instruments/ND/canvas/map/DECEL.symbol index c0a65b20..37a70536 100644 --- a/Models/Instruments/ND/canvas/map/DECEL.symbol +++ b/Models/Instruments/ND/canvas/map/DECEL.symbol @@ -23,8 +23,7 @@ var init = func { var draw = func{ if(me.decel_grp != nil){ var spd_ctrl = getprop(me.options.spd_ctrl); - var spd_managed = (spd_ctrl == me.options.managed_val); - if(spd_managed) + if(spd_ctrl) me.decel_grp.setColor(me.style.managed_color); else me.decel_grp.setColor(me.style.selected_color); diff --git a/Models/Instruments/ND/canvas/map/WPT-airbus.symbol b/Models/Instruments/ND/canvas/map/WPT-airbus.symbol index 439e8e1e..7d00e465 100644 --- a/Models/Instruments/ND/canvas/map/WPT-airbus.symbol +++ b/Models/Instruments/ND/canvas/map/WPT-airbus.symbol @@ -82,7 +82,7 @@ var draw = func{ var wp_group = me.element; var alt = me.model.alt; var i = me.model.idx; - var vnav_actv = getprop(me.options.ver_ctrl) == me.options.managed_val; + var vnav_actv = getprop(me.options.spd_ctrl) == 1; var curwp = getprop(me.options.current_wp); if(alt > 0){ var wp_d = me.model.wp.distance_along_route; diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas index 4e8205ef..eca9b7b4 100644 --- a/Models/Instruments/ND/canvas/style.nas +++ b/Models/Instruments/ND/canvas/style.nas @@ -529,7 +529,7 @@ canvas.NDStyles["Airbus"] = { var lat_ctrl = getprop(me.options.lat_ctrl); var is_managed = (lat_ctrl == me.options.managed_val); var is_active = getprop(me.options.fplan_active); - (is_managed and is_active ? [] : [32, 16]); + (is_managed and is_active ? [] : [12, 12]); }, line_dash_alternate_active: [32,16], line_dash_temporary: [32,16], @@ -561,6 +561,7 @@ canvas.NDStyles["Airbus"] = { "fplan_active", "lat_ctrl", "ver_ctrl", + "spd_ctrl", "current_wp", "wp_count", "dep_rwy", @@ -758,21 +759,14 @@ canvas.NDStyles["Airbus"] = { id: "tas", impl: { init: func(nd,symbol), - predicate: func(nd) nd.aircraft_source.get_spd() > 100, + predicate: func(nd) getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 60, is_true: func(nd) { - nd.symbols.tas.setText(sprintf("%3.0f",getprop("/velocities/TAS") )); + nd.symbols.tas.setText(sprintf("%3.0f",getprop("/instrumentation/airspeed-indicator/true-speed-kt"))); nd.symbols.tas.show(); }, - is_false: func(nd) nd.symbols.tas.hide(), - }, - }, - { - id: "tasLbl", - impl: { - init: func(nd,symbol), - predicate: func(nd) nd.aircraft_source.get_spd() > 100, - is_true: func(nd) nd.symbols.tasLbl.show(), - is_false: func(nd) nd.symbols.tasLbl.hide(), + is_false: func(nd){ + nd.symbols.tas.setText("---"); + } }, }, { @@ -1006,12 +1000,6 @@ canvas.NDStyles["Airbus"] = { impl: { init: func(nd,symbol), common: func(nd) nd.symbols.gs.setText(sprintf("%3.0f",nd.aircraft_source.get_gnd_spd() )), - predicate: func(nd) nd.aircraft_source.get_gnd_spd() >= 30, - is_true: func(nd) { - #nd.symbols.gs.show(); - nd.symbols.gs.setFontSize(36); - }, - is_false: func(nd) {},#nd.symbols.gs.hide(), }, }, { @@ -1341,7 +1329,7 @@ canvas.NDStyles["Airbus"] = { nd.get_switch("toggle_display_mode") == "MAP" and !nd.get_switch("toggle_centered") and (nd.change_phase != 1) and ( - getprop(nd.options.defaults.lat_ctrl) != nd.options.defaults.managed_val or + getprop(nd.options.defaults.lat_ctrl) == 0 or nd.get_switch("toggle_trk_line") ) }, @@ -1357,7 +1345,8 @@ canvas.NDStyles["Airbus"] = { init: func(nd,symbol), predicate: func(nd) (nd.in_mode("toggle_display_mode", ["APP","VOR","MAP"]) and nd.get_switch("toggle_centered") and (nd.change_phase != 1) - and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))), + and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting)) + and abs(nd.aircraft_source.get_trk_mag() - nd.aircraft_source.get_hdg_mag()) <= 42), is_true: func(nd) { nd.symbols.trkInd2.show(); nd.symbols.trkInd2.setRotation((nd.aircraft_source.get_trk_mag()-nd.aircraft_source.get_hdg_mag())*D2R); @@ -1371,7 +1360,7 @@ canvas.NDStyles["Airbus"] = { init: func(nd,symbol), predicate: func(nd) (nd.get_switch("toggle_display_mode") == "MAP" and nd.get_switch("toggle_centered") and (nd.change_phase != 1) and - getprop(nd.options.defaults.lat_ctrl) != nd.options.defaults.managed_val and + getprop(nd.options.defaults.lat_ctrl) == 0 and (nd.adirs_property.getValue() == 1 or (adirs_3.getValue() == 1 and att_switch.getValue() == nd.attitude_heading_setting))), is_true: func(nd) { nd.symbols.trkline2.show(); @@ -1530,24 +1519,26 @@ canvas.NDStyles["Airbus"] = { id:"wind", impl: { init: func(nd,symbol), - predicate: ALWAYS, + predicate: func(nd) (getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 100), is_true: func(nd) { - var windDir = getprop("environment/wind-from-heading-deg"); - if(!nd.get_switch("toggle_true_north")) + var windDir = pts.Instrumentation.PFD.windDirection.getValue() or 0; + if(nd.get_switch("toggle_true_north")) windDir = windDir + getprop("environment/magnetic-variation-deg"); - nd.symbols.wind.setText(sprintf("%03.0f / %02.0f",windDir,getprop("environment/wind-speed-kt"))); + nd.symbols.wind.setText(sprintf("%03.0f / %02.0f",windDir,pts.Instrumentation.PFD.windSpeed.getValue() or 0)); }, - is_false: NOTHING, + is_false: func(nd) { + nd.symbols.wind.setText("---/--"); + } }, }, { id:"windArrow", impl: { init: func(nd,symbol), - predicate: func(nd) (!(nd.in_mode("toggle_display_mode", ["PLAN"]) and (nd.get_switch("toggle_display_type") == "LCD"))), + predicate: func(nd) (!(nd.in_mode("toggle_display_mode", ["PLAN"]) and (nd.get_switch("toggle_display_type") == "LCD")) and (pts.Instrumentation.PFD.windSpeed.getValue() or 0) >= 2 and getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 100), is_true: func(nd) { nd.symbols.windArrow.show(); - var windArrowRot = getprop("environment/wind-from-heading-deg"); + var windArrowRot = pts.Instrumentation.PFD.windDirection.getValue() or 0; if(nd.in_mode("toggle_display_mode", ["MAP","PLAN"])) { if(nd.get_switch("toggle_true_north")) windArrowRot = windArrowRot - nd.aircraft_source.get_trk_tru(); diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index 73ee448e..50c3e756 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -204,6 +204,10 @@ var Instrumentation = { gsDeflection: props.globals.getNode("/instrumentation/nav[0]/gs-needle-deflection-norm"), locDeflection: props.globals.getNode("/instrumentation/nav[0]/heading-needle-deflection-norm"), }, + PFD: { + windDirection: props.globals.getNode("/instrumentation/pfd/wind-direction"), + windSpeed: props.globals.getNode("/instrumentation/pfd/wind-speed"), + }, TCAS: { servicable: props.globals.getNode("/instrumentation/tcas/serviceable"), Inputs: { diff --git a/Systems/a320-adr.xml b/Systems/a320-adr.xml index 1946e513..a1fa63a3 100644 --- a/Systems/a320-adr.xml +++ b/Systems/a320-adr.xml @@ -530,7 +530,7 @@ /systems/navigation/probes/tat-1/tat - /velocities/TAS + /instrumentation/airspeed-indicator/true-speed-kt 2 7569 diff --git a/Systems/libraries.xml b/Systems/libraries.xml index fecc9de2..16092c98 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -608,14 +608,6 @@ /systems/pressurization/targetvs - - TAS - gain - 1.0 - /instrumentation/airspeed-indicator/true-speed-kt - /velocities/TAS - - LBtoKG gain diff --git a/Systems/pfd.xml b/Systems/pfd.xml index 733054dc..a4741f0a 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -573,5 +573,108 @@ /instrumentation/iesi/pitch-deg + + + Wind East + gain + 1.0 + + + + + /velocities/speed-east-fps + 0.592484 + + + /orientation/pitch-deg + /orientation/heading-deg + + /systems/navigation/adr/output/tas-3 + + + + + + /instrumentation/pfd/wind-speed-east + -4096 + 4096 + + + + Wind North + gain + 1.0 + + + + + /velocities/speed-north-fps + 0.592484 + + + /orientation/pitch-deg + /orientation/heading-deg + + /systems/navigation/adr/output/tas-3 + + + + + + /instrumentation/pfd/wind-speed-north + -4096 + 4096 + + + Wind Direction + exponential + 1.28 + + + + + + /instrumentation/pfd/wind-speed-east + /instrumentation/pfd/wind-speed-north + + + 180 + + + + /instrumentation/pfd/wind-direction + + 0 + 360 + + + + + Wind Speed + exponential + 1.28 + + + + + + /instrumentation/pfd/wind-speed-east + 2 + + + /instrumentation/pfd/wind-speed-north + 2 + + + + + + /instrumentation/pfd/wind-speed + 0 + 256 + + From 352c64b930c71e09941ee74cc40dbf0a165e1264 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 18:44:22 +0100 Subject: [PATCH 07/31] Fix the track line / indicator --- .../ND/canvas/framework/navdisplay.nas | 9 +-- Models/Instruments/ND/canvas/res/airbusND.svg | 72 +++++++++---------- Models/Instruments/ND/canvas/style.nas | 56 +++++++-------- 3 files changed, 64 insertions(+), 73 deletions(-) diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas index bca19f6c..2693461b 100644 --- a/Models/Instruments/ND/canvas/framework/navdisplay.nas +++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas @@ -225,7 +225,7 @@ canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update # anything that needs updatecenter called, should be added to the vector here # foreach(var element; ["staFromL2","staToL2","staFromR2","staToR2", - "hdgTrk","trkInd","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","curHdgPtr", + "hdgTrk","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","curHdgPtr", "HdgBugCRT2","TrkBugLCD2","HdgBugLCD2","hdgBug2","selHdgLine","selHdgLine2","curHdgPtr2", "staToL","staFromL","staToR","staFromR"] ) me.symbols[element] = me.nd.getElementById(element).updateCenter(); @@ -613,13 +613,11 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec if((me.in_mode("toggle_display_mode", ["MAP"]) and me.get_switch("toggle_display_type") == "CRT") or (me.get_switch("toggle_track_heading") and me.get_switch("toggle_display_type") == "LCD")) { - me.symbols.trkInd.setRotation(0); me.symbols.curHdgPtr.setRotation((userHdg-userTrk)*D2R); me.symbols.curHdgPtr2.setRotation((userHdg-userTrk)*D2R); } else { - me.symbols.trkInd.setRotation((userTrk-userHdg)*D2R); me.symbols.curHdgPtr.setRotation(0); me.symbols.curHdgPtr2.setRotation(0); } @@ -656,10 +654,6 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec 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"]) or (me.adirs_property.getValue() != 1 or (me.change_phase == 1) and (adirs_3.getValue() != 1 or att_switch.getValue() != me.attitude_heading_setting))) - me.symbols.trkInd.hide(); - else - me.symbols.trkInd.show(); if((getprop("/instrumentation/nav[2]/in-range") and me.get_switch("toggle_lh_vor_adf") == 1)) { me.symbols.staToL.setColor(0.195,0.96,0.097); me.symbols.staFromL.setColor(0.195,0.96,0.097); @@ -713,7 +707,6 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec } me.symbols.selHdgLine.setVisible(staPtrVis and hdg_bug_active); } else { - me.symbols.trkInd.hide(); if((getprop("/instrumentation/nav[2]/in-range") and me.get_switch("toggle_lh_vor_adf") == 1)) { me.symbols.staFromL2.setColor(0.195,0.96,0.097); me.symbols.staToL2.setColor(0.195,0.96,0.097); diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg index d83f7743..63aa5f1a 100644 --- a/Models/Instruments/ND/canvas/res/airbusND.svg +++ b/Models/Instruments/ND/canvas/res/airbusND.svg @@ -1183,25 +1183,23 @@ x="198.86594" y="648.10144">99 - + inkscape:label="#path3888-1" /> + = 100), is_true: func(nd) { var windDir = pts.Instrumentation.PFD.windDirection.getValue() or 0; - if(nd.get_switch("toggle_true_north")) - windDir = windDir + getprop("environment/magnetic-variation-deg"); nd.symbols.wind.setText(sprintf("%03.0f / %02.0f",windDir,pts.Instrumentation.PFD.windSpeed.getValue() or 0)); }, is_false: func(nd) { @@ -1538,18 +1547,7 @@ canvas.NDStyles["Airbus"] = { predicate: func(nd) (!(nd.in_mode("toggle_display_mode", ["PLAN"]) and (nd.get_switch("toggle_display_type") == "LCD")) and (pts.Instrumentation.PFD.windSpeed.getValue() or 0) >= 2 and getprop("/instrumentation/airspeed-indicator/true-speed-kt") >= 100), is_true: func(nd) { nd.symbols.windArrow.show(); - var windArrowRot = pts.Instrumentation.PFD.windDirection.getValue() or 0; - if(nd.in_mode("toggle_display_mode", ["MAP","PLAN"])) { - if(nd.get_switch("toggle_true_north")) - windArrowRot = windArrowRot - nd.aircraft_source.get_trk_tru(); - else - windArrowRot = windArrowRot - nd.aircraft_source.get_trk_mag(); - } else { - if(nd.get_switch("toggle_true_north")) - windArrowRot = windArrowRot - nd.aircraft_source.get_hdg_tru(); - else - windArrowRot = windArrowRot - nd.aircraft_source.get_hdg_mag(); - } + var windArrowRot = (pts.Instrumentation.PFD.windDirection.getValue() or 0) - nd.aircraft_source.get_hdg_tru(); nd.symbols.windArrow.setRotation(windArrowRot*D2R); }, is_false: func(nd) nd.symbols.windArrow.hide(), From 886eb9da49387e757da1ed290b0b6d3a5f805b88 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 18:46:06 +0100 Subject: [PATCH 08/31] Bugfix property --- Nasal/Libraries/property-tree-setup.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index 50c3e756..3ef9a2ef 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -196,7 +196,7 @@ var Instrumentation = { MKVII: { Inputs: { Discretes: { - flap3Override: props.globals.getNode("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override"), + flap3Override: props.globals.getNode("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override"), }, }, }, From 1a4982c9e6ee66f118e2366ffe8a155968ddd47f Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 18:54:56 +0100 Subject: [PATCH 09/31] Fix groundspeed in PFD --- Models/Instruments/PFD/PFD.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 423689fc..46f6af22 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -396,7 +396,7 @@ var canvas_PFD_base = { me["AI_agl"].setText(sprintf("%s", math.round(math.clamp(gear_agl_cur, 0, 2500)))); - if (gear_agl_cur < 400 and pts.Velocities.groundspeed.getValue() > 50 and pts.Controls.Engines.Engine.throttlePos[0].getValue() < 0.78 and pts.Controls.Engines.Engine.throttlePos[1].getValue() < 0.78) { + if (gear_agl_cur < 400 and pts.Velocities.groundspeedKt.getValue() > 50 and pts.Controls.Engines.Engine.throttlePos[0].getValue() < 0.78 and pts.Controls.Engines.Engine.throttlePos[1].getValue() < 0.78) { me["tailstrikeInd"].show(); } else { me["tailstrikeInd"].hide(); From 631ca818603f61c3a8cb30cdaa4ef69554d9d7b7 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 19:06:24 +0100 Subject: [PATCH 10/31] Remove 2 extra bits --- Models/Instruments/ND/canvas/res/airbusND.svg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg index 63aa5f1a..33706324 100644 --- a/Models/Instruments/ND/canvas/res/airbusND.svg +++ b/Models/Instruments/ND/canvas/res/airbusND.svg @@ -1204,14 +1204,6 @@ d="m 497.671,651.001 h 27.578" id="path3823" inkscape:connector-curvature="0" /> Date: Tue, 3 Aug 2021 20:32:04 +0200 Subject: [PATCH 11/31] MODEL:Loose object joined on L/H LEAP --- Models/Fuselage/res/CFMLEAP1A.ac | 432 +++++++++++++++---------------- 1 file changed, 211 insertions(+), 221 deletions(-) diff --git a/Models/Fuselage/res/CFMLEAP1A.ac b/Models/Fuselage/res/CFMLEAP1A.ac index d3b8e25d..2639a52b 100644 --- a/Models/Fuselage/res/CFMLEAP1A.ac +++ b/Models/Fuselage/res/CFMLEAP1A.ac @@ -3,7 +3,7 @@ MATERIAL "engine-LEAP" rgb 0.720 0.720 0.720 amb 1.000 1.000 1.000 emis 0.000 MATERIAL "engine-LEAP-Inner" rgb 0.800 0.800 0.800 amb 1.000 1.000 1.000 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 5 trans 0.000 OBJECT world name "Blender_exporter_v2.26__CFMLEAP1A.ac" -kids 21 +kids 20 OBJECT poly name "EngineLEAPL" data 10 @@ -11,7 +11,7 @@ Circle.070 crease 40.0 texture "engine-leap1a.png" texrep 1 1 -numvert 915 +numvert 971 -5.99603 -1.40518 4.72154 -5.99603 -3.21746 4.72154 -5.99603 -2.08404 4.36962 @@ -927,7 +927,63 @@ numvert 915 -6.59341 -1.42205 5.35885 -6.59533 -1.41164 5.35153 -6.59535 -1.41048 5.35534 -numsurf 763 +-5.36544 -1.38745 6.48767 +-5.58537 -1.40004 6.51961 +-5.89058 -1.42088 6.54841 +-5.3821 -1.34082 6.43333 +-5.60021 -1.35352 6.46475 +-5.90234 -1.37166 6.49624 +-5.36522 -1.38064 6.49365 +-5.89036 -1.41406 6.55439 +-5.58514 -1.39322 6.52558 +-5.38187 -1.334 6.43931 +-5.90211 -1.36484 6.50222 +-5.59998 -1.3467 6.47073 +-5.28901 -1.37521 6.46328 +-5.29742 -1.38317 6.47371 +-6.05451 -1.43226 6.55571 +-6.0674 -1.42517 6.54833 +-6.07481 -1.39031 6.51341 +-6.06527 -1.38175 6.50493 +-6.06718 -1.41835 6.5543 +-6.05428 -1.42545 6.56169 +-6.06504 -1.37493 6.51091 +-6.07458 -1.3835 6.51939 +-5.31444 -1.33587 6.42032 +-5.3008 -1.34233 6.42636 +-5.29719 -1.37636 6.47969 +-5.28878 -1.36839 6.46926 +-5.30058 -1.33551 6.43234 +-5.31421 -1.32905 6.42629 +-5.36544 -1.38745 4.7736 +-5.58537 -1.40004 4.74166 +-5.89058 -1.42088 4.71285 +-5.3821 -1.34082 4.82793 +-5.60021 -1.35352 4.79651 +-5.90234 -1.37166 4.76502 +-5.36522 -1.38064 4.76762 +-5.89036 -1.41406 4.70687 +-5.58514 -1.39322 4.73568 +-5.38187 -1.334 4.82195 +-5.90211 -1.36484 4.75904 +-5.59998 -1.3467 4.79054 +-5.28901 -1.37521 4.79798 +-5.29742 -1.38317 4.78756 +-6.05451 -1.43226 4.70555 +-6.0674 -1.42517 4.71294 +-6.07481 -1.39031 4.74785 +-6.06527 -1.38175 4.75633 +-6.06718 -1.41835 4.70696 +-6.05428 -1.42545 4.69958 +-6.06504 -1.37493 4.75035 +-6.07458 -1.3835 4.74187 +-5.31444 -1.33587 4.84095 +-5.3008 -1.34233 4.8349 +-5.29719 -1.37636 4.78158 +-5.28878 -1.36839 4.79201 +-5.30058 -1.33551 4.82892 +-5.31421 -1.32905 4.83497 +numsurf 799 SURF 0X10 mat 0 refs 4 @@ -6238,332 +6294,266 @@ refs 4 911 0.294766 0.901495 912 0.29524 0.901496 910 0.29524 0.903886 -kids 0 -OBJECT poly -name "EngineLEAPL.007" -data 10 -Circle.043 -crease 40.0 -texture "engine-leap1a.png" -texrep 1 1 -numvert 56 --5.36544 -1.38745 6.48767 --5.58537 -1.40004 6.51961 --5.89058 -1.42088 6.54841 --5.3821 -1.34082 6.43333 --5.60021 -1.35352 6.46475 --5.90234 -1.37166 6.49624 --5.36522 -1.38064 6.49365 --5.89036 -1.41406 6.55439 --5.58514 -1.39322 6.52558 --5.38187 -1.334 6.43931 --5.90211 -1.36484 6.50222 --5.59998 -1.3467 6.47073 --5.28901 -1.37521 6.46328 --5.29742 -1.38317 6.47371 --6.05451 -1.43226 6.55571 --6.0674 -1.42517 6.54833 --6.07481 -1.39031 6.51341 --6.06527 -1.38175 6.50493 --6.06718 -1.41835 6.5543 --6.05428 -1.42545 6.56169 --6.06504 -1.37493 6.51091 --6.07458 -1.3835 6.51939 --5.31444 -1.33587 6.42032 --5.3008 -1.34233 6.42636 --5.29719 -1.37636 6.47969 --5.28878 -1.36839 6.46926 --5.30058 -1.33551 6.43234 --5.31421 -1.32905 6.42629 --5.36544 -1.38745 4.7736 --5.58537 -1.40004 4.74166 --5.89058 -1.42088 4.71285 --5.3821 -1.34082 4.82793 --5.60021 -1.35352 4.79651 --5.90234 -1.37166 4.76502 --5.36522 -1.38064 4.76762 --5.89036 -1.41406 4.70687 --5.58514 -1.39322 4.73568 --5.38187 -1.334 4.82195 --5.90211 -1.36484 4.75904 --5.59998 -1.3467 4.79054 --5.28901 -1.37521 4.79798 --5.29742 -1.38317 4.78756 --6.05451 -1.43226 4.70555 --6.0674 -1.42517 4.71294 --6.07481 -1.39031 4.74785 --6.06527 -1.38175 4.75633 --6.06718 -1.41835 4.70696 --6.05428 -1.42545 4.69958 --6.06504 -1.37493 4.75035 --6.07458 -1.3835 4.74187 --5.31444 -1.33587 4.84095 --5.3008 -1.34233 4.8349 --5.29719 -1.37636 4.78158 --5.28878 -1.36839 4.79201 --5.30058 -1.33551 4.82892 --5.31421 -1.32905 4.83497 -numsurf 36 SURF 0X10 mat 0 refs 4 -2 0.156482 0.623991 -1 0.123384 0.624027 -8 0.123514 0.623013 -7 0.155977 0.622984 +917 0.156482 0.623991 +916 0.123384 0.624027 +923 0.123514 0.623013 +922 0.155977 0.622984 SURF 0X10 mat 0 refs 4 -3 0.100318 0.613748 -4 0.12407 0.614572 -11 0.124187 0.615286 -9 0.10089 0.614613 +918 0.100318 0.613748 +919 0.12407 0.614572 +926 0.124187 0.615286 +924 0.10089 0.614613 SURF 0X10 mat 0 refs 4 -4 0.12407 0.614572 -5 0.156848 0.614608 -10 0.156335 0.615316 -11 0.124187 0.615286 +919 0.12407 0.614572 +920 0.156848 0.614608 +925 0.156335 0.615316 +926 0.124187 0.615286 SURF 0X10 mat 0 refs 4 -1 0.123384 0.624027 -0 0.099433 0.62319 -6 0.100023 0.622329 -8 0.123514 0.623013 +916 0.123384 0.624027 +915 0.099433 0.62319 +921 0.100023 0.622329 +923 0.123514 0.623013 SURF 0X10 mat 0 refs 4 -21 0.174735 0.61585 -16 0.175608 0.615261 -15 0.175425 0.621697 -18 0.174557 0.621109 +936 0.174735 0.61585 +931 0.175608 0.615261 +930 0.175425 0.621697 +933 0.174557 0.621109 SURF 0X10 mat 0 refs 4 -12 0.090914 0.620953 -23 0.091558 0.614428 -26 0.092298 0.615169 -25 0.091667 0.620501 +927 0.090914 0.620953 +938 0.091558 0.614428 +941 0.092298 0.615169 +940 0.091667 0.620501 SURF 0X10 mat 0 refs 4 -22 0.092907 0.613091 -3 0.100318 0.613748 -9 0.10089 0.614613 -27 0.093622 0.614076 +937 0.092907 0.613091 +918 0.100318 0.613748 +924 0.10089 0.614613 +942 0.093622 0.614076 SURF 0X10 mat 0 refs 4 -5 0.156848 0.614608 -17 0.174438 0.61386 -20 0.173588 0.614704 -10 0.156335 0.615316 +920 0.156848 0.614608 +932 0.174438 0.61386 +935 0.173588 0.614704 +925 0.156335 0.615316 SURF 0X10 mat 0 refs 6 -7 0.155977 0.622984 -10 0.156335 0.615316 -20 0.173588 0.614704 -21 0.174735 0.61585 -18 0.174557 0.621109 -19 0.173329 0.622341 +922 0.155977 0.622984 +925 0.156335 0.615316 +935 0.173588 0.614704 +936 0.174735 0.61585 +933 0.174557 0.621109 +934 0.173329 0.622341 SURF 0X10 mat 0 refs 6 -24 0.092711 0.621771 -25 0.091667 0.620501 -26 0.092298 0.615169 -27 0.093622 0.614076 -9 0.10089 0.614613 -6 0.100023 0.622329 +939 0.092711 0.621771 +940 0.091667 0.620501 +941 0.092298 0.615169 +942 0.093622 0.614076 +924 0.10089 0.614613 +921 0.100023 0.622329 SURF 0X10 mat 0 refs 4 -14 0.174174 0.623205 -2 0.156482 0.623991 -7 0.155977 0.622984 -19 0.173329 0.622341 +929 0.174174 0.623205 +917 0.156482 0.623991 +922 0.155977 0.622984 +934 0.173329 0.622341 SURF 0X10 mat 0 refs 4 -11 0.124187 0.615286 -10 0.156335 0.615316 -7 0.155977 0.622984 -8 0.123514 0.623013 +926 0.124187 0.615286 +925 0.156335 0.615316 +922 0.155977 0.622984 +923 0.123514 0.623013 SURF 0X10 mat 0 refs 4 -9 0.10089 0.614613 -11 0.124187 0.615286 -8 0.123514 0.623013 -6 0.100023 0.622329 +924 0.10089 0.614613 +926 0.124187 0.615286 +923 0.123514 0.623013 +921 0.100023 0.622329 SURF 0X10 mat 0 refs 4 -14 0.174174 0.623205 -19 0.173329 0.622341 -18 0.174557 0.621109 -15 0.175425 0.621697 +929 0.174174 0.623205 +934 0.173329 0.622341 +933 0.174557 0.621109 +930 0.175425 0.621697 SURF 0X10 mat 0 refs 4 -16 0.175608 0.615261 -21 0.174735 0.61585 -20 0.173588 0.614704 -17 0.174438 0.61386 +931 0.175608 0.615261 +936 0.174735 0.61585 +935 0.173588 0.614704 +932 0.174438 0.61386 SURF 0X10 mat 0 refs 4 -22 0.092907 0.613091 -27 0.093622 0.614076 -26 0.092298 0.615169 -23 0.091558 0.614428 +937 0.092907 0.613091 +942 0.093622 0.614076 +941 0.092298 0.615169 +938 0.091558 0.614428 SURF 0X10 mat 0 refs 4 -12 0.090914 0.620953 -25 0.091667 0.620501 -24 0.092711 0.621771 -13 0.091978 0.622507 +927 0.090914 0.620953 +940 0.091667 0.620501 +939 0.092711 0.621771 +928 0.091978 0.622507 SURF 0X10 mat 0 refs 4 -0 0.099433 0.62319 -13 0.091978 0.622507 -24 0.092711 0.621771 -6 0.100023 0.622329 +915 0.099433 0.62319 +928 0.091978 0.622507 +939 0.092711 0.621771 +921 0.100023 0.622329 SURF 0X10 mat 0 refs 4 -30 0.068591 0.623991 -35 0.068086 0.622984 -36 0.035623 0.623013 -29 0.035493 0.624027 +945 0.068591 0.623991 +950 0.068086 0.622984 +951 0.035623 0.623013 +944 0.035493 0.624027 SURF 0X10 mat 0 refs 4 -31 0.012427 0.613748 -37 0.012999 0.614613 -39 0.036296 0.615286 -32 0.036179 0.614572 +946 0.012427 0.613748 +952 0.012999 0.614613 +954 0.036296 0.615286 +947 0.036179 0.614572 SURF 0X10 mat 0 refs 4 -32 0.036179 0.614572 -39 0.036296 0.615286 -38 0.068444 0.615316 -33 0.068957 0.614608 +947 0.036179 0.614572 +954 0.036296 0.615286 +953 0.068444 0.615316 +948 0.068957 0.614608 SURF 0X10 mat 0 refs 4 -29 0.035493 0.624027 -36 0.035623 0.623013 -34 0.012132 0.622329 -28 0.011542 0.62319 +944 0.035493 0.624027 +951 0.035623 0.623013 +949 0.012132 0.622329 +943 0.011542 0.62319 SURF 0X10 mat 0 refs 4 -49 0.086844 0.61585 -46 0.086665 0.621109 -43 0.087534 0.621697 -44 0.087717 0.615262 +964 0.086844 0.61585 +961 0.086665 0.621109 +958 0.087534 0.621697 +959 0.087717 0.615262 SURF 0X10 mat 0 refs 4 -40 0.003023 0.620953 -53 0.003776 0.620501 -54 0.004407 0.615169 -51 0.003667 0.614428 +955 0.003023 0.620953 +968 0.003776 0.620501 +969 0.004407 0.615169 +966 0.003667 0.614428 SURF 0X10 mat 0 refs 4 -50 0.005016 0.613091 -55 0.005731 0.614076 -37 0.012999 0.614613 -31 0.012427 0.613748 +965 0.005016 0.613091 +970 0.005731 0.614076 +952 0.012999 0.614613 +946 0.012427 0.613748 SURF 0X10 mat 0 refs 4 -33 0.068957 0.614608 -38 0.068444 0.615316 -48 0.085697 0.614704 -45 0.086547 0.61386 +948 0.068957 0.614608 +953 0.068444 0.615316 +963 0.085697 0.614704 +960 0.086547 0.61386 SURF 0X10 mat 0 refs 6 -35 0.068086 0.622984 -47 0.085438 0.622341 -46 0.086665 0.621109 -49 0.086844 0.61585 -48 0.085697 0.614704 -38 0.068444 0.615316 +950 0.068086 0.622984 +962 0.085438 0.622341 +961 0.086665 0.621109 +964 0.086844 0.61585 +963 0.085697 0.614704 +953 0.068444 0.615316 SURF 0X10 mat 0 refs 6 -52 0.00482 0.621771 -34 0.012132 0.622329 -37 0.012999 0.614613 -55 0.005731 0.614076 -54 0.004407 0.615169 -53 0.003776 0.620501 +967 0.00482 0.621771 +949 0.012132 0.622329 +952 0.012999 0.614613 +970 0.005731 0.614076 +969 0.004407 0.615169 +968 0.003776 0.620501 SURF 0X10 mat 0 refs 4 -42 0.086283 0.623205 -47 0.085438 0.622341 -35 0.068086 0.622984 -30 0.068591 0.623991 +957 0.086283 0.623205 +962 0.085438 0.622341 +950 0.068086 0.622984 +945 0.068591 0.623991 SURF 0X10 mat 0 refs 4 -39 0.036296 0.615286 -36 0.035623 0.623013 -35 0.068086 0.622984 -38 0.068444 0.615316 +954 0.036296 0.615286 +951 0.035623 0.623013 +950 0.068086 0.622984 +953 0.068444 0.615316 SURF 0X10 mat 0 refs 4 -37 0.012999 0.614613 -34 0.012132 0.622329 -36 0.035623 0.623013 -39 0.036296 0.615286 +952 0.012999 0.614613 +949 0.012132 0.622329 +951 0.035623 0.623013 +954 0.036296 0.615286 SURF 0X10 mat 0 refs 4 -42 0.086283 0.623205 -43 0.087534 0.621697 -46 0.086665 0.621109 -47 0.085438 0.622341 +957 0.086283 0.623205 +958 0.087534 0.621697 +961 0.086665 0.621109 +962 0.085438 0.622341 SURF 0X10 mat 0 refs 4 -44 0.087717 0.615262 -45 0.086547 0.61386 -48 0.085697 0.614704 -49 0.086844 0.61585 +959 0.087717 0.615262 +960 0.086547 0.61386 +963 0.085697 0.614704 +964 0.086844 0.61585 SURF 0X10 mat 0 refs 4 -50 0.005016 0.613091 -51 0.003667 0.614428 -54 0.004407 0.615169 -55 0.005731 0.614076 +965 0.005016 0.613091 +966 0.003667 0.614428 +969 0.004407 0.615169 +970 0.005731 0.614076 SURF 0X10 mat 0 refs 4 -40 0.003023 0.620953 -41 0.004087 0.622507 -52 0.00482 0.621771 -53 0.003776 0.620501 +955 0.003023 0.620953 +956 0.004087 0.622507 +967 0.00482 0.621771 +968 0.003776 0.620501 SURF 0X10 mat 0 refs 4 -28 0.011542 0.62319 -34 0.012132 0.622329 -52 0.00482 0.621771 -41 0.004087 0.622507 +943 0.011542 0.62319 +949 0.012132 0.622329 +967 0.00482 0.621771 +956 0.004087 0.622507 kids 0 OBJECT poly name "EngineLEAPL.Inner" From 859726a3fdfbe8d1721f867202a8d4482ab3f4f9 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 3 Aug 2021 19:06:24 +0100 Subject: [PATCH 12/31] Remove 2 extra bits --- Models/Instruments/ND/canvas/res/airbusND.svg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg index 63aa5f1a..33706324 100644 --- a/Models/Instruments/ND/canvas/res/airbusND.svg +++ b/Models/Instruments/ND/canvas/res/airbusND.svg @@ -1204,14 +1204,6 @@ d="m 497.671,651.001 h 27.578" id="path3823" inkscape:connector-curvature="0" /> Date: Tue, 3 Aug 2021 20:49:42 +0100 Subject: [PATCH 13/31] Consistencize the various orange colours --- Models/FlightDeck/a320.flightdeck.xml | 42 ++++++++++++-------------- Models/FlightDeck/res/fcu.png | Bin 8689 -> 8708 bytes Models/FlightDeck/res/fcu2.png | Bin 7803 -> 8947 bytes Models/Instruments/Radio/Radio1.xml | 12 ++++---- Models/Instruments/Radio/Radio2.xml | 12 ++++---- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 0626c6a8..8102b1b5 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -7535,19 +7535,15 @@ vs.ind fpa.ind fpa.ind.001 - atc-code - atc-test fpa-text qnh-inhg qnh-hpa qnh-std qnh-test - rudder-trim - rudder-trim-letter - 0.75 - 0.30 - 0.0 + 1.00 + 0.515 + 0.00 controls/lighting/fcu-digit-norm @@ -7561,9 +7557,9 @@ 0 - 0.75 - 0.30 - 0.0 + 1.00 + 0.515 + 0.00 controls/lighting/fcu-digit-norm @@ -7572,10 +7568,12 @@ material rudder-trim rudder-trim-letter + atc-code + atc-test - 0.75 - 0.30 - 0.0 + 1.00 + 0.355 + 0.00 0 @@ -7588,9 +7586,9 @@ 0 - 0.75 - 0.30 - 0.0 + 1.00 + 0.355 + 0.00 @@ -8991,9 +8989,9 @@ dme1 - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 0 @@ -9006,9 +9004,9 @@ 0 - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 diff --git a/Models/FlightDeck/res/fcu.png b/Models/FlightDeck/res/fcu.png index 12c2f466695039fede326f1a2dd277c9b9382dff..24a71eb799621410677b19a6ade36b5fd049cafb 100644 GIT binary patch literal 8708 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 literal 7803 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 Nrmp-standby rmp-standby-test - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 0 @@ -2191,9 +2191,9 @@ 0 - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml index 2d9d7589..8ef9b533 100644 --- a/Models/Instruments/Radio/Radio2.xml +++ b/Models/Instruments/Radio/Radio2.xml @@ -2176,9 +2176,9 @@ rmp-standby rmp-standby-test - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 0 @@ -2191,9 +2191,9 @@ 0 - 0.89 - 0.37 - 0.08 + 1.00 + 0.355 + 0.00 From 9efbbdbb6b5006d1bc42430cfec1a378844eedcb Mon Sep 17 00:00:00 2001 From: semir Date: Wed, 4 Aug 2021 13:25:42 +0200 Subject: [PATCH 14/31] MODEL:Fixed IAE placard UVs in wrong position which caused inverted text --- Models/Fuselage/res/IAEV2500.ac | 160 ++++++++++++++++---------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/Models/Fuselage/res/IAEV2500.ac b/Models/Fuselage/res/IAEV2500.ac index ee4ce409..0f4f16a4 100644 --- a/Models/Fuselage/res/IAEV2500.ac +++ b/Models/Fuselage/res/IAEV2500.ac @@ -12658,143 +12658,143 @@ numsurf 20 SURF 0X10 mat 3 refs 4 -1 0.831933 0.473945 -0 0.831933 0.411533 -5 0.898381 0.411533 -2 0.898381 0.473945 +1 0.831933 0.783971 +0 0.831933 0.721559 +5 0.898381 0.721559 +2 0.898381 0.783971 SURF 0X10 mat 3 refs 4 -0 0.831933 0.411533 -40 0.831933 0.38219 -37 0.898381 0.389125 -5 0.898381 0.411533 +0 0.831933 0.721559 +40 0.831933 0.692216 +37 0.898381 0.699151 +5 0.898381 0.721559 SURF 0X10 mat 3 refs 4 -7 0.831933 0.72174 -6 0.831933 0.784152 -3 0.898381 0.784152 -4 0.898381 0.72174 +7 0.831933 0.411714 +6 0.831933 0.474126 +3 0.898381 0.474126 +4 0.898381 0.411714 SURF 0X10 mat 3 refs 4 -6 0.831933 0.784152 -22 0.831933 0.79733 -16 0.898381 0.799399 -3 0.898381 0.784152 +6 0.831933 0.474126 +22 0.831933 0.487304 +16 0.898381 0.489373 +3 0.898381 0.474126 SURF 0X10 mat 3 refs 4 -2 0.898381 0.473945 -5 0.898381 0.411533 -28 0.961802 0.411533 -29 0.961802 0.473945 +2 0.898381 0.783971 +5 0.898381 0.721559 +28 0.961802 0.721559 +29 0.961802 0.783971 SURF 0X10 mat 3 refs 4 -4 0.898381 0.72174 -3 0.898381 0.784152 -33 0.961798 0.784152 -24 0.961798 0.72174 +4 0.898381 0.411714 +3 0.898381 0.474126 +33 0.961798 0.474126 +24 0.961798 0.411714 SURF 0X10 mat 3 refs 4 -3 0.898381 0.784152 -16 0.898381 0.799399 -32 0.961798 0.79932 -33 0.961798 0.784152 +3 0.898381 0.474126 +16 0.898381 0.489373 +32 0.961798 0.489294 +33 0.961798 0.474126 SURF 0X10 mat 3 refs 4 -9 0.831933 0.474028 -8 0.831933 0.411615 -13 0.898381 0.411615 -10 0.898381 0.474028 +9 0.831933 0.784054 +8 0.831933 0.721641 +13 0.898381 0.721641 +10 0.898381 0.784054 SURF 0X10 mat 3 refs 4 -8 0.831933 0.411615 -42 0.831933 0.382274 -38 0.898381 0.389209 -13 0.898381 0.411615 +8 0.831933 0.721641 +42 0.831933 0.6923 +38 0.898381 0.699234 +13 0.898381 0.721641 SURF 0X10 mat 3 refs 4 -15 0.831933 0.721657 -14 0.831933 0.784069 -11 0.898381 0.784069 -12 0.898381 0.721657 +15 0.831933 0.411631 +14 0.831933 0.474043 +11 0.898381 0.474043 +12 0.898381 0.411631 SURF 0X10 mat 3 refs 4 -14 0.831933 0.784069 -21 0.831933 0.797244 -23 0.898381 0.799313 -11 0.898381 0.784069 +14 0.831933 0.474043 +21 0.831933 0.487218 +23 0.898381 0.489287 +11 0.898381 0.474043 SURF 0X10 mat 3 refs 4 -10 0.898381 0.474028 -13 0.898381 0.411615 -26 0.961802 0.411615 -27 0.961802 0.474028 +10 0.898381 0.784054 +13 0.898381 0.721641 +26 0.961802 0.721641 +27 0.961802 0.784054 SURF 0X10 mat 3 refs 4 -12 0.898381 0.721657 -11 0.898381 0.784069 -31 0.961798 0.784069 -35 0.961798 0.721657 +12 0.898381 0.411631 +11 0.898381 0.474043 +31 0.961798 0.474043 +35 0.961798 0.411631 SURF 0X10 mat 3 refs 4 -11 0.898381 0.784069 -23 0.898381 0.799313 -30 0.961798 0.799234 -31 0.961798 0.784069 +11 0.898381 0.474043 +23 0.898381 0.489287 +30 0.961798 0.489208 +31 0.961798 0.474043 SURF 0X10 mat 3 refs 4 -18 0.898381 0.489191 -20 0.831933 0.487231 -1 0.831933 0.473945 -2 0.898381 0.473945 +18 0.898381 0.799217 +20 0.831933 0.797257 +1 0.831933 0.783971 +2 0.898381 0.783971 SURF 0X10 mat 3 refs 4 -17 0.898381 0.489274 -19 0.831933 0.487314 -9 0.831933 0.474028 -10 0.898381 0.474028 +17 0.898381 0.7993 +19 0.831933 0.79734 +9 0.831933 0.784054 +10 0.898381 0.784054 SURF 0X10 mat 3 refs 4 -29 0.961802 0.473945 -25 0.961802 0.489112 -18 0.898381 0.489191 -2 0.898381 0.473945 +29 0.961802 0.783971 +25 0.961802 0.799138 +18 0.898381 0.799217 +2 0.898381 0.783971 SURF 0X10 mat 3 refs 4 -27 0.961802 0.474028 -34 0.961802 0.489195 -17 0.898381 0.489274 -10 0.898381 0.474028 +27 0.961802 0.784054 +34 0.961802 0.799221 +17 0.898381 0.7993 +10 0.898381 0.784054 SURF 0X10 mat 3 refs 4 -43 0.898381 0.699247 -36 0.831933 0.692311 -15 0.831933 0.721657 -12 0.898381 0.721657 +43 0.898381 0.389221 +36 0.831933 0.382285 +15 0.831933 0.411631 +12 0.898381 0.411631 SURF 0X10 mat 3 refs 4 -39 0.898381 0.699333 -41 0.831933 0.692398 -7 0.831933 0.72174 -4 0.898381 0.72174 +39 0.898381 0.389307 +41 0.831933 0.382372 +7 0.831933 0.411714 +4 0.898381 0.411714 kids 0 OBJECT poly name "EngineIAEV2500R" From afa29a57eab888204f09ca7eadc3c9fc0a889820 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 4 Aug 2021 13:05:08 +0100 Subject: [PATCH 15/31] Add default placards value --- Models/Liveries/A320/CFM/AUA.xml | 1 + Models/Liveries/A320/CFM/SWR.xml | 1 + Models/Liveries/A320/IAE/N680AW.xml | 1 + Models/Liveries/A320/IAE/QTR.xml | 1 + Models/Liveries/A320/IAE/SAS.xml | 1 + 5 files changed, 5 insertions(+) diff --git a/Models/Liveries/A320/CFM/AUA.xml b/Models/Liveries/A320/CFM/AUA.xml index 4c92d13b..5f9c4832 100644 --- a/Models/Liveries/A320/CFM/AUA.xml +++ b/Models/Liveries/A320/CFM/AUA.xml @@ -7,6 +7,7 @@ Austrian Airlines (OE-LBU) Liveries/A320/CFM/AUA-fuselage.png Liveries/A320/CFM/CFM56-white.png + Fuselage/res/placards.png diff --git a/Models/Liveries/A320/CFM/SWR.xml b/Models/Liveries/A320/CFM/SWR.xml index 10c19274..f51cea32 100644 --- a/Models/Liveries/A320/CFM/SWR.xml +++ b/Models/Liveries/A320/CFM/SWR.xml @@ -7,6 +7,7 @@ Swiss (HB-JLS) Liveries/A320/CFM/SWR-fuselage.png Liveries/A320/CFM/CFM56-white.png + Fuselage/res/placards.png diff --git a/Models/Liveries/A320/IAE/N680AW.xml b/Models/Liveries/A320/IAE/N680AW.xml index 3c3d58aa..270f5a11 100644 --- a/Models/Liveries/A320/IAE/N680AW.xml +++ b/Models/Liveries/A320/IAE/N680AW.xml @@ -7,6 +7,7 @@ N680AW(Unpainted) Fuselages\A320\res\Fuse-Main.png Engines\Models\engine-IAE-V2500.png + Fuselage/res/placards.png diff --git a/Models/Liveries/A320/IAE/QTR.xml b/Models/Liveries/A320/IAE/QTR.xml index 3d2fab65..29b862a2 100644 --- a/Models/Liveries/A320/IAE/QTR.xml +++ b/Models/Liveries/A320/IAE/QTR.xml @@ -7,6 +7,7 @@ Qatar Airways (A7-AHW) Liveries/A320/IAE/QTR-fuselage.png Liveries/A320/IAE/QTR-engine.png + Fuselage/res/placards.png diff --git a/Models/Liveries/A320/IAE/SAS.xml b/Models/Liveries/A320/IAE/SAS.xml index 77781bad..00636e5f 100644 --- a/Models/Liveries/A320/IAE/SAS.xml +++ b/Models/Liveries/A320/IAE/SAS.xml @@ -7,6 +7,7 @@ Scandinavian (OY-KAM) Liveries/A320/IAE/SAS-fuselage.png Liveries/A320/IAE/SAS-engine.png + Fuselage/res/placards.png From d92279b6fc3e00b530ebde2ddc916fbc5541e4e2 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 4 Aug 2021 17:17:35 +0100 Subject: [PATCH 16/31] Metric altitude --- Models/FlightDeck/a320.flightdeck.xml | 16 ++++++++ Models/Instruments/PFD/PFD.nas | 54 ++++++++++++++++++++++++-- Models/Instruments/PFD/res/pfd.svg | 56 ++++++++++++++++++++++++--- Nasal/FMGC/FCU.nas | 6 +++ 4 files changed, 124 insertions(+), 8 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 8102b1b5..c312fea1 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -5591,6 +5591,22 @@ + + + pick + metric_alt + + + false + + nasal + + + + diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 4fd4074b..956e118a 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -219,9 +219,9 @@ var canvas_PFD_base = { "FMA_athr_box","FMA_Middle1","FMA_Middle2","ALPHA_MAX","ALPHA_PROT","ALPHA_SW","ALPHA_bars","VLS_min","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP", "ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank","AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading", "AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP", - "ALT_digit_DN","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale", + "ALT_digit_DN","ALT_digit_UP_metric","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale", "HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L", - "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd"]; + "ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd","Metric_box","Metric_letter","Metric_cur_alt"]; }, off: 0, on: 0, @@ -346,6 +346,7 @@ var canvas_PFD_base = { PFD_2_mismatch.page.show(); } }, + showMetricAlt: 0, updateCommon: func () { # FMA MAN TOGA MCT FLX THR # Set properties used a lot to a variable to avoid calling getValue() multiple times @@ -1039,7 +1040,6 @@ var canvas_PFD_base = { me["QNH_std"].hide(); me["QNH_box"].hide(); } - }, # Get Angle of Attack from ADR1 or, depending on Switching panel, ADR3 @@ -1702,6 +1702,18 @@ var canvas_PFD_1 = { me["ALT_scale"].show(); me.altitude = dmc.DMController.DMCs[0].outputs[1].getValue(); + + if (me.showMetricAlt) { + me["Metric_box"].show(); + me["Metric_letter"].show(); + me["Metric_cur_alt"].show(); + me["Metric_cur_alt"].setText(sprintf("%5.0f", me.altitude * 0.3048)); + } else { + me["Metric_box"].hide(); + me["Metric_letter"].hide(); + me["Metric_cur_alt"].hide(); + } + me.altOffset = me.altitude / 500 - int(me.altitude / 500); me.middleAltText = roundaboutAlt(me.altitude / 100); me.middleAltOffset = nil; @@ -1729,6 +1741,14 @@ var canvas_PFD_1 = { me["ALT_tens"].setTranslation(0, altTens * 1.392); ap_alt_cur = ap_alt.getValue(); + + if (me.showMetricAlt) { + me["ALT_digit_UP_metric"].show(); + me["ALT_digit_UP_metric"].setText(sprintf("%5.0fM", ap_alt_cur * 0.3048)); + } else { + me["ALT_digit_UP_metric"].hide(); + } + alt_diff_cur = dmc.DMController.DMCs[0].outputs[7].getValue(); if (alt_diff_cur >= -565 and alt_diff_cur <= 565) { me["ALT_target"].setTranslation(0, (alt_diff_cur / 100) * -48.66856); @@ -1838,6 +1858,10 @@ var canvas_PFD_1 = { me["ALT_box_flash"].hide(); me["ALT_box_amber"].hide(); me["ALT_box"].hide(); + me["Metric_box"].hide(); + me["Metric_letter"].hide(); + me["Metric_cur_alt"].hide(); + me["ALT_digit_UP_metric"].hide(); } me.updateCommon(); @@ -2474,6 +2498,18 @@ var canvas_PFD_2 = { me["ALT_scale"].show(); me.altitude = dmc.DMController.DMCs[1].outputs[1].getValue(); + + if (me.showMetricAlt) { + me["Metric_box"].show(); + me["Metric_letter"].show(); + me["Metric_cur_alt"].show(); + me["Metric_cur_alt"].setText(sprintf("%5.0f", me.altitude * 0.3048)); + } else { + me["Metric_box"].hide(); + me["Metric_letter"].hide(); + me["Metric_cur_alt"].hide(); + } + me.altOffset = me.altitude / 500 - int(me.altitude / 500); me.middleAltText = roundaboutAlt(me.altitude / 100); me.middleAltOffset = nil; @@ -2501,6 +2537,14 @@ var canvas_PFD_2 = { me["ALT_tens"].setTranslation(0, altTens * 1.392); ap_alt_cur = ap_alt.getValue(); + + if (me.showMetricAlt) { + me["ALT_digit_UP_metric"].show(); + me["ALT_digit_UP_metric"].setText(sprintf("%5.0fM", ap_alt_cur * 0.3048)); + } else { + me["ALT_digit_UP_metric"].hide(); + } + alt_diff_cur = dmc.DMController.DMCs[1].outputs[7].getValue(); if (alt_diff_cur >= -565 and alt_diff_cur <= 565) { me["ALT_target"].setTranslation(0, (alt_diff_cur / 100) * -48.66856); @@ -2610,6 +2654,10 @@ var canvas_PFD_2 = { me["ALT_box_flash"].hide(); me["ALT_box_amber"].hide(); me["ALT_box"].hide(); + me["Metric_box"].hide(); + me["Metric_letter"].hide(); + me["Metric_cur_alt"].hide(); + me["ALT_digit_UP_metric"].hide(); } me.updateCommon(); diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index 7eb9c07a..28c3d817 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -41,9 +41,9 @@ inkscape:window-maximized="1" inkscape:window-y="-8" inkscape:window-x="-8" - inkscape:cy="876.13786" - inkscape:cx="522.86542" - inkscape:zoom="5.6568542" + inkscape:cy="1074.3176" + inkscape:cx="955.3885" + inkscape:zoom="2" showgrid="true" id="namedview371" inkscape:window-height="705" @@ -2269,11 +2269,11 @@ id="QNH_setting" y="885.26117" x="907.61713" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1;" xml:space="preserve" transform="scale(1.0000144,0.9999856)" inkscape:label="#text979">-800 + + 11070 + M + 10000M diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas index 69196aa4..cbe4d337 100644 --- a/Nasal/FMGC/FCU.nas +++ b/Nasal/FMGC/FCU.nas @@ -460,6 +460,12 @@ var FCUController = { } } }, + MetricAlt: func() { + if (me.FCUworking) { + canvas_pfd.PFD_1.showMetricAlt = !canvas_pfd.PFD_1.showMetricAlt; + canvas_pfd.PFD_2.showMetricAlt = !canvas_pfd.PFD_2.showMetricAlt; + } + }, }; # Master / slave principle of operation depending on the autopilot / flight director engagement From fbbbbc68097a43269ed3bf917b190be651d31f3e Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 4 Aug 2021 18:39:47 +0100 Subject: [PATCH 17/31] ECAM right memos: remove getprop --- Nasal/ECAM/ECAM-logic.nas | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index b2664d8a..e2d4262a 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -3148,7 +3148,7 @@ var messages_config_memo = func { setprop("/ECAM/to-config-reset", 0); } - if (getprop("/controls/autobrake/mode") == 3) { + if (systems.Autobrake.mode.getValue() == 3) { toMemoLine1.msg = "T.O AUTO BRK MAX"; toMemoLine1.colour = "g"; } else { @@ -3411,14 +3411,14 @@ var messages_right_memo = func { ldg_inhibit.active = 0; } - if ((!pts.Gear.wow[1].getValue()) and (systems.ELEC.EmerElec.getValue() or getprop("/systems/fire/engine1/warning-active") == 1 or getprop("/systems/fire/engine2/warning-active") == 1 or getprop("/systems/fire/apu/warning-active") == 1 or getprop("/systems/failures/fire/cargo-aft-fire") == 1 or getprop("/systems/failures/fire/cargo-fwd-fire") == 1) or (((systems.HYD.Psi.green.getValue() < 1500 and pts.Engines.Engine.state[0].getValue() == 3) and (systems.HYD.Psi.yellow.getValue() < 1500 and pts.Engines.Engine.state[1].getValue() == 3)) or ((systems.HYD.Psi.green.getValue() < 1500 or systems.HYD.Psi.yellow.getValue() < 1500) and pts.Engines.Engine.state[0].getValue() == 3 and pts.Engines.Engine.state[1].getValue() == 3) and phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8)) { + if ((!pts.Gear.wow[1].getValue()) and (systems.ELEC.EmerElec.getValue() or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1) or (((systems.HYD.Psi.green.getValue() < 1500 and pts.Engines.Engine.state[0].getValue() == 3) and (systems.HYD.Psi.yellow.getValue() < 1500 and pts.Engines.Engine.state[1].getValue() == 3)) or ((systems.HYD.Psi.green.getValue() < 1500 or systems.HYD.Psi.yellow.getValue() < 1500) and pts.Engines.Engine.state[0].getValue() == 3 and pts.Engines.Engine.state[1].getValue() == 3) and phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8)) { # todo: emer elec land_asap_r.active = 1; } else { land_asap_r.active = 0; } - if (land_asap_r.active == 0 and !pts.Gear.wow[1].getValue() and ((getprop("/fdm/jsbsim/propulsion/tank[0]/contents-lbs") < 1650 and getprop("/fdm/jsbsim/propulsion/tank[1]/contents-lbs") < 1650) or ((getprop("/systems/electrical/bus/dc-2") < 25 and (getprop("/systems/failures/fctl/elac1") == 1 or getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.green.getValue() < 1500 and (getprop("/systems/failures/fctl/elac1") == 1 and getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.yellow.getValue() < 1500 and (getprop("/systems/failures/fctl/elac1") == 1 and getprop("/systems/failures/fctl/sec1") == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (getprop("/systems/failures/fctl/elac2") == 1 and getprop("/systems/failures/fctl/sec2") == 1))) or (phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8 and (pts.Engines.Engine.state[0].getValue() != 3 or pts.Engines.Engine.state[1].getValue() != 3)))) { + if (land_asap_r.active == 0 and !pts.Gear.wow[1].getValue() and ((getprop("/fdm/jsbsim/propulsion/tank[0]/contents-lbs") < 1650 and getprop("/fdm/jsbsim/propulsion/tank[1]/contents-lbs") < 1650) or ((systems.ELEC.Bus.dc2.getValue() < 25 and (fbw.FBW.Failures.elac1.getValue() == 1 or fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.green.getValue() < 1500 and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.yellow.getValue() < 1500 and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (fbw.FBW.Failures.elac2.getValue() == 1 and fbw.FBW.Failures.sec2.getValue() == 1))) or (phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8 and (pts.Engines.Engine.state[0].getValue() != 3 or pts.Engines.Engine.state[1].getValue() != 3)))) { land_asap_a.active = 1; } else { land_asap_a.active = 0; @@ -3496,7 +3496,7 @@ var messages_right_memo = func { nw_strg_disc.colour = "g"; } - if (getprop("/controls/pneumatics/switches/ram-air") == 1) { + if (systems.PNEU.Switch.ramAir.getValue() == 1) { ram_air.active = 1; } else { ram_air.active = 0; @@ -3537,7 +3537,7 @@ var messages_right_memo = func { company_msg.active = 0; } - if (getprop("/controls/ice-protection/leng") == 1 or getprop("/controls/ice-protection/reng") == 1 or getprop("/systems/electrical/bus/dc-1") == 0 or getprop("/systems/electrical/bus/dc-2") == 0) { + if (getprop("/controls/ice-protection/leng") == 1 or getprop("/controls/ice-protection/reng") == 1 or systems.ELEC.Bus.dc1.getValue() < 25 or systems.ELEC.Bus.dc2.getValue() < 25) { eng_aice.active = 1; } else { eng_aice.active = 0; @@ -3549,7 +3549,7 @@ var messages_right_memo = func { wing_aice.active = 0; } - if (getprop("/controls/pneumatics/switches/apu") == 1 and pts.APU.rpm.getValue() >= 95) { + if (systems.PNEU.Switch.apu.getValue() == 1 and pts.APU.rpm.getValue() >= 95) { apu_bleed.active = 1; } else { apu_bleed.active = 0; @@ -3561,43 +3561,43 @@ var messages_right_memo = func { apu_avail.active = 0; } - if (getprop("/controls/lighting/landing-lights[1]") > 0 or getprop("/controls/lighting/landing-lights[2]") > 0) { + if (pts.Controls.Lighting.landingLights[1].getValue() > 0 or pts.Controls.Lighting.landingLights[2].getValue() > 0) { ldg_lt.active = 1; } else { ldg_lt.active = 0; } - if (getprop("/controls/gear/brake-fans") == 1) { + if (systems.BrakeSys.brakeFans.getValue() == 1) { brk_fan.active = 1; } else { brk_fan.active = 0; } - if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1) { # todo: emer elec + if (pts.Instrumentation.MKVII.Inputs.Discretes.flap3Override.getValue() == 1) { # todo: emer elec gpws_flap3.active = 1; } else { gpws_flap3.active = 0; } - if (!getprop("/systems/radio/vhf3-data-mode") and (phaseVarMemo3 == 1 or phaseVarMemo3 == 2 or phaseVarMemo3 == 6 or phaseVarMemo3 == 9 or phaseVarMemo3 == 10)) { + if (!rmp.vhf3_data_mode.getValue() and (phaseVarMemo3 == 1 or phaseVarMemo3 == 2 or phaseVarMemo3 == 6 or phaseVarMemo3 == 9 or phaseVarMemo3 == 10)) { vhf3_voice.active = 1; } else { vhf3_voice.active = 0; } - if (getprop("/controls/autobrake/mode") == 1 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { + if (systems.Autobrake.mode.getValue() == 1 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { auto_brk_lo.active = 1; } else { auto_brk_lo.active = 0; } - if (getprop("/controls/autobrake/mode") == 2 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { + if (systems.Autobrake.mode.getValue() == 2 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { auto_brk_med.active = 1; } else { auto_brk_med.active = 0; } - if (getprop("/controls/autobrake/mode") == 3 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { + if (systems.Autobrake.mode.getValue() == 3 and (phaseVarMemo3 == 7 or phaseVarMemo3 == 8)) { auto_brk_max.active = 1; } else { auto_brk_max.active = 0; From 6daa0345dd00d08cd53cd1dfa78dec205a37ee93 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 4 Aug 2021 19:14:32 +0100 Subject: [PATCH 18/31] Improve the quality of the LAND ASAP memos --- Nasal/ECAM/ECAM-logic.nas | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index e2d4262a..56973748 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -36,6 +36,7 @@ var altAlertInhibit = nil; var alt200 = nil; var alt750 = nil; var bigThree = nil; +var fltCtlLandAsap = 0; var altAlertSteady = 0; var altAlertFlash = 0; @@ -3411,14 +3412,20 @@ var messages_right_memo = func { ldg_inhibit.active = 0; } - if ((!pts.Gear.wow[1].getValue()) and (systems.ELEC.EmerElec.getValue() or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1) or (((systems.HYD.Psi.green.getValue() < 1500 and pts.Engines.Engine.state[0].getValue() == 3) and (systems.HYD.Psi.yellow.getValue() < 1500 and pts.Engines.Engine.state[1].getValue() == 3)) or ((systems.HYD.Psi.green.getValue() < 1500 or systems.HYD.Psi.yellow.getValue() < 1500) and pts.Engines.Engine.state[0].getValue() == 3 and pts.Engines.Engine.state[1].getValue() == 3) and phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8)) { - # todo: emer elec + if (!(FWC.Timer.gnd.getValue() == 1) and (systems.ELEC.EmerElec.getValue() or dualFailNode.getValue() == 1 or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1 or (getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")) or (getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr")) or (getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")))) { land_asap_r.active = 1; } else { land_asap_r.active = 0; } - if (land_asap_r.active == 0 and !pts.Gear.wow[1].getValue() and ((getprop("/fdm/jsbsim/propulsion/tank[0]/contents-lbs") < 1650 and getprop("/fdm/jsbsim/propulsion/tank[1]/contents-lbs") < 1650) or ((systems.ELEC.Bus.dc2.getValue() < 25 and (fbw.FBW.Failures.elac1.getValue() == 1 or fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.green.getValue() < 1500 and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.yellow.getValue() < 1500 and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (fbw.FBW.Failures.elac2.getValue() == 1 and fbw.FBW.Failures.sec2.getValue() == 1))) or (phaseVarMemo3 >= 3 and phaseVarMemo3 <= 8 and (pts.Engines.Engine.state[0].getValue() != 3 or pts.Engines.Engine.state[1].getValue() != 3)))) { + if ((systems.ELEC.Bus.dc2.getValue() < 25 and (fbw.FBW.Failures.elac1.getValue() == 1 or fbw.FBW.Failures.sec1.getValue() == 1)) or ((systems.HYD.Psi.yellow.getValue() < 1500 or systems.HYD.Psi.green.getValue() < 1500) and (fbw.FBW.Failures.elac1.getValue() == 1 and fbw.FBW.Failures.sec1.getValue() == 1)) or (systems.HYD.Psi.blue.getValue() < 1500 and (fbw.FBW.Failures.elac2.getValue() == 1 and fbw.FBW.Failures.sec2.getValue() == 1))) { + fltCtlLandAsap = 1; + } else { + fltCtlLandAsap = 0; + } + + if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1Fail.getValue() or warningNodes.Logic.eng2Fail.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) { + # todo avionics smoke and reverse unlocked land_asap_a.active = 1; } else { land_asap_a.active = 0; From 979a468e0ca6b616822fe3b6cb36427998132140 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Wed, 4 Aug 2021 15:24:50 -0400 Subject: [PATCH 19/31] Aero: Update roll pitch yaw moments, new inertia values + fixed balence for proper rotation and trim settings --- A320-200-CFM.xml | 36 ++++++++++++++++------------------- A320-200-IAE.xml | 34 +++++++++++++++------------------ A320neo-CFM.xml | 36 ++++++++++++++++------------------- A320neo-PW.xml | 36 ++++++++++++++++------------------- Systems/a320-aerodynamics.xml | 30 ++++++++++++++--------------- Systems/a320-metrics.xml | 4 ++-- 6 files changed, 79 insertions(+), 97 deletions(-) diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 4ba98b4c..5f944d26 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -13,18 +13,18 @@ - 611903 - 1735389 - 1401293 + 414659 + 895647 + 678957 0 0 0 - 95721.5 + 95409.5 -2.4335 0 - -0.75 + -0.934 @@ -32,34 +32,32 @@ -15.44 0 - 0.3 + 0.39 - 3722 + 5896 -10.8 0 - 0.3 + 0.39 - - 11361 + 7256 - -4.3 + -3.3 0 - 0.3 + 0.39 - - 8422 + 6651 - -5.3 + 4.9 0 - 0.3 + 0.39 @@ -71,20 +69,18 @@ -1 - 3000 - -3.1 + 4.2 0 -1 - 0 - -8.1 + 8.2 0 -1 diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index 7849acfa..2a644de4 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -13,9 +13,9 @@ - 611903 - 1735389 - 1401293 + 414659 + 895647 + 678957 0 0 0 @@ -24,7 +24,7 @@ -2.4335 0 - -0.75 + -0.934 @@ -32,34 +32,32 @@ -15.44 0 - 0.3 + 0.39 - 3722 + 5896 -10.8 0 - 0.3 + 0.39 - - 11361 + 7256 - -4.3 + -3.3 0 - 0.3 + 0.39 - - 8422 + 6651 - -5.3 + 4.9 0 - 0.3 + 0.39 @@ -71,20 +69,18 @@ -1 - 3000 - -3.1 + 4.2 0 -1 - 0 - -8.1 + 8.2 0 -1 diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 7d19e913..ef578295 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -13,18 +13,18 @@ - 611903 - 1735389 - 1401293 + 414659 + 895647 + 678957 0 0 0 - 98160.71 + 95409.5 -2.4335 0 - -0.75 + -0.934 @@ -32,34 +32,32 @@ -15.44 0 - 0.3 + 0.39 - 3722 + 5896 -10.8 0 - 0.3 + 0.39 - - 11361 + 7256 - -4.3 + -3.3 0 - 0.3 + 0.39 - - 8422 + 6651 - -5.3 + 4.9 0 - 0.3 + 0.39 @@ -71,20 +69,18 @@ -1 - 3000 - -3.1 + 4.2 0 -1 - 0 - -8.1 + 8.2 0 -1 diff --git a/A320neo-PW.xml b/A320neo-PW.xml index 88082031..5070d82d 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -13,18 +13,18 @@ - 611903 - 1735389 - 1401293 + 414659 + 895647 + 678957 0 0 0 - 97497.7 + 95409.5 -2.4335 0 - -0.75 + -0.934 @@ -32,34 +32,32 @@ -15.44 0 - 0.3 + 0.39 - 3722 + 5896 -10.8 0 - 0.3 + 0.39 - - 11361 + 7256 - -4.3 + -3.3 0 - 0.3 + 0.39 - - 8422 + 6651 - -5.3 + 4.9 0 - 0.3 + 0.39 @@ -71,20 +69,18 @@ -1 - 3000 - -3.1 + 4.2 0 -1 - 0 - -8.1 + 8.2 0 -1 diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index fa02e9f5..0f23ef08 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -3,12 +3,10 @@ - + ice/wingL ice/wingR - tuneF - tuneS Lift factor due to ground effect @@ -497,7 +495,7 @@ aero/qbar-psf metrics/Sw-sqft aero/beta-rad - -0.8887 + -0.6457 @@ -527,7 +525,7 @@ metrics/Sw-sqft aero/bi2vel velocities/r-aero-rad_sec - 0.8709 + 0.6983 @@ -537,7 +535,7 @@ aero/qbar-psf metrics/Sw-sqft hydraulics/rudder/final-deg - -0.214 + -0.145 @@ -575,7 +573,7 @@ metrics/bw-ft aero/bi2vel velocities/p-aero-rad_sec - -0.58 + -0.53 @@ -598,7 +596,7 @@ metrics/Sw-sqft metrics/bw-ft hydraulics/aileron-l/final-deg - 0.044 + 0.031 @@ -609,7 +607,7 @@ metrics/Sw-sqft metrics/bw-ft hydraulics/aileron-r/final-deg - -0.044 + -0.031 @@ -620,7 +618,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/spoiler-left-deg - -0.033 + -0.023 @@ -631,7 +629,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/spoiler-right-deg - 0.033 + 0.023 @@ -713,7 +711,7 @@ metrics/Sw-sqft metrics/cbarw-ft hydraulics/elevator-l/final-deg - -0.557175 + -0.345 @@ -724,7 +722,7 @@ metrics/Sw-sqft metrics/cbarw-ft hydraulics/elevator-r/final-deg - -0.557175 + -0.345 @@ -735,7 +733,7 @@ metrics/Sw-sqft metrics/cbarw-ft hydraulics/stabilizer/final-deg - -1.975 + -2.575 @@ -773,7 +771,7 @@ metrics/bw-ft aero/bi2vel velocities/r-aero-rad_sec - -0.3 + -0.25 @@ -784,7 +782,7 @@ metrics/Sw-sqft metrics/bw-ft hydraulics/rudder/final-deg - 0.061 + 0.042 diff --git a/Systems/a320-metrics.xml b/Systems/a320-metrics.xml index 50dcbfe8..0e991438 100644 --- a/Systems/a320-metrics.xml +++ b/Systems/a320-metrics.xml @@ -12,9 +12,9 @@ 248.79 - -2.6496 + -2.2658 0 - -0.75 + -0.934 From f13a0f2b5a2433da38f7e7933ac7a4e8553b9791 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 15:54:38 +0100 Subject: [PATCH 20/31] Bugfix the PFD --- Models/Instruments/PFD/PFD.nas | 2 +- Nasal/Libraries/property-tree-setup.nas | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 46fbdc6d..1fed75d8 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -397,7 +397,7 @@ var canvas_PFD_base = { me["AI_agl"].setText(sprintf("%s", math.round(math.clamp(gear_agl_cur, 0, 2500)))); - if (gear_agl_cur < 400 and pts.Velocities.groundspeedKt.getValue() > 50 and pts.Controls.Engines.Engine.throttlePos[0].getValue() < 0.78 and pts.Controls.Engines.Engine.throttlePos[1].getValue() < 0.78) { + if (gear_agl_cur < 400 and pts.Velocities.groundspeedKt.getValue() > 50 and pts.Fdm.JSBsim.Fadec.detent[0].getValue() <= 3 and pts.Fdm.JSBsim.Fadec.detent[1].getValue() <= 3) { me["tailstrikeInd"].show(); } else { me["tailstrikeInd"].hide(); diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index 725253e1..dce36645 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -104,6 +104,9 @@ var Fdm = { alpha: props.globals.getNode("/fdm/jsbsim/aero/alpha-deg"), alphaNorm: props.globals.getNode("/fdm/jsbsim/aero/alpha-deg-norm"), }, + Fadec: { + detent: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/detent"),props.globals.getNode("/fdm/jsbsim/fadec/control-2/detent")], + }, Fcs: { brake: [props.globals.getNode("/fdm/jsbsim/fcs/left-brake-cmd-norm"),props.globals.getNode("/fdm/jsbsim/fcs/right-brake-cmd-norm")], flapDeg: props.globals.getNode("/fdm/jsbsim/fcs/flap-pos-deg"), From 14c1c43dfc605c26cbaffea922b3b79467bd97c3 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 16:47:56 +0100 Subject: [PATCH 21/31] ECAM: replace getprop --- Nasal/ECAM/ECAM-logic.nas | 4 ++-- Nasal/Systems/hydraulics.nas | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index 56973748..b3cc9004 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -2099,7 +2099,7 @@ var messages_priority_2 = func { altnLaw.active = 1; altnLawProt.active = 1; if (altnLawMaxSpeed.clearFlag == 0 and altnLawMaxSpeed2.clearFlag == 0 and !fbw.tripleADRFail) { - if (!(getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and (getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr") or getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")))) { + if (!(systems.HYD.Warnings.greenAbnormLoPr.getValue() and (systems.HYD.Warnings.blueAbnormLoPr.getValue() or systems.HYD.Warnings.yellowAbnormLoPr.getValue()))) { altnLawMaxSpeed.active = 1; ECAM_controller.warningReset(altnLawMaxSpeed2); } else { @@ -3412,7 +3412,7 @@ var messages_right_memo = func { ldg_inhibit.active = 0; } - if (!(FWC.Timer.gnd.getValue() == 1) and (systems.ELEC.EmerElec.getValue() or dualFailNode.getValue() == 1 or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1 or (getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")) or (getprop("/ECAM/warnings/hyd/green-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr")) or (getprop("/ECAM/warnings/hyd/blue-abnorm-lo-pr") and getprop("/ECAM/warnings/hyd/yellow-abnorm-lo-pr")))) { + if (!(FWC.Timer.gnd.getValue() == 1) and (systems.ELEC.EmerElec.getValue() or dualFailNode.getValue() == 1 or systems.eng1FireWarn.getValue() == 1 or systems.eng2FireWarn.getValue() == 1 or systems.apuFireWarn.getValue() == 1 or systems.aftCargoFireWarn.getValue() == 1 or systems.fwdCargoFireWarn.getValue() == 1 or (systems.HYD.Warnings.greenAbnormLoPr.getValue() and systems.HYD.Warnings.yellowAbnormLoPr.getValue()) or (systems.HYD.Warnings.greenAbnormLoPr.getValue() and systems.HYD.Warnings.blueAbnormLoPr.getValue()) or (systems.HYD.Warnings.blueAbnormLoPr.getValue() and systems.HYD.Warnings.yellowAbnormLoPr.getValue()))) { land_asap_r.active = 1; } else { land_asap_r.active = 0; diff --git a/Nasal/Systems/hydraulics.nas b/Nasal/Systems/hydraulics.nas index 9de480f2..70d7af27 100644 --- a/Nasal/Systems/hydraulics.nas +++ b/Nasal/Systems/hydraulics.nas @@ -62,6 +62,11 @@ var HYD = { yellowFire: props.globals.getNode("/systems/hydraulic/sources/yellow-edp/fire-valve"), greenFire: props.globals.getNode("/systems/hydraulic/sources/green-edp/fire-valve"), }, + Warnings: { + blueAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/blue-abnorm-lo-pr"), + greenAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/green-abnorm-lo-pr"), + yellowAbnormLoPr: props.globals.getNode("/ECAM/warnings/hyd/yellow-abnorm-lo-pr"), + }, init: func() { me.resetFail(); me.Qty.blueInput.setValue(math.round((rand() * 2) + 6 , 0.1)); # Random between 6 and 8 From 904db4e3003b8daf631c3a3a4867726cb8bf106c Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 20:28:09 +0100 Subject: [PATCH 22/31] Remove extra floating thing on ND --- Models/Instruments/ND/canvas/res/airbusND.svg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg index 33706324..363030ba 100644 --- a/Models/Instruments/ND/canvas/res/airbusND.svg +++ b/Models/Instruments/ND/canvas/res/airbusND.svg @@ -1200,10 +1200,6 @@ inkscape:transform-center-y="-345.50518" inkscape:label="#path6714" inkscape:transform-center-x="-0.001953124" /> Date: Thu, 5 Aug 2021 20:54:01 +0100 Subject: [PATCH 23/31] Bugfix --- Nasal/ECAM/ECAM-logic.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index b3cc9004..47d360d9 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -2136,7 +2136,7 @@ var messages_priority_2 = func { if (getprop("/systems/thrust/thr-locked-flash") == 0) { athr_lock.msg = " "; } else { - athr_lock.msg = msgSave + athr_lock.msg = msgSave; } athr_lock.active = 1; athr_lock_1.active = 1; From a84eebf5f2f727e7bd45524a105b94d5b08c4fc5 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 20:59:17 +0100 Subject: [PATCH 24/31] Improve ATIS page based upon photo reference --- Models/Instruments/MCDU/MCDU.nas | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index f9e09f1c..ecb82b0b 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1432,10 +1432,10 @@ var canvas_MCDU_base = { me.colorLeft("blu", "blu", "blu", "blu", "wht", "wht"); me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht"); me.colorLeftArrow("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorCenter("grn", "grn", "grn", "grn", "wht", "wht"); + me.colorCenter("wht", "wht", "wht", "wht", "wht", "wht"); me.colorCenterS("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorRight("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht"); + me.colorRight("blu", "blu", "blu", "blu", "wht", "blu"); + me.colorRightS("blu", "blu", "blu", "blu", "wht", "wht"); me.colorRightArrow("wht", "wht", "wht", "wht", "wht", "wht"); @@ -1468,7 +1468,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[0].station != nil) { me["Simple_L1"].setText(" " ~ atsu.ATISInstances[0].station ~ "/" ~ (atsu.ATISInstances[0].type == 0 ? "ARR" : "DEP")); me["Simple_L1"].setFont(default); - me["Simple_L1_Arrow"].show(); + if (atsu.ATISInstances[0].received) { + me["Simple_L1_Arrow"].show(); + } else { + me["Simple_L1_Arrow"].hide(); + } } else { me["Simple_L1"].setText(" [ ]/[ ]"); me["Simple_L1"].setFont(symbol); @@ -1486,6 +1490,11 @@ var canvas_MCDU_base = { me["Simple_L2"].setText(" " ~ atsu.ATISInstances[1].station ~ "/" ~ (atsu.ATISInstances[1].type == 0 ? "ARR" : "DEP")); me["Simple_L2"].setFont(default); me["Simple_L2_Arrow"].show(); + if (atsu.ATISInstances[1].received) { + me["Simple_L2_Arrow"].show(); + } else { + me["Simple_L2_Arrow"].hide(); + } } else { me["Simple_L2"].setText(" [ ]/[ ]"); me["Simple_L2"].setFont(symbol); @@ -1502,7 +1511,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[2].station != nil) { me["Simple_L3"].setText(" " ~ atsu.ATISInstances[2].station ~ "/" ~ (atsu.ATISInstances[2].type == 0 ? "ARR" : "DEP")); me["Simple_L3"].setFont(default); - me["Simple_L3_Arrow"].show(); + if (atsu.ATISInstances[2].received) { + me["Simple_L3_Arrow"].show(); + } else { + me["Simple_L3_Arrow"].hide(); + } } else { me["Simple_L3"].setText(" [ ]/[ ]"); me["Simple_L3"].setFont(symbol); @@ -1519,7 +1532,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[3].station != nil) { me["Simple_L4"].setText(" " ~ atsu.ATISInstances[3].station ~ "/" ~ (atsu.ATISInstances[3].type == 0 ? "ARR" : "DEP")); me["Simple_L4"].setFont(default); - me["Simple_L4_Arrow"].show(); + if (atsu.ATISInstances[3].received) { + me["Simple_L4_Arrow"].show(); + } else { + me["Simple_L4_Arrow"].hide(); + } } else { me["Simple_L4"].setText(" [ ]/[ ]"); me["Simple_L4"].setFont(symbol); From 8f6ec0512b7bbe8a7cf1debf0320fd6b81893a1b Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 21:03:51 +0100 Subject: [PATCH 25/31] Bugfix the received ATIS from a FAA server (due to changed API format) --- Nasal/Systems/Comm/Notification.nas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nasal/Systems/Comm/Notification.nas b/Nasal/Systems/Comm/Notification.nas index 5d01f494..d2510cc8 100644 --- a/Nasal/Systems/Comm/Notification.nas +++ b/Nasal/Systems/Comm/Notification.nas @@ -357,8 +357,8 @@ var ATIS = { raw = split('"}', raw)[0]; } else { if (me.type == 0) { - raw = split('{"arr":"', raw)[1]; - raw = split('","dep":', raw)[0]; + raw = split('"arr":"', raw)[1]; + raw = split('","dep":"', raw)[0]; } else { raw = split('","dep":"', raw)[1]; raw = split('"}', raw)[0]; From 4724bfe0b480fe12d0dde8f1cd323979c92bb4ee Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 6 Aug 2021 14:56:29 +0100 Subject: [PATCH 26/31] Add pulsing IDLE to E/WD --- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 41 ++++++++++++++++++- .../Instruments/Upper-ECAM/res/cfm-eis2.svg | 13 ++++++ .../Instruments/Upper-ECAM/res/iae-eis2.svg | 13 ++++++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index d7a6f042..dedcd4e3 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -30,6 +30,9 @@ 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 enginesBothAtIdle = props.globals.getNode("/fdm/jsbsim/fadec/both-at-idle"); +var enginesBothAtIdleTime = props.globals.initNode("/ECAM/Upper/idle-time", 0.0, "DOUBLE"); +var enginesBothAtIdleTimeSaved = props.globals.initNode("/ECAM/Upper/idle-time-saved", 0.0, "DOUBLE"); var canvas_upperECAM = { new: func(svg, name, type) { @@ -496,7 +499,7 @@ var canvas_upperECAM = { "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","FOB-weight-unit","FFlow-weight-unit","SlatAlphaLock", - "SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp"]; + "SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp","idleIndication"]; }, getKeysIAE: func() { return ["EPR1-needle","EPR1-thr","EPR1-ylim","EPR1","EPR1-decpnt","EPR1-decimal","EPR1-box","EPR1-scale","EPR1-scaletick","EPR1-scalenum","EPR1-XX","EPR1-XX2","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick","EGT1-XX", @@ -504,7 +507,7 @@ var canvas_upperECAM = { "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","EPRMode", "N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","N1Mode","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","FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock","SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp"]; + "ECAMR4","ECAMR5","ECAMR6","ECAMR7","ECAMR8","ECAM_Right","FFlow1-weight-unit", "FFlow2-weight-unit", "FOB-weight-unit","SlatAlphaLock","SlatIndicator","FlapIndicator","SlatLine","FlapLine","aFloor","FlxLimDegreesC","FlxLimTemp","idleIndication"]; }, getKeysTest: func() { return ["Test_white","Test_text"]; @@ -531,6 +534,9 @@ var canvas_upperECAM = { me[key].setColor(me.getColorString(node.getValue())); }, 0, 0); }, + displayIdle: 0, + displayIdleDim: 0, + displayIdleTrigger: 0, updateCommon: func(notification) { me.updatePower(); @@ -542,6 +548,37 @@ var canvas_upperECAM = { return; } + if (enginesBothAtIdle.getValue() and !me["aFloor"].getVisible() and !notification.gear1Wow and notification.athr) { + if (!me.displayIdleTrigger) { + enginesBothAtIdleTime.setValue(notification.elapsedTime); + me.displayIdleTrigger = 1; + } + if ((notification.elapsedTime - enginesBothAtIdleTime.getValue()) < 10) { + if ((notification.elapsedTime - enginesBothAtIdleTimeSaved.getValue()) > 1) { + enginesBothAtIdleTimeSaved.setValue(notification.elapsedTime); + me.displayIdleDim = !me.displayIdleDim; + } + } + me.displayIdle = 1; + } else { + me.displayIdle = 0; + me.displayIdleDim = 0; + me.displayIdleTrigger = 0; + enginesBothAtIdleTime.setValue(0); + enginesBothAtIdleTimeSaved.setValue(0); + } + + if (me.displayIdle) { + me["idleIndication"].show(); + if (me.displayIdleDim) { + me["idleIndication"].setColor(0.0509,0.7529,0.2941,0.5); + } else { + me["idleIndication"].setColor(0.0509,0.7529,0.2941,1); + } + } else { + me["idleIndication"].hide(); + } + foreach(var update_item; me.update_items) { update_item.update(notification); diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg index 1362ab37..7470c948 100644 --- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg +++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg @@ -1476,4 +1476,17 @@ x="111.21719" id="tspan3554" sodipodi:role="line">A FLOOR + IDLE diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg index cc232e0b..dccad437 100644 --- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg +++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg @@ -1971,4 +1971,17 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" /> + IDLE From 84adee96174864573c10a8d90da08fdb899ba056 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Fri, 6 Aug 2021 18:10:50 -0400 Subject: [PATCH 27/31] Control: Fix bugfix in engine sim --- Systems/a320-cfm56-5b4-engine-fadec.xml | 20 ++++++++++---------- Systems/a320-v2527-a5-engine-fadec.xml | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml index 60571a4f..3ca351e7 100644 --- a/Systems/a320-cfm56-5b4-engine-fadec.xml +++ b/Systems/a320-cfm56-5b4-engine-fadec.xml @@ -38,16 +38,16 @@ velocities/mach atmosphere/density-altitude - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2710 0.0000 - 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2610 0.0000 - 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2530 0.0000 - 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2180 0.0000 - 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.1930 0.0000 - 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1140 0.0000 - 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0450 0.0000 - 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + -10000 0 10000 20000 30000 43000 50000 + 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2840 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2740 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2670 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2310 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.2060 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1270 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0580 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml index 2823f4c5..4c16c6d1 100644 --- a/Systems/a320-v2527-a5-engine-fadec.xml +++ b/Systems/a320-v2527-a5-engine-fadec.xml @@ -67,16 +67,16 @@ velocities/mach atmosphere/density-altitude - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2710 0.0000 - 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2610 0.0000 - 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2530 0.0000 - 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2180 0.0000 - 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.1930 0.0000 - 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1140 0.0000 - 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0450 0.0000 - 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 - 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + -10000 0 10000 20000 30000 43000 50000 + 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2840 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2740 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2670 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2310 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.2060 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1270 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0580 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 From 914c7eb0f4f1e7c25a518d60692f9a0ea96c9c47 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Sun, 8 Aug 2021 00:14:01 -0400 Subject: [PATCH 28/31] Sim: bugfix spoiler interactions and cockpit animation/clickspot --- A320-main.xml | 64 ++--------------- Models/FlightDeck/a320.flightdeck.xml | 46 +++--------- Nasal/Libraries/controls-override.nas | 45 ++++++++---- Nasal/Libraries/property-tree-setup.nas | 1 + Systems/a320-cockpit.xml | 10 +++ Systems/a320-spoiler.xml | 93 ++++++++++++++----------- 6 files changed, 108 insertions(+), 151 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index cb5dd062..4ab0b1f1 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -4396,9 +4396,7 @@ Simple Engage/Disengage reversers nasal - + @@ -4406,9 +4404,7 @@ Disengage/Decrease reversers nasal - + @@ -4416,65 +4412,15 @@ Engage/Increase reversers nasal - + Ctrl-b Cycle speedbrake setting - - - - /controls/flight/speedbrake-arm - 1 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - - property-cycle - /controls/flight/speedbrake - 0.0 - 1.0 - - - - - - /controls/flight/speedbrake-arm - 1 - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - property-cycle - /controls/flight/speedbrake - 0.0 - 0.5 - 1.0 - - - property-assign - /controls/flight/speedbrake-arm - 0 + nasal + diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index d040c2d1..b81491a1 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -6992,48 +6992,20 @@ 1 - - - false - - nasal - - - false nasal - + + + + + + false + + nasal + diff --git a/Nasal/Libraries/controls-override.nas b/Nasal/Libraries/controls-override.nas index 2edacb0a..e96bd183 100644 --- a/Nasal/Libraries/controls-override.nas +++ b/Nasal/Libraries/controls-override.nas @@ -1,12 +1,6 @@ -# A320 Main Libraries -# Joshua Davidson (Octal450) - +# Airbus A320 Custom Controls # Copyright (c) 2021 Josh Davidson (Octal450) -############ -# Controls # -############ - controls.stepSpoilers = func(step) { pts.Controls.Flight.speedbrakeArm.setValue(0); if (step == 1) { @@ -16,7 +10,31 @@ controls.stepSpoilers = func(step) { } } +var speedbrakeKey = func() { + if (pts.Controls.Flight.speedbrakeArm.getBoolValue()) { + pts.Controls.Flight.speedbrakeArm.setBoolValue(0); + } else { + pts.Controls.Flight.speedbrakeTemp = pts.Controls.Flight.speedbrake.getValue(); + if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) { + if (pts.Controls.Flight.speedbrake.getValue() < 1) { + pts.Controls.Flight.speedbrake.setValue(1); + } else { + pts.Controls.Flight.speedbrake.setValue(0); + } + } else { + if (pts.Controls.Flight.speedbrake.getValue() < 0.5) { + pts.Controls.Flight.speedbrake.setValue(0.5); + } else if (pts.Controls.Flight.speedbrake.getValue() < 1) { + pts.Controls.Flight.speedbrake.setValue(1); + } else { + pts.Controls.Flight.speedbrake.setValue(0); + } + } + } +} + var deploySpeedbrake = func() { + pts.Controls.Flight.speedbrakeArm.setBoolValue(0); if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) { if (pts.Controls.Flight.speedbrake.getValue() < 1.0) { pts.Controls.Flight.speedbrake.setValue(1.0); @@ -24,22 +42,23 @@ var deploySpeedbrake = func() { } else { if (pts.Controls.Flight.speedbrake.getValue() < 0.5) { pts.Controls.Flight.speedbrake.setValue(0.5); - } else if (pts.Controls.Flight.speedbrake.getValue() < 1.0) { - pts.Controls.Flight.speedbrake.setValue(1.0); + } else if (pts.Controls.Flight.speedbrake.getValue() < 1) { + pts.Controls.Flight.speedbrake.setValue(1); } } } var retractSpeedbrake = func() { + pts.Controls.Flight.speedbrakeArm.setBoolValue(0); if (pts.Gear.wow[1].getBoolValue() or pts.Gear.wow[2].getBoolValue()) { - if (pts.Controls.Flight.speedbrake.getValue() > 0.0) { - pts.Controls.Flight.speedbrake.setValue(0.0); + if (pts.Controls.Flight.speedbrake.getValue() > 0) { + pts.Controls.Flight.speedbrake.setValue(0); } } else { if (pts.Controls.Flight.speedbrake.getValue() > 0.5) { pts.Controls.Flight.speedbrake.setValue(0.5); - } else if (pts.Controls.Flight.speedbrake.getValue() > 0.0) { - pts.Controls.Flight.speedbrake.setValue(0.0); + } else if (pts.Controls.Flight.speedbrake.getValue() > 0) { + pts.Controls.Flight.speedbrake.setValue(0); } } } diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index dce36645..568172b0 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -54,6 +54,7 @@ var Controls = { flapsPos: props.globals.getNode("/controls/flight/flaps-pos"), speedbrake: props.globals.getNode("/controls/flight/speedbrake"), speedbrakeArm: props.globals.getNode("/controls/flight/speedbrake-arm"), + speedbrakeTemp: 0, rudder: props.globals.getNode("/controls/flight/rudder"), rudderTrim: props.globals.getNode("/controls/flight/rudder-trim"), }, diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml index 41c21b16..f5d01ebd 100644 --- a/Systems/a320-cockpit.xml +++ b/Systems/a320-cockpit.xml @@ -7,6 +7,16 @@ + + spoilers/lever-cmd + 20 + + + + /controls/flight/speedbrake-arm + 20 + + diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml index 9d144a06..7658d70b 100644 --- a/Systems/a320-spoiler.xml +++ b/Systems/a320-spoiler.xml @@ -9,6 +9,28 @@ + + + + /controls/flight/speedbrake gt 0 + + /controls/flight/speedbrake-arm + + + + + + /controls/flight/speedbrake + + 0.10 0.0 + 0.45 0.5 + 0.55 0.5 + 0.90 1.0 + +
+ + + @@ -25,8 +47,8 @@ - - + + fadec/control-1/detent ne 0 fadec/control-2/detent ne 0 @@ -39,7 +61,7 @@ spoilers/main-gear-and eq 1 /velocities/groundspeed-kt ge 72 - + fadec/control-1/detent eq 0 fadec/control-2/detent eq 0 /controls/flight/speedbrake-arm eq 1 @@ -48,51 +70,38 @@ + + + + /controls/flight/speedbrake-arm eq 1 + + + spoilers/main-gear-or eq 0 fbw/fmgc/enabled eq 1 - - spoilers/main-gear-or eq 0 - fbw/fmgc/enabled eq 1 - - + - /controls/flight/speedbrake - - 0.10 0.0 - 0.45 0.625 - 0.55 0.625 - 0.95 1.0 + spoilers/lever-cmd + + 0.0 0.000 + 0.5 0.625 + 1.0 1.000
- - - - spoilers/speedbrake-nul - 20 - - - - spoilers/speedbrake-nul - spoilers/auto-speedbrake-cmd + fbw/spoiler-output - 0.0 + 0 spoilers/max-spoiler - fbw/spoiler-output - - - - /controls/flight/speedbrake-arm - 20 - + @@ -125,7 +134,7 @@ hydraulics/spoiler-l1/switch - 50.0 + 50 @@ -243,7 +252,7 @@ hydraulics/spoiler-l2/switch - 50.0 + 50 @@ -339,7 +348,7 @@ hydraulics/spoiler-l3/switch - 50.0 + 50 @@ -435,7 +444,7 @@ hydraulics/spoiler-l4/switch - 50.0 + 50 @@ -507,7 +516,7 @@ hydraulics/spoiler-l5/switch - 50.0 + 50 @@ -546,7 +555,7 @@ hydraulics/spoiler-r1/switch - 50.0 + 50 @@ -664,7 +673,7 @@ hydraulics/spoiler-r2/switch - 50.0 + 50 @@ -760,7 +769,7 @@ hydraulics/spoiler-r3/switch - 50.0 + 50 @@ -856,7 +865,7 @@ hydraulics/spoiler-r4/switch - 50.0 + 50 @@ -928,7 +937,7 @@ hydraulics/spoiler-r5/switch - 50.0 + 50 From 6b1b45199f0b5145a2fe75ee35bd86376f0c870e Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Mon, 9 Aug 2021 20:27:42 +0100 Subject: [PATCH 29/31] MCDU: split out functions out of the MCDU --- A320-main.xml | 1 + Models/Instruments/MCDU/MCDU-funcs.nas | 359 +++++++++ Models/Instruments/MCDU/MCDU.nas | 1025 ++++++++---------------- 3 files changed, 696 insertions(+), 689 deletions(-) create mode 100644 Models/Instruments/MCDU/MCDU-funcs.nas diff --git a/A320-main.xml b/A320-main.xml index 84da58bb..975bbd23 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -4768,6 +4768,7 @@ Aircraft/A320-family/Models/Instruments/IESI/IESI.nas + Aircraft/A320-family/Models/Instruments/MCDU/MCDU-funcs.nas Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas diff --git a/Models/Instruments/MCDU/MCDU-funcs.nas b/Models/Instruments/MCDU/MCDU-funcs.nas new file mode 100644 index 00000000..d823cdbc --- /dev/null +++ b/Models/Instruments/MCDU/MCDU-funcs.nas @@ -0,0 +1,359 @@ +var showLeft = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_L1"].show(); + } else { + obj["Simple_L1"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_L2"].show(); + } else { + obj["Simple_L2"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_L3"].show(); + } else { + obj["Simple_L3"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_L4"].show(); + } else { + obj["Simple_L4"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_L5"].show(); + } else { + obj["Simple_L5"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_L6"].show(); + } else { + obj["Simple_L6"].hide(); + } + } +}; + +var showLeftS = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_L1S"].show(); + } else { + obj["Simple_L1S"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_L2S"].show(); + } else { + obj["Simple_L2S"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_L3S"].show(); + } else { + obj["Simple_L3S"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_L4S"].show(); + } else { + obj["Simple_L4S"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_L5S"].show(); + } else { + obj["Simple_L5S"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_L6S"].show(); + } else { + obj["Simple_L6S"].hide(); + } + } +}; + +var showCenter = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_C1"].show(); + } else { + obj["Simple_C1"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_C2"].show(); + } else { + obj["Simple_C2"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_C3"].show(); + } else { + obj["Simple_C3"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_C4"].show(); + } else { + obj["Simple_C4"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_C5"].show(); + } else { + obj["Simple_C5"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_C6"].show(); + } else { + obj["Simple_C6"].hide(); + } + } +}; + +var showCenterS = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_C1S"].show(); + } else { + obj["Simple_C1S"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_C2S"].show(); + } else { + obj["Simple_C2S"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_C3S"].show(); + } else { + obj["Simple_C3S"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_C4S"].show(); + } else { + obj["Simple_C4S"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_C5S"].show(); + } else { + obj["Simple_C5S"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_C6S"].show(); + } else { + obj["Simple_C6S"].hide(); + } + } +}; + +var showRight = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_R1"].show(); + } else { + obj["Simple_R1"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_R2"].show(); + } else { + obj["Simple_R2"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_R3"].show(); + } else { + obj["Simple_R3"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_R4"].show(); + } else { + obj["Simple_R4"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_R5"].show(); + } else { + obj["Simple_R5"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_R6"].show(); + } else { + obj["Simple_R6"].hide(); + } + } +}; + +var showRightS = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_R1S"].show(); + } else { + obj["Simple_R1S"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_R2S"].show(); + } else { + obj["Simple_R2S"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_R3S"].show(); + } else { + obj["Simple_R3S"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_R4S"].show(); + } else { + obj["Simple_R4S"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_R5S"].show(); + } else { + obj["Simple_R5S"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_R6S"].show(); + } else { + obj["Simple_R6S"].hide(); + } + } +}; + +var showLeftArrow = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_L1_Arrow"].show(); + } else { + obj["Simple_L1_Arrow"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_L2_Arrow"].show(); + } else { + obj["Simple_L2_Arrow"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_L3_Arrow"].show(); + } else { + obj["Simple_L3_Arrow"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_L4_Arrow"].show(); + } else { + obj["Simple_L4_Arrow"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_L5_Arrow"].show(); + } else { + obj["Simple_L5_Arrow"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_L6_Arrow"].show(); + } else { + obj["Simple_L6_Arrow"].hide(); + } + } +}; + +var showRightArrow = func (obj, a, b, c, d, e, f) { + if (a != 0) { + if (a >= 1) { + obj["Simple_R1_Arrow"].show(); + } else { + obj["Simple_R1_Arrow"].hide(); + } + } + if (b != 0) { + if (b >= 1) { + obj["Simple_R2_Arrow"].show(); + } else { + obj["Simple_R2_Arrow"].hide(); + } + } + if (c != 0) { + if (c >= 1) { + obj["Simple_R3_Arrow"].show(); + } else { + obj["Simple_R3_Arrow"].hide(); + } + } + if (d != 0) { + if (d >= 1) { + obj["Simple_R4_Arrow"].show(); + } else { + obj["Simple_R4_Arrow"].hide(); + } + } + if (e != 0) { + if (e >= 1) { + obj["Simple_R5_Arrow"].show(); + } else { + obj["Simple_R5_Arrow"].hide(); + } + } + if (f != 0) { + if (f >= 1) { + obj["Simple_R6_Arrow"].show(); + } else { + obj["Simple_R6_Arrow"].hide(); + } + } +}; \ No newline at end of file diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index ecb82b0b..84d9d036 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -567,13 +567,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("MCDU MENU"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, -1, -1); + showLeft(me,1, 1, 1, 1, -1, -1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, -1); - me.showLeftArrow(1, 1, 1, 1, -1, -1); - me.showRight(-1, -1, -1, -1, -1, -1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,-1, -1, -1, -1, -1, -1); + showLeftArrow(me,1, 1, 1, 1, -1, -1); + showRight(me,-1, -1, -1, -1, -1, -1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -618,13 +618,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("ATSU DATALINK"); me.defaultPageNumbers(); - me.showLeft(1, -1, -1, -1, -1, -1); + showLeft(me,1, -1, -1, -1, -1, -1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, -1); - me.showLeftArrow(1, -1, -1, -1, -1, -1); - me.showRight(1, -1, -1, -1, -1, 1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(1, -1, -1, -1, -1, 1); + showLeftS(me,-1, -1, -1, -1, -1, -1); + showLeftArrow(me,1, -1, -1, -1, -1, -1); + showRight(me,1, -1, -1, -1, -1, 1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,1, -1, -1, -1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -641,13 +641,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("AOC MENU"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, 1, 1); + showLeft(me,1, 1, 1, -1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, 1); - me.showLeftArrow(1, 1, 1, -1, 1, 1); - me.showRight(1, 1, 1, 1, 1, -1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(1, 1, 1, 1, 1, 1); + showLeftS(me,-1, -1, -1, -1, -1, 1); + showLeftArrow(me,1, 1, 1, -1, 1, 1); + showRight(me,1, 1, 1, 1, 1, -1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,1, 1, 1, 1, 1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -687,14 +687,14 @@ var canvas_MCDU_base = { me["ArrowLeft"].hide(); me["ArrowRight"].hide(); - me.showLeft(1, 1, 1, 1, 1, -1); - me.showLeftS(1, -1, 1, 1, 1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(-1, 1, 1, 1, 1, -1); - me.showCenterS(-1, 1, 1, 1, 1, -1); - me.showRight(1, 1, 1, 1, 1, -1); - me.showRightS(1, 1, 1, 1, 1, -1); - me.showRightArrow(-1, -1, -1, -1, 1, -1); + showLeft(me,1, 1, 1, 1, 1, -1); + showLeftS(me,1, -1, 1, 1, 1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,-1, 1, 1, 1, 1, -1); + showCenterS(me,-1, 1, 1, 1, 1, -1); + showRight(me,1, 1, 1, 1, 1, -1); + showRightS(me,1, 1, 1, 1, 1, -1); + showRightArrow(me,-1, -1, -1, -1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -801,13 +801,13 @@ var canvas_MCDU_base = { me.defaultPageNumbers(); me["Simple_L0S"].hide(); - me.showLeft(1, 1, 1, 1, 1, 1); - me.showLeftS(1, 1, 1, 1, -1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); + showLeftS(me,1, 1, 1, 1, -1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); me.colorLeftArrow("wht", "wht", "wht", "wht", "wht", "wht"); - me.showRight(1, 1, 1, 1, -1, -1); - me.showRightS(1, 1, 1, 1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showRight(me,1, 1, 1, 1, -1, -1); + showRightS(me,1, 1, 1, 1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); #me["PRINTPAGE"] - TODO missing asterisk at 5L - only useful when printing available @@ -858,15 +858,15 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("AOC CONFIGURATION"); me.defaultPageNumbers(); - me.showLeft(1, -1, -1, -1, -1, 1); + showLeft(me,1, -1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, -1, -1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, 1, 1, 1, 1, -1); - me.showCenterS(1, -1, 1, -1, 1, -1); - me.showRight(1, -1, -1, -1, -1, 1); - me.showRightS(1, -1, -1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,1, -1, -1, -1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, 1, 1, 1, 1, -1); + showCenterS(me,1, -1, 1, -1, 1, -1); + showRight(me,1, -1, -1, -1, -1, 1); + showRightS(me,1, -1, -1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -913,13 +913,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("WEATHER REQ"); me.defaultPageNumbers(); - me.showLeft(1, -1, -1, -1, -1, 1); + showLeft(me,1, -1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, -1, -1, -1, -1); - me.showLeftArrow(1, -1, -1, -1, -1, 1); - me.showRight(1, 1, 1, -1, 1, -1); - me.showRightS(1, 1, 1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,1, -1, -1, -1, -1, -1); + showLeftArrow(me,1, -1, -1, -1, -1, 1); + showRight(me,1, 1, 1, -1, 1, -1); + showRightS(me,1, 1, 1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -976,13 +976,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("WEATHER TYPE"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, -1, -1); + showLeft(me,1, 1, 1, -1, -1, -1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, -1); - me.showLeftArrow(1, 1, 1, -1, -1, -1); - me.showRight(1, 1, 1, -1, -1, -1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(1, 1, 1, -1, -1, -1); + showLeftS(me,-1, -1, -1, -1, -1, -1); + showLeftArrow(me,1, 1, 1, -1, -1, -1); + showRight(me,1, 1, 1, -1, -1, -1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,1, 1, 1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1021,9 +1021,9 @@ var canvas_MCDU_base = { me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht"); me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht"); - me.showRight(-1, -1, -1, -1, -1, -1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showRight(me,-1, -1, -1, -1, -1, -1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); if (myReceivedMessages[i] != nil) { me["Simple_Title"].setText(sprintf("%s", myReceivedMessages[i].title)); @@ -1088,11 +1088,11 @@ var canvas_MCDU_base = { me.colorCenterS("grn", "wht", "wht", "wht", "wht", "wht"); me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht"); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(1, -1, -1, -1, -1, -1); - me.showRight(-1, -1, -1, -1, -1, -1); - me.showRightS(1, -1, -1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); + showRight(me,-1, -1, -1, -1, -1, -1); + showRightS(me,1, -1, -1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); if (myReceivedMessage[i] != nil) { @@ -1182,13 +1182,13 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, -1, 1, 1, 1); + showLeft(me,1, 1, -1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, 1); - me.showLeftArrow(1, 1, -1, 1, 1, 1); - me.showRight(1, 1, 1, 1, 1, 1); - me.showRightS(-1, -1, -1, -1, 1, -1); - me.showRightArrow(1, 1, 1, 1, 1, 1); + showLeftS(me,-1, -1, -1, -1, -1, 1); + showLeftArrow(me,1, 1, -1, 1, 1, 1); + showRight(me,1, 1, 1, 1, 1, 1); + showRightS(me,-1, -1, -1, -1, 1, -1); + showRightArrow(me,1, 1, 1, 1, 1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1228,16 +1228,16 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, -1, 1, 1); - me.showLeftArrow(1, 1, 1, -1, 1, 1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(-1, -1, -1, 1, -1, -1); - me.showRightS(1, 1, 1, -1, -1, 1); - me.showRight(1, 1, 1, -1, -1, 1); - me.showRightS(1, 1, 1, -1, -1, 1); - me.showRightArrow(1, 1, 1, -1, -1, 1); + showLeftS(me,1, 1, 1, -1, 1, 1); + showLeftArrow(me,1, 1, 1, -1, 1, 1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,-1, -1, -1, 1, -1, -1); + showRightS(me,1, 1, 1, -1, -1, 1); + showRight(me,1, 1, 1, -1, -1, 1); + showRightS(me,1, 1, 1, -1, -1, 1); + showRightArrow(me,1, 1, 1, -1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1319,15 +1319,15 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, -1, -1, -1, 1); + showLeft(me,1, 1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, -1, 1); - me.showLeftArrow(1, 1, -1, -1, -1, 1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(1, -1, -1, -1, -1, -1); - me.showRight(1, -1, -1, -1, -1, -1); - me.showRightS(-1, -1, -1, -1, -1, -1); - me.showRightArrow(1, -1, -1, -1, -1, -1); + showLeftS(me,-1, -1, -1, -1, -1, 1); + showLeftArrow(me,1, 1, -1, -1, -1, 1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); + showRight(me,1, -1, -1, -1, -1, -1); + showRightS(me,-1, -1, -1, -1, -1, -1); + showRightArrow(me,1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1415,15 +1415,15 @@ var canvas_MCDU_base = { me["ArrowLeft"].hide(); me["ArrowRight"].hide(); - me.showLeft(1, 1, 1, 1, -1, 1); + showLeft(me,1, 1, 1, 1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, -1, -1, -1, 1); - me.showLeftArrow(1, 1, 1, -1, -1, 1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(-1, -1, -1, -1, -1, -1); - me.showRight(1, 1, 1, 1, 1, 1); - me.showRightS(1, 1, 1, 1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, 1, -1); + showLeftS(me,1, -1, -1, -1, -1, 1); + showLeftArrow(me,1, 1, 1, -1, -1, 1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,-1, -1, -1, -1, -1, -1); + showRight(me,1, 1, 1, 1, 1, 1); + showRightS(me,1, 1, 1, 1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1583,15 +1583,15 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("NOTIFICATION"); me.defaultPageNumbers(); - me.showLeft(1, 1, -1, -1, -1, 1); + showLeft(me,1, 1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, -1, -1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(-1, 1, -1, -1, -1, -1); - me.showCenterS(-1, -1, -1, -1, -1, -1); - me.showRight(-1, 1, -1, -1, -1, 1); - me.showRightS(-1, -1, -1, -1, -1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); + showLeftS(me,1, 1, -1, -1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,-1, 1, -1, -1, -1, -1); + showCenterS(me,-1, -1, -1, -1, -1, -1); + showRight(me,-1, 1, -1, -1, -1, 1); + showRightS(me,-1, -1, -1, -1, -1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1672,15 +1672,15 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("CONNECTION STATUS"); me.defaultPageNumbers(); - me.showLeft(1, 1, -1, 1, -1, 1); + showLeft(me,1, 1, -1, 1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, -1, -1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, -1, -1, -1, -1, -1); - me.showCenterS(-1, -1, -1, 1, -1, -1); - me.showRight(1, -1, 1, -1, 1, 1); - me.showRightS(-1, -1, 1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); + showLeftS(me,1, 1, -1, -1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, -1, -1, -1, -1, -1); + showCenterS(me,-1, -1, -1, 1, -1, -1); + showRight(me,1, -1, 1, -1, 1, 1); + showRightS(me,-1, -1, 1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1747,13 +1747,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("COMM MENU"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, -1, 1); + showLeft(me,1, 1, 1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, -1, -1, 1); - me.showLeftArrow(1, 1, 1, -1, -1, 1); - me.showRight(1, 1, -1, 1, -1, -1); - me.showRightS(1, 1, -1, -1, -1, -1); - me.showRightArrow(1, 1, -1, 1, -1, -1); + showLeftS(me,1, 1, 1, -1, -1, 1); + showLeftArrow(me,1, 1, 1, -1, -1, 1); + showRight(me,1, 1, -1, 1, -1, -1); + showRightS(me,1, 1, -1, -1, -1, -1); + showRightArrow(me,1, 1, -1, 1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1791,15 +1791,15 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("VHF3 VOICE DIRECTORY"); me.defaultPageNumbers(); - me.showLeft(1, -1, -1, 1, -1, 1); + showLeft(me,1, -1, -1, 1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, -1, 1, -1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(1, -1, -1, -1, -1, -1); - me.showRight(1, -1, -1, -1, 1, 1); - me.showRightS(1, -1, -1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,1, -1, -1, 1, -1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); + showRight(me,1, -1, -1, -1, 1, 1); + showRightS(me,1, -1, -1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1849,15 +1849,15 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("VHF3 DATA MODE"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, -1, 1); + showLeft(me,1, 1, 1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, -1, -1, -1, -1); - me.showLeftArrow(-1, 1, 1, -1, -1, 1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(1, -1, -1, -1, -1, -1); - me.showRight(1, 1, 1, -1, -1, 1); - me.showRightS(1, -1, -1, -1, -1, 1); - me.showRightArrow(-1, 1, 1, -1, -1, -1); + showLeftS(me,1, -1, -1, -1, -1, -1); + showLeftArrow(me,-1, 1, 1, -1, -1, 1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); + showRight(me,1, 1, 1, -1, -1, 1); + showRightS(me,1, -1, -1, -1, -1, 1); + showRightArrow(me,-1, 1, 1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1910,13 +1910,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("COMM INIT"); me.defaultPageNumbers(); - me.showLeft(-1, 1, 1, 1, -1, 1); + showLeft(me,-1, 1, 1, 1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, 1, 1, 1, -1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(-1, -1, 1, -1, -1, 1); - me.showRightS(-1, -1, 1, -1, -1, 1); - me.showRightArrow(-1, -1, 1, -1, -1, -1); + showLeftS(me,-1, 1, 1, 1, -1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,-1, -1, 1, -1, -1, 1); + showRightS(me,-1, -1, 1, -1, -1, 1); + showRightArrow(me,-1, -1, 1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -1955,13 +1955,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("COMM STATUS"); me.defaultPageNumbers(); - me.showLeft(1, 1, -1, 1, 1, 1); + showLeft(me,1, 1, -1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, 1, 1, -1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, 1, -1, 1, 1, 1); - me.showRightS(-1, 1, 1, 1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,-1, 1, 1, -1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, 1, -1, 1, 1, 1); + showRightS(me,-1, 1, 1, 1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2010,13 +2010,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("COMPANY CALL"); me.defaultPageNumbers(); - me.showLeft(1, 1, -1, -1, -1, 1); + showLeft(me,1, 1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, -1, -1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, -1, -1, -1, -1, 1); - me.showRightS(1, -1, -1, -1, -1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,1, 1, -1, -1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, -1, -1, -1, -1, 1); + showRightS(me,1, -1, -1, -1, -1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2106,13 +2106,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText(sprintf("%s", " " ~ acType.getValue())); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, -1, 1); + showLeft(me,1, 1, 1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, -1, -1, 1); - me.showLeftArrow(-1, -1, 1, -1, -1, -1); - me.showRight(-1, 1, -1, 1, 1, 1); - me.showRightS(-1, -1, -1, 1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); + showLeftS(me,1, 1, 1, -1, -1, 1); + showLeftArrow(me,-1, -1, 1, -1, -1, -1); + showRight(me,-1, 1, -1, 1, 1, 1); + showRightS(me,-1, -1, -1, 1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2198,13 +2198,13 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, 1, 1, -1, -1); + showLeft(me,1, 1, 1, 1, -1, -1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, -1, 1, -1); - me.showLeftArrow(1, 1, 1, 1, 1, -1); - me.showRight(-1, -1, -1, -1, 1, 1); - me.showRightS(-1, -1, -1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, 1, 1); + showLeftS(me,1, 1, 1, -1, 1, -1); + showLeftArrow(me,1, 1, 1, 1, 1, -1); + showRight(me,-1, -1, -1, -1, 1, 1); + showRightS(me,-1, -1, -1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, 1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2238,13 +2238,13 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, 1, 1); - me.showLeftArrow(1, 1, 1, 1, 1, 1); - me.showRight(1, 1, 1, 1, -1, -1); - me.showRightS(1, 1, 1, 1, -1, -1); - me.showRightArrow(1, 1, 1, 1, -1, -1); + showLeftS(me,-1, -1, -1, -1, 1, 1); + showLeftArrow(me,1, 1, 1, 1, 1, 1); + showRight(me,1, 1, 1, 1, -1, -1); + showRightS(me,1, 1, 1, 1, -1, -1); + showRightArrow(me,1, 1, 1, 1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2327,17 +2327,17 @@ var canvas_MCDU_base = { me["Simple_Title2"].setColor(GREEN); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, 1, 1, -1, 1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(-1, -1, -1, -1, 1, -1); + showLeftS(me,-1, 1, 1, -1, 1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,-1, -1, -1, -1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(-1, -1, -1, -1, 1, -1); - me.showRight(1, 1, 1, 1, 1, 1); - me.showRightS(-1, -1, -1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); + showCenterS(me,-1, -1, -1, -1, 1, -1); + showRight(me,1, 1, 1, 1, 1, 1); + showRightS(me,-1, -1, -1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); me.standardFontSize(); @@ -2443,14 +2443,14 @@ var canvas_MCDU_base = { me.defaultPageNumbers(); - me.showLeft(1, 1, 1, -1, -1, -1); - me.showLeftS(-1, 1, 1, 1, -1, -1); - me.showLeftArrow(1, 1, 1, -1, -1, -1); - me.showCenter(-1, -1, -1, -1, -1, -1); - me.showCenterS(-1, -1, -1, -1, -1, -1); - me.showRight(-1, -1, -1, -1, -1, -1); - me.showRightS(1, 1, 1, 1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeft(me,1, 1, 1, -1, -1, -1); + showLeftS(me,-1, 1, 1, 1, -1, -1); + showLeftArrow(me,1, 1, 1, -1, -1, -1); + showCenter(me,-1, -1, -1, -1, -1, -1); + showCenterS(me,-1, -1, -1, -1, -1, -1); + showRight(me,-1, -1, -1, -1, -1, -1); + showRightS(me,1, 1, 1, 1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["arrowsDepArr"].hide(); me["PERFAPPR"].hide(); @@ -2514,14 +2514,14 @@ var canvas_MCDU_base = { me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, 1); - me.showLeftS(1, 1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(-1, 1, 1, -1, 1, 1); - me.showCenterS(-1, 1, 1, -1, 1, 1); - me.showRight(-1, 1, 1, -1, 1, 1); - me.showRightS(-1, 1, 1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeft(me,1, 1, 1, 1, 1, 1); + showLeftS(me,1, 1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,-1, 1, 1, -1, 1, 1); + showCenterS(me,-1, 1, 1, -1, 1, 1); + showRight(me,-1, 1, 1, -1, 1, 1); + showRightS(me,-1, 1, 1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["arrowsDepArr"].hide(); me["PERFAPPR"].hide(); @@ -2575,13 +2575,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("RADIO NAV"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, -1); + showLeft(me,1, 1, 1, 1, 1, -1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, 1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showRight(1, 1, 1, 1, 1, -1); - me.showRightS(1, 1, 1, 1, 1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,1, 1, 1, 1, 1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showRight(me,1, 1, 1, 1, 1, -1); + showRightS(me,1, 1, 1, 1, 1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2721,13 +2721,13 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(0, 1, 0, -1, 0, 1); + showLeft(me,0, 1, 0, -1, 0, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, -1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showRight(0, 0, 1, 1, 1, 1); - me.showRightS(1, 0, -1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, 1, -1, -1); + showLeftS(me,1, 1, 1, -1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showRight(me,0, 0, 1, 1, 1, 1); + showRightS(me,1, 0, -1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, 1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); @@ -2812,7 +2812,7 @@ var canvas_MCDU_base = { } else { me["Simple_L2"].setText("NONE"); } - me.showRight(1, -1, 0, 0, 0, 0); + showRight(me,1, -1, 0, 0, 0, 0); me["Simple_R2S"].hide(); me["INITA_InitRequest"].hide(); } else { @@ -2821,7 +2821,7 @@ var canvas_MCDU_base = { me["Simple_L1"].hide(); me["Simple_L2"].setColor(WHITE); me["Simple_L2"].setText("----/----------"); - me.showRight(-1, 1, 0, 0, 0, 0); + showRight(me,-1, 1, 0, 0, 0, 0); me["Simple_R2S"].show(); if (!Simbrief.SimbriefParser.inhibit) { me["INITA_InitRequest"].show(); @@ -2832,11 +2832,11 @@ var canvas_MCDU_base = { if (ADIRSMCDUBTN.getValue() != 1) { me["INITA_AlignIRS"].show(); me["Simple_R3"].setColor(AMBER); - me.showRightArrow(0, 0, -1, 0, 0, 0); + showRightArrow(me,0, 0, -1, 0, 0, 0); } else { me["INITA_AlignIRS"].hide(); me["Simple_R3"].setColor(WHITE); - me.showRightArrow(0, 0, 1, 0, 0, 0); + showRightArrow(me,0, 0, 1, 0, 0, 0); } if (fmgc.FMGCInternal.tropoSet) { me["Simple_R5"].setFontSize(normal); @@ -2894,17 +2894,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("IRS INIT"); me.defaultPageNumbers(); - me.showLeft(1, 1, -1, -1, -1, 1); + showLeft(me,1, 1, -1, -1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, -1, -1, -1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, 1, -1, -1, -1, 1); - me.showRightS(1, 1, -1, -1, -1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, -1, 1, 1, 1, -1); + showLeftS(me,1, 1, -1, -1, -1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, 1, -1, -1, -1, 1); + showRightS(me,1, 1, -1, -1, -1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, -1, 1, 1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, 1, 1, 1, 1, -1); + showCenterS(me,1, 1, 1, 1, 1, -1); me.fontLeft(default, default, 0, 0, 0, default); me.fontLeftS(default, default, 0, 0, 0, 0); @@ -3005,11 +3005,11 @@ var canvas_MCDU_base = { me["Simple_R6"].setText("CONFIRM ALIGN "); me.colorRight("ack", "ack", "ack", "ack", "ack", "amb"); me["IRSINIT_star"].show(); - me.showRightArrow(0, 0, 0, 0, 0, -1); + showRightArrow(me,0, 0, 0, 0, 0, -1); } else { me["Simple_R6"].setText("ALIGN ON REF "); me["IRSINIT_star"].hide(); - me.showRightArrow(0, 0, 0, 0, 0, 1); + showRightArrow(me,0, 0, 0, 0, 0, 1); } if (systems.ADIRS.Operating.aligned[0].getValue()) { @@ -3059,13 +3059,13 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("ROUTE SELECTION"); me.showPageNumbers(1,1); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, 1, 1, 1, 1, -1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(-1, 1, 1, 1, 1, 1); - me.showRightS(-1, 1, 1, 1, 1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showLeftS(me,-1, 1, 1, 1, 1, -1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,-1, 1, 1, 1, 1, 1); + showRightS(me,-1, 1, 1, 1, 1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me.fontSizeLeftS(normal, normal, normal, normal, normal, normal); me.fontSizeRight(0, small, small, small, small, normal); me.fontSizeRightS(0, small, small, small, small, normal); @@ -3131,17 +3131,17 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(1, -1, 1, 1, 1, -1); + showLeftS(me,1, 1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,1, -1, 1, 1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(-1, -1, -1, -1, -1, -1); - me.showRight(-1, 1, 1, 1, 1, 1); - me.showRightS(1, 1, 1, 1, 1, 1); - me.showRightArrow(-1, -1, 1, -1, -1, -1); + showCenterS(me,-1, -1, -1, -1, -1, -1); + showRight(me,-1, 1, 1, 1, 1, 1); + showRightS(me,1, 1, 1, 1, 1, 1); + showRightArrow(me,-1, -1, 1, -1, -1, -1); me.fontLeft(default, default, default, default, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -3581,17 +3581,17 @@ var canvas_MCDU_base = { me["ArrowLeft"].show(); me["ArrowRight"].show(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(1, 1, 1, -1, 1, -1); + showLeftS(me,1, -1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,1, 1, 1, -1, 1, -1); me["Simple_C3B"].show(); me["Simple_C4B"].hide(); - me.showCenterS(1, -1, -1, -1, -1, -1); - me.showRight(1, 1, -1, 1, 1, 1); - me.showRightS(1, -1, 1, 1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); + showRight(me,1, 1, -1, 1, 1, 1); + showRightS(me,1, -1, 1, 1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); me.fontLeft(default, default, default, default, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -3922,17 +3922,17 @@ var canvas_MCDU_base = { me["ArrowLeft"].hide(); me["ArrowRight"].hide(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, -1, 1, 1, 1, 1); - me.showLeftArrow(-1, 1, -1, -1, 1, -1); - me.showRight(1, -1, -1, 1, 1, 1); - me.showRightS(1, -1, -1, -1, -1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(1, -1, -1, 1, -1, 1); + showLeftS(me,1, -1, 1, 1, 1, 1); + showLeftArrow(me,-1, 1, -1, -1, 1, -1); + showRight(me,1, -1, -1, 1, 1, 1); + showRightS(me,1, -1, -1, -1, -1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,1, -1, -1, 1, -1, 1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, -1, -1, -1, -1, 1); + showCenterS(me,1, -1, -1, -1, -1, 1); me.fontLeft(default, default, symbol, default, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -3958,13 +3958,13 @@ var canvas_MCDU_base = { me.colorCenterS("wht", "wht", "wht", "wht", "wht", "wht"); if (page == "PROGCRZ") { - me.showLeftS(0, 0, -1, 0, 0, 0); - me.showCenterS(0, 0, 1, 0, 0, 0); - #me.showRight(0, 0, 1, 0, 0, 0); #Add when implement cruise phase + showLeftS(me,0, 0, -1, 0, 0, 0); + showCenterS(me,0, 0, 1, 0, 0, 0); + #showRight(me,0, 0, 1, 0, 0, 0); #Add when implement cruise phase me.fontLeft(0, 0, default, 0, 0, 0); } else if (page == "PROGDES" or page == "PROGAPPR") { - me.showCenter(0, 1, 0, 0, 0, 0); - me.showRight(0, 1, 0, 0, 0, 0); + showCenter(me,0, 1, 0, 0, 0, 0); + showRight(me,0, 1, 0, 0, 0, 0); #me["Simple_C2"].setFontSize(normal); #me["Simple_R2"].setFontSize(normal); } @@ -3978,7 +3978,7 @@ var canvas_MCDU_base = { # me["Simple_R5S"].show(); # me["Simple_R5"].setFontSize(small); # me["Simple_R5"].setColor(WHITE); - # me.showLeftArrow(-1, 1, -1, -1, -1, -1); + # showLeftArrow(me,-1, 1, -1, -1, -1, -1); #} pageSwitch[i].setBoolValue(1); @@ -4088,17 +4088,17 @@ var canvas_MCDU_base = { me["ArrowLeft"].hide(); me["ArrowRight"].hide(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(-1, 1, 1, 1, 1, 1); - me.showRightS(1, 1, 1, 1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, 1, 1, -1, -1, -1); + showLeftS(me,1, 1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,-1, 1, 1, 1, 1, 1); + showRightS(me,1, 1, 1, 1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, 1, 1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, 1, 1, -1, -1, -1); + showCenterS(me,1, 1, 1, -1, -1, -1); me.fontLeft(default, default, default, default, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -4262,17 +4262,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("CLB"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, 1, 1); - me.showRight(-1, 1, 1, 1, -1, 1); - me.showRightS(-1, -1, 1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(-1, 1, 1, 1, -1, -1); + showLeftS(me,1, 1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, 1, 1); + showRight(me,-1, 1, 1, 1, -1, 1); + showRightS(me,-1, -1, 1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,-1, 1, 1, 1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(-1, -1, 1, -1, 1, -1); + showCenterS(me,-1, -1, 1, -1, 1, -1); me.fontLeft(default, default, default, symbol, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -4299,20 +4299,20 @@ var canvas_MCDU_base = { if (fmgc.FMGCInternal.phase == 2) { me["Simple_Title"].setColor(GREEN); - me.showLeft(0, 0, 0, 0, 1, 0); - me.showLeftS(0, 0, 0, 0, 1, 0); - me.showLeftArrow(0, 0, 0, 0, 1, 1); - me.showRight(0, 0, 0, 1, 0, 0); - me.showRightS(0, 0, 0, 0, 1, 0); - me.showCenterS(0, 0, 0, 0, 1, 0); + showLeft(me,0, 0, 0, 0, 1, 0); + showLeftS(me,0, 0, 0, 0, 1, 0); + showLeftArrow(me,0, 0, 0, 0, 1, 1); + showRight(me,0, 0, 0, 1, 0, 0); + showRightS(me,0, 0, 0, 0, 1, 0); + showCenterS(me,0, 0, 0, 0, 1, 0); if (managedSpeed.getValue() == 1) { - me.showLeft(0, 0, 0, -1, 0, 0); - me.showLeftS(0, 0, 0, -1, 0, 0); + showLeft(me,0, 0, 0, -1, 0, 0); + showLeftS(me,0, 0, 0, -1, 0, 0); } else { me["Simple_L4S"].setText(" SELECTED"); - me.showLeft(0, 0, 0, 1, 0, 0); - me.showLeftS(0, 0, 0, 1, 0, 0); + showLeft(me,0, 0, 0, 1, 0, 0); + showLeftS(me,0, 0, 0, 1, 0, 0); } if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) { @@ -4333,19 +4333,19 @@ var canvas_MCDU_base = { me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu"); - me.showLeftArrow(0, 0, 0, 0, 0, -1); + showLeftArrow(me,0, 0, 0, 0, 0, -1); } else { setprop("/FMGC/internal/activate-once", 0); setprop("/FMGC/internal/activate-twice", 0); } } else { me["Simple_Title"].setColor(WHITE); - me.showLeft(0, 0, 0, 0, -1, 0); - me.showLeftS(0, 0, 0, 0, -1, 0); - me.showLeftArrow(0, 0, 0, 0, -1, 0); - me.showRight(0, 0, 0, -1, 0, 0); - me.showRightS(0, 0, 0, 0, -1, 0); - me.showCenterS(0, 0, 0, 0, -1, 0); + showLeft(me,0, 0, 0, 0, -1, 0); + showLeftS(me,0, 0, 0, 0, -1, 0); + showLeftArrow(me,0, 0, 0, 0, -1, 0); + showRight(me,0, 0, 0, -1, 0, 0); + showRightS(me,0, 0, 0, 0, -1, 0); + showCenterS(me,0, 0, 0, 0, -1, 0); me.colorLeft("ack", "ack", "ack", "ack", "ack", "wht"); me.colorLeftS("ack", "ack", "ack", "ack", "ack", "wht"); @@ -4417,17 +4417,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("CRZ"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, -1, 1); + showLeft(me,1, 1, 1, 1, -1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, -1, -1, -1, 1, 1); - me.showRightS(1, -1, -1, -1, 1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, -1, -1, -1, 1, -1); + showLeftS(me,1, 1, 1, 1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, -1, -1, -1, 1, 1); + showRightS(me,1, -1, -1, -1, 1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, -1, -1, -1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, -1, -1, -1, -1, -1); + showCenterS(me,1, -1, -1, -1, -1, -1); me.fontLeft(default, default, default, symbol, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -4455,12 +4455,12 @@ var canvas_MCDU_base = { me["Simple_Title"].setColor(GREEN); if (managedSpeed.getValue() == 1) { - me.showLeft(0, 0, 0, -1, 0, 0); - me.showLeftS(0, 0, 0, -1, 0, 0); + showLeft(me,0, 0, 0, -1, 0, 0); + showLeftS(me,0, 0, 0, -1, 0, 0); } else { me["Simple_L4S"].setText(" SELECTED"); - me.showLeft(0, 0, 0, 1, 0, 0); - me.showLeftS(0, 0, 0, 1, 0, 0); + showLeft(me,0, 0, 0, 1, 0, 0); + showLeftS(me,0, 0, 0, 1, 0, 0); } if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) { @@ -4481,7 +4481,7 @@ var canvas_MCDU_base = { me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu"); - me.showLeftArrow(0, 0, 0, 0, 0, -1); + showLeftArrow(me,0, 0, 0, 0, 0, -1); } else { setprop("/FMGC/internal/activate-once", 0); setprop("/FMGC/internal/activate-twice", 0); @@ -4554,17 +4554,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("DES"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(1, 1, 1, 1, -1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, 1, -1, 1, -1, 1); - me.showRightS(1, -1, 1, -1, -1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, 1, -1, 1, 1, -1); + showLeftS(me,1, 1, 1, 1, -1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, 1, -1, 1, -1, 1); + showRightS(me,1, -1, 1, -1, -1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, 1, -1, 1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, -1, 1, -1, -1, -1); + showCenterS(me,1, -1, 1, -1, -1, -1); me.fontLeft(default, default, default, symbol, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -4591,19 +4591,19 @@ var canvas_MCDU_base = { if (fmgc.FMGCInternal.phase == 4) { me["Simple_Title"].setColor(GREEN); - me.showLeft(0, 0, 0, 0, 1, 0); - me.showRight(0, 1, 0, 1, 0, 0); - me.showRightS(0, 0, 1, 0, 0, 0); - me.showCenter(0, 1, 0, 1, 1, 0); - me.showCenterS(0, 0, 1, 0, 0, 0); + showLeft(me,0, 0, 0, 0, 1, 0); + showRight(me,0, 1, 0, 1, 0, 0); + showRightS(me,0, 0, 1, 0, 0, 0); + showCenter(me,0, 1, 0, 1, 1, 0); + showCenterS(me,0, 0, 1, 0, 0, 0); if (managedSpeed.getValue() == 1) { - me.showLeft(0, 0, 0, -1, 0, 0); - me.showLeftS(0, 0, 0, -1, 0, 0); + showLeft(me,0, 0, 0, -1, 0, 0); + showLeftS(me,0, 0, 0, -1, 0, 0); } else { me["Simple_L4S"].setText(" SELECTED"); - me.showLeft(0, 0, 0, 1, 0, 0); - me.showLeftS(0, 0, 0, 1, 0, 0); + showLeft(me,0, 0, 0, 1, 0, 0); + showLeftS(me,0, 0, 0, 1, 0, 0); } if (activate_once.getValue() == 0 and activate_twice.getValue() == 0) { @@ -4624,18 +4624,18 @@ var canvas_MCDU_base = { me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftS("ack", "ack", "ack", "ack", "ack", "blu"); me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "blu"); - me.showLeftArrow(0, 0, 0, 0, 0, -1); + showLeftArrow(me,0, 0, 0, 0, 0, -1); } else { setprop("/FMGC/internal/activate-once", 0); setprop("/FMGC/internal/activate-twice", 0); } } else { me["Simple_Title"].setColor(WHITE); - me.showLeft(0, 0, 0, 0, -1, 0); - me.showRight(0, -1, 0, -1, 0, 0); - me.showRightS(0, 0, -1, 0, 0, 0); - me.showCenter(0, -1, 0, -1, -1, 0); - me.showCenterS(0, 0, -1, 0, 0, 0); + showLeft(me,0, 0, 0, 0, -1, 0); + showRight(me,0, -1, 0, -1, 0, 0); + showRightS(me,0, 0, -1, 0, 0, 0); + showCenter(me,0, -1, 0, -1, -1, 0); + showCenterS(me,0, 0, -1, 0, 0, 0); me.colorLeft("ack", "ack", "ack", "ack", "ack", "wht"); me.colorLeftS("ack", "ack", "ack", "ack", "ack", "wht"); @@ -4713,17 +4713,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("APPR"); me.defaultPageNumbers(); - me.showLeft(1, 1, 1, 1, 1, 1); + showLeft(me,1, 1, 1, 1, 1, 1); me["Simple_L0S"].show(); - me.showLeftS(1, 1, 1, 1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(1, 1, 1, 1, 1, 1); - me.showRightS(1, 1, 1, 1, -1, 1); - me.showRightArrow(-1, -1, -1, -1, -1, 1); - me.showCenter(1, 1, 1, -1, 1, -1); + showLeftS(me,1, 1, 1, 1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,1, 1, 1, 1, 1, 1); + showRightS(me,1, 1, 1, 1, -1, 1); + showRightArrow(me,-1, -1, -1, -1, -1, 1); + showCenter(me,1, 1, 1, -1, 1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, 1, 1, -1, 1, -1); + showCenterS(me,1, 1, 1, -1, 1, -1); me.fontLeft(symbol, default, default, default, symbol, default); me.fontLeftS(default, default, default, default, default, default); @@ -4897,17 +4897,17 @@ var canvas_MCDU_base = { me["Simple_Title"].setText("GO AROUND"); me.defaultPageNumbers(); - me.showLeft(-1, -1, -1, -1, 1, 1); + showLeft(me,-1, -1, -1, -1, 1, 1); me["Simple_L0S"].hide(); - me.showLeftS(-1, -1, -1, -1, 1, 1); - me.showLeftArrow(-1, -1, -1, -1, -1, 1); - me.showRight(-1, -1, -1, -1, 1, -1); - me.showRightS(-1, -1, -1, -1, 1, -1); - me.showRightArrow(-1, -1, -1, -1, -1, -1); - me.showCenter(1, 1, 1, -1, -1, -1); + showLeftS(me,-1, -1, -1, -1, 1, 1); + showLeftArrow(me,-1, -1, -1, -1, -1, 1); + showRight(me,-1, -1, -1, -1, 1, -1); + showRightS(me,-1, -1, -1, -1, 1, -1); + showRightArrow(me,-1, -1, -1, -1, -1, -1); + showCenter(me,1, 1, 1, -1, -1, -1); me["Simple_C3B"].hide(); me["Simple_C4B"].hide(); - me.showCenterS(1, 1, 1, -1, -1, -1); + showCenterS(me,1, 1, 1, -1, -1, -1); me.fontLeft(default, default, default, default, default, default); me.fontLeftS(default, default, default, default, default, default); @@ -5873,359 +5873,6 @@ var canvas_MCDU_base = { me["Simple_C6S"].setColor(getprop("/MCDUC/colors/" ~ f ~ "/r"), getprop("/MCDUC/colors/" ~ f ~ "/g"), getprop("/MCDUC/colors/" ~ f ~ "/b")); } }, - # -1 = hide, 0 = ignore, 1 = show - showLeft: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_L1"].show(); - } else { - me["Simple_L1"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_L2"].show(); - } else { - me["Simple_L2"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_L3"].show(); - } else { - me["Simple_L3"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_L4"].show(); - } else { - me["Simple_L4"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_L5"].show(); - } else { - me["Simple_L5"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_L6"].show(); - } else { - me["Simple_L6"].hide(); - } - } - }, - showLeftS: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_L1S"].show(); - } else { - me["Simple_L1S"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_L2S"].show(); - } else { - me["Simple_L2S"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_L3S"].show(); - } else { - me["Simple_L3S"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_L4S"].show(); - } else { - me["Simple_L4S"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_L5S"].show(); - } else { - me["Simple_L5S"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_L6S"].show(); - } else { - me["Simple_L6S"].hide(); - } - } - }, - showLeftArrow: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_L1_Arrow"].show(); - } else { - me["Simple_L1_Arrow"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_L2_Arrow"].show(); - } else { - me["Simple_L2_Arrow"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_L3_Arrow"].show(); - } else { - me["Simple_L3_Arrow"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_L4_Arrow"].show(); - } else { - me["Simple_L4_Arrow"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_L5_Arrow"].show(); - } else { - me["Simple_L5_Arrow"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_L6_Arrow"].show(); - } else { - me["Simple_L6_Arrow"].hide(); - } - } - }, - showRight: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_R1"].show(); - } else { - me["Simple_R1"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_R2"].show(); - } else { - me["Simple_R2"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_R3"].show(); - } else { - me["Simple_R3"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_R4"].show(); - } else { - me["Simple_R4"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_R5"].show(); - } else { - me["Simple_R5"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_R6"].show(); - } else { - me["Simple_R6"].hide(); - } - } - }, - showRightS: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_R1S"].show(); - } else { - me["Simple_R1S"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_R2S"].show(); - } else { - me["Simple_R2S"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_R3S"].show(); - } else { - me["Simple_R3S"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_R4S"].show(); - } else { - me["Simple_R4S"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_R5S"].show(); - } else { - me["Simple_R5S"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_R6S"].show(); - } else { - me["Simple_R6S"].hide(); - } - } - }, - showRightArrow: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_R1_Arrow"].show(); - } else { - me["Simple_R1_Arrow"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_R2_Arrow"].show(); - } else { - me["Simple_R2_Arrow"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_R3_Arrow"].show(); - } else { - me["Simple_R3_Arrow"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_R4_Arrow"].show(); - } else { - me["Simple_R4_Arrow"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_R5_Arrow"].show(); - } else { - me["Simple_R5_Arrow"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_R6_Arrow"].show(); - } else { - me["Simple_R6_Arrow"].hide(); - } - } - }, - showCenter: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_C1"].show(); - } else { - me["Simple_C1"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_C2"].show(); - } else { - me["Simple_C2"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_C3"].show(); - } else { - me["Simple_C3"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_C4"].show(); - } else { - me["Simple_C4"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_C5"].show(); - } else { - me["Simple_C5"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_C6"].show(); - } else { - me["Simple_C6"].hide(); - } - } - }, - showCenterS: func (a, b, c, d, e, f) { - if (a != 0) { - if (a >= 1) { - me["Simple_C1S"].show(); - } else { - me["Simple_C1S"].hide(); - } - } - if (b != 0) { - if (b >= 1) { - me["Simple_C2S"].show(); - } else { - me["Simple_C2S"].hide(); - } - } - if (c != 0) { - if (c >= 1) { - me["Simple_C3S"].show(); - } else { - me["Simple_C3S"].hide(); - } - } - if (d != 0) { - if (d >= 1) { - me["Simple_C4S"].show(); - } else { - me["Simple_C4S"].hide(); - } - } - if (e != 0) { - if (e >= 1) { - me["Simple_C5S"].show(); - } else { - me["Simple_C5S"].hide(); - } - } - if (f != 0) { - if (f >= 1) { - me["Simple_C6S"].show(); - } else { - me["Simple_C6S"].hide(); - } - } - }, # 0 = ignore fontLeft: func (a, b, c, d, e, f) { if (a != 0) { From b8cda358fdd76108c49a5a25c583f6ae8da304fa Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Mon, 9 Aug 2021 20:37:23 +0100 Subject: [PATCH 30/31] Cleanup --- Models/Instruments/MCDU/MCDU.nas | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index dc7c4ae2..1ebe59dd 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1877,7 +1877,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[x].station != nil) { me["Simple_L" ~ (x + 1)].setText(" " ~ atsu.ATISInstances[x].station ~ "/" ~ (atsu.ATISInstances[x].type == 0 ? "ARR" : "DEP")); me["Simple_L" ~ (x + 1)].setFont(default); - me["Simple_L" ~ (x + 1) ~ "_Arrow"].show(); + if (atsu.ATISInstances[x].received) { + me["Simple_L" ~ (x + 1) ~ "_Arrow"].show(); + } else { + me["Simple_L" ~ (x + 1) ~ "_Arrow"].hide(); + } } else { me["Simple_L" ~ (x + 1)].setText(" [ ]/[ ]"); me["Simple_L" ~ (x + 1)].setFont(symbol); From 36733821870e3e58a48bd9cd77b68a6ed9b9eb05 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Mon, 9 Aug 2021 20:49:34 -0400 Subject: [PATCH 31/31] Control: Fix a bulsit property in the spoiler that make him not work --- Nasal/FBW/it-fbw.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/FBW/it-fbw.nas b/Nasal/FBW/it-fbw.nas index 7a9daa22..c3c119fd 100644 --- a/Nasal/FBW/it-fbw.nas +++ b/Nasal/FBW/it-fbw.nas @@ -68,7 +68,7 @@ var FBW = { rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"), rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"), ths: props.globals.getNode(""), - spoilerl1: props.globals.getNode(""), + spoilerl1: props.globals.getNode("/systems/failures/spoilers/spoiler-l1"), spoilerl2: props.globals.getNode("/systems/failures/spoilers/spoiler-l2"), spoilerl3: props.globals.getNode("/systems/failures/spoilers/spoiler-l3"), spoilerl4: props.globals.getNode("/systems/failures/spoilers/spoiler-l4"),