From 0b6bc649d261a5ccb07231cbeece45f783081333 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 29 Jul 2021 14:09:51 +0100 Subject: [PATCH] Fix ECAM right memo warnings; and add PAX OXY memo --- Nasal/ECAM/ECAM-logic.nas | 68 +++++++++++++++++++++--------------- Nasal/ECAM/ECAM-messages.nas | 6 +++- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index f7543c18..b2664d8a 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -3460,12 +3460,6 @@ var messages_right_memo = func { park_brk.colour = "g"; } - if (getprop("/controls/gear/brake-fans") == 1) { - brk_fan.active = 1; - } else { - brk_fan.active = 0; - } - if (systems.HYD.Switch.ptu.getValue() == 1 and ((systems.HYD.Psi.yellow.getValue() < 1450 and systems.HYD.Psi.green.getValue() > 1450 and getprop("/controls/hydraulic/elec-pump-yellow") == 0) or (systems.HYD.Psi.yellow.getValue() > 1450 and systems.HYD.Psi.green.getValue() < 1450))) { ptu.active = 1; } else { @@ -3507,7 +3501,13 @@ var messages_right_memo = func { } else { ram_air.active = 0; } - + + if (getprop("/systems/oxygen/passenger-oxygen/sys-on-light") == 1) { + pax_oxy.active = 1; + } else { + pax_oxy.active = 0; + } + if (getprop("/controls/engines/engine[0]/igniter-a") == 1 or getprop("/controls/engines/engine[0]/igniter-b") == 1 or getprop("/controls/engines/engine[1]/igniter-a") == 1 or getprop("/controls/engines/engine[1]/igniter-b") == 1) { ignition.active = 1; } else { @@ -3531,6 +3531,24 @@ var messages_right_memo = func { company_call.active = 0; } + if (mcdu.ReceivedMessagesDatabase.firstUnviewed() != -99 and (phaseVarMemo2 <= 2 or phaseVarMemo2 == 6 or phaseVarMemo2 >= 9)) { + company_msg.active = 1; + } else { + 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) { + eng_aice.active = 1; + } else { + eng_aice.active = 0; + } + + if (wing_pb.getValue() == 1) { + wing_aice.active = 1; + } else { + wing_aice.active = 0; + } + if (getprop("/controls/pneumatics/switches/apu") == 1 and pts.APU.rpm.getValue() >= 95) { apu_bleed.active = 1; } else { @@ -3549,22 +3567,16 @@ var messages_right_memo = func { ldg_lt.active = 0; } - if (mcdu.ReceivedMessagesDatabase.firstUnviewed() != -99 and (phaseVarMemo2 <= 2 or phaseVarMemo2 == 6 or phaseVarMemo2 >= 9)) { - company_msg.active = 1; + if (getprop("/controls/gear/brake-fans") == 1) { + brk_fan.active = 1; } else { - company_msg.active = 0; + brk_fan.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) { - eng_aice.active = 1; + if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1) { # todo: emer elec + gpws_flap3.active = 1; } else { - eng_aice.active = 0; - } - - if (wing_pb.getValue() == 1) { - wing_aice.active = 1; - } else { - wing_aice.active = 0; + 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)) { @@ -3591,6 +3603,12 @@ var messages_right_memo = func { auto_brk_max.active = 0; } + if (phaseVarMemo3 >= 2 and phaseVarMemo3 <= 9 and systems.ELEC.Bus.ac1.getValue() >= 110 and systems.ELEC.Bus.ac2.getValue() >= 110 and (getprop("/systems/fuel/feed-center-1") or getprop("/systems/fuel/feed-center-2"))) { + ctr_tk_feedg.active = 1; + } else { + ctr_tk_feedg.active = 0; + } + if (systems.FUEL.Valves.crossfeed.getValue() != 0 and systems.FUEL.Switches.crossfeed.getValue()) { fuelx.active = 1; } else { @@ -3603,16 +3621,10 @@ var messages_right_memo = func { fuelx.colour = "g"; } - if (getprop("instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1) { # todo: emer elec - gpws_flap3.active = 1; + if (systems.SwitchingPanel.Switches.airData.getValue() != 0 or systems.SwitchingPanel.Switches.attHdg.getValue() != 0) { + adirs_switch.active = 1; } else { - gpws_flap3.active = 0; - } - - if (phaseVarMemo3 >= 2 and phaseVarMemo3 <= 9 and systems.ELEC.Bus.ac1.getValue() >= 110 and systems.ELEC.Bus.ac2.getValue() >= 110 and (getprop("/systems/fuel/feed-center-1") or getprop("/systems/fuel/feed-center-2"))) { - ctr_tk_feedg.active = 1; - } else { - ctr_tk_feedg.active = 0; + adirs_switch.active = 0; } } diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas index e36d11bb..4eabac35 100644 --- a/Nasal/ECAM/ECAM-messages.nas +++ b/Nasal/ECAM/ECAM-messages.nas @@ -796,8 +796,11 @@ var memos = std.Vector.new([ var rat = memo.new(msg: "RAT OUT" ), var emer_gen = memo.new(msg: "EMER GEN" ), var ram_air = memo.new(msg: "RAM AIR ON" ), + var pax_oxy = memo.new(msg: "OXY PAX ON" ), var nw_strg_disc = memo.new(msg: "NW STRG DISC"), var ignition = memo.new(msg: "IGNITION" ), + var eng1Cowl = memo.new(msg: "ENG 1 COWL" ), # Not yet implemented (NEO) + var eng2Cowl = memo.new(msg: "ENG 2 COWL" ), # Not yet implemented (NEO) var cabin_ready = memo.new(msg: "CABIN READY" ), # Not yet implemented var pred_ws_off = memo.new(msg: "PRED W/S OFF"), # Not yet implemented var terr_stby = memo.new(msg: "TERR STBY" ), # Not yet implemented @@ -825,7 +828,8 @@ var memos = std.Vector.new([ var auto_brk_off = memo.new(msg: "AUTO BRK OFF"), # Not yet implemented var man_ldg_elev = memo.new(msg: "MAN LDG ELEV"), # Not yet implemented var ctr_tk_feedg = memo.new(msg: "CTR TK FEEDG"), - var fuelx = memo.new(msg: "FUEL X FEED" ) + var fuelx = memo.new(msg: "FUEL X FEED" ), + var adirs_switch = memo.new(msg: "ADIRS SWTG" ) # Not yet implemented ]); var clearWarnings = std.Vector.new();