diff --git a/A320-main.xml b/A320-main.xml index 289dea78..9699ec73 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -669,6 +669,7 @@ + 0 @@ -4549,13 +4550,13 @@ Aircraft/A320-family/Nasal/Autopush/autopush.nas - Aircraft/A320-family/Nasal/Autopush/autopush_driver.nas + Aircraft/A320-family/Nasal/Autopush/driver.nas Aircraft/A320-family/Nasal/Autopush/dynarr.nas - Aircraft/A320-family/Nasal/Autopush/autopush_route.nas + Aircraft/A320-family/Nasal/Autopush/route.nas diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 69c02fea..1439b8e6 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -72,8 +72,7 @@ setprop("/systems/acconfig/out-of-date", 0); setprop("/systems/acconfig/mismatch-code", "0x000"); setprop("/systems/acconfig/mismatch-reason", "XX"); setprop("/systems/acconfig/options/keyboard-mode", 0); -# TODO Revert default weight-kgs to 1, when fully implemented -setprop("/systems/acconfig/options/weight-kgs", 0); +setprop("/systems/acconfig/options/weight-kgs", 1); setprop("/systems/acconfig/options/adirs-skip", 0); setprop("/systems/acconfig/options/allow-oil-consumption", 0); setprop("/systems/acconfig/options/atis-server", "faa"); diff --git a/AircraftConfig/announce.xml b/AircraftConfig/announce.xml index 26e3d69d..e56c3a40 100644 --- a/AircraftConfig/announce.xml +++ b/AircraftConfig/announce.xml @@ -36,9 +36,9 @@ vbox - + left - /sim/sounde/welcomefa + /sim/sounde/fa_boarding dialog-apply @@ -46,9 +46,9 @@ - + left - /sim/sounde/welcomecapt + /sim/sounde/fa_welcome dialog-apply @@ -56,9 +56,9 @@ - + left - /sim/sounde/doors + /sim/sounde/cpt_welcome dialog-apply @@ -66,9 +66,9 @@ - + left - /sim/sounde/safety + /sim/sounde/cpt_doors dialog-apply @@ -76,9 +76,9 @@ - + left - /sim/sounde/prepareto + /sim/sounde/fa_safety dialog-apply @@ -86,9 +86,49 @@ - + left - /sim/sounde/seatbelt-10k + /sim/sounde/cpt_takeoff + + dialog-apply + + true + + + + + left + /sim/sounde/fa_seatbelt10k + + dialog-apply + + true + + + + + left + /sim/sounde/fa_descent + + dialog-apply + + true + + + + + left + /sim/sounde/cpt_landing + + dialog-apply + + true + + + + + left + /sim/sounde/fa_landed dialog-apply diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml index 6976afa4..631f08b9 100644 --- a/AircraftConfig/du-quality.xml +++ b/AircraftConfig/du-quality.xml @@ -27,9 +27,7 @@ acconfig.writeSettings(); canvas_pfd.rateApply(); canvas_nd.rateApply(); - canvas_ecam.u_rateApply(); canvas_ecam.l_rateApply(); - canvas_iesi.rateApply(); @@ -256,9 +254,7 @@ acconfig.writeSettings(); canvas_pfd.rateApply(); canvas_nd.rateApply(); - canvas_ecam.u_rateApply(); canvas_ecam.l_rateApply(); - canvas_iesi.rateApply(); @@ -272,9 +268,7 @@ acconfig.writeSettings(); canvas_pfd.rateApply(); canvas_nd.rateApply(); - canvas_ecam.u_rateApply(); canvas_ecam.l_rateApply(); - canvas_iesi.rateApply(); diff --git a/Announcements.txt b/Announcements.txt new file mode 100644 index 00000000..8de371e5 --- /dev/null +++ b/Announcements.txt @@ -0,0 +1,59 @@ +All voices created at http://www.fromtexttospeech.com/ +Captain voice: US English - John +Mechanic voice: US English - George +Flight attendant voice: US English - Daisy + + +BOARDING (F/A) - fa_boarding +Ladies and gentlemen, the Captain has turned on the Fasten Seat Belt sign. If you haven’t already done so, please stow your carry-on luggage underneath the seat in front of you or in an overhead bin. Please take your seat and fasten your seat belt. And also make sure your seat back and folding trays are in their full upright position. +If you are seated next to an emergency exit, please read carefully the special instructions card located by your seat. If you do not wish to perform the functions described in the event of an emergency, please ask a flight attendant to reseat you. +We remind you that this is a non-smoking flight. Smoking is prohibited on the entire aircraft, including the lavatories. Tampering with, disabling or destroying the lavatory smoke detectors is prohibited by law. +If you have any questions about our flight today, please don’t hesitate to ask one of our flight attendants. Thank you. + + +WELCOME (F/A) - fa_welcome +Ladies and gentlemen, my name is Daisy and I’m your chief flight attendant. On behalf of the entire crew, welcome aboard this flight. +At this time, make sure your seat backs and tray tables are in their full upright position and that your seat belt is correctly fastened. Also, your portable electronic devices must be set to ‘airplane’ mode until an announcement is made upon arrival. Thank you. + +WELCOME (CPT) - cpt_welcome +Ladies and gentlemen, this is your captain speaking. Welcome on board. We are all set and ready to go, just waiting for clearance to depart the gate. Please, make yourself comfortable, and I wish you a very pleasant flight. + +DOORS CHECK (CPT) - cpt_doors +Cabin Crew, doors on automatic, arm slides, cross-check and report. Thank you. + + +SAFETY (F/A) - fa_safety +Now we request your full attention as the flight attendants demonstrate the safety features of this aircraft. +When the seat belt sign illuminates, you must fasten your seat belt. Insert the metal fittings one into the other, and tighten by pulling on the loose end of the strap. To release your seat belt, lift the upper portion of the buckle. We suggest that you keep your seat belt fastened throughout the flight, as we may experience turbulence. +There are several emergency exits on this aircraft, two forward, two aft and two over each wing. Please take a few moments now to locate your nearest exit. In some cases, your nearest exit may be behind you. If we need to evacuate the aircraft, floor-level lighting will guide you towards the exit. Doors can be opened by moving the handle in the direction of the arrow. Each door is equipped with an inflatable slide which may also be detached and used as a life raft. +Oxygen and the air pressure are always being monitored. In the event of a decompression, an oxygen mask will automatically appear in front of you. To start the flow of oxygen, pull the mask towards you. Place it firmly over your nose and mouth, secure the elastic band behind your head, and breathe normally. Although the bag does not inflate, oxygen is flowing to the mask. If you are travelling with a child or someone who requires assistance, secure your mask on first, and then assist the other person. Keep your mask on until a uniformed crew member advises you to remove it. +In the event of an emergency, please assume the bracing position. Lean forward with your hands on top of your head and your elbows against your thighs. Ensure your feet are flat on the floor. +A life vest is located in a pouch under your seat or between the armrests. When instructed to do so, open the plastic pouch and remove the vest. Slip it over your head. Pass the straps around your waist and adjust at the front. To inflate the vest, pull firmly on the red cord, only when leaving the aircraft. If you need to refill the vest, blow into the mouthpieces. Use the whistle and light to attract attention. Also, your seat bottom cushion can be used as a flotation device. Pull the cushion from the seat, slip your arms into the straps, and hug the cushion to your chest. +At this time, your portable electronic devices must be set to ‘airplane’ mode until an announcement is made upon arrival. +We remind you that this is a non-smoking flight. Tampering with, disabling, or destroying the smoke detectors located in the lavatories is prohibited by law. +You will find this and all the other safety information in the card located in the seat pocket in front of you. We strongly suggest you read it before take-off. If you have any questions, please don’t hesitate to ask one of our crew members. We wish you all an enjoyable flight. + + +TAKEOFF (CPT) - cpt_takeoff +Cabin crew, prepare for take-off. + + +SEATBELT OFF (F/A) - fa_seatbelt10k.wav +Ladies and gentlemen, the Captain has turned off the Fasten Seat Belt sign, and you may now move around the cabin. However we always recommend to keep your seat belt fastened while you’re seated. +In a few moments, the flight attendants will be passing around the cabin to offer you hot or cold drinks, as well as a snack. Alcoholic drinks are also available at a nominal charge. Now, sit back, relax, and enjoy the flight. Thank you. + + +DESCENT (F/A) - fa_descent +Ladies and gentlemen, as we start our descent, please make sure your seat backs and tray tables are in their full upright position. Make sure your seat belt is securely fastened and all carry-on luggage is stowed underneath the seat in front of you or in the overhead bins. Thank you. + + +LANDING (CPT) - cpt_landing +Cabin crew, prepare for landing. + + +LANDED (F/A) - fa_landed +Ladies and gentlemen, welcome to your destination Airport. +For your safety and comfort, please remain seated with your seat belt fastened until the Captain turns off the Fasten Seat Belt sign. This will indicate that we have parked at the gate and that it is safe for you to move about. At this time, you may use your cellular phones if you wish. +Please check around your seat for any personal belongings you may have brought on board with you and please use caution when opening the overhead bins, as heavy articles may have shifted around during the flight. +If you require deplaning assistance, please remain in your seat until all other passengers have deplaned. One of our crew members will then be pleased to assist you. +On behalf of the entire crew, I’d like to thank you for joining us on this trip and we are looking forward to seeing you on board again in the near future. Have a nice stay. \ No newline at end of file diff --git a/Models/Effects/brake.eff b/Models/Effects/brake.eff index b068d284..48539936 100644 --- a/Models/Effects/brake.eff +++ b/Models/Effects/brake.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/brightness-panel-ped.eff b/Models/Effects/brightness-panel-ped.eff index ec042697..2c069ad1 100644 --- a/Models/Effects/brightness-panel-ped.eff +++ b/Models/Effects/brightness-panel-ped.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/clock-glare.eff b/Models/Effects/clock-glare.eff index a5797f3d..e902137c 100644 --- a/Models/Effects/clock-glare.eff +++ b/Models/Effects/clock-glare.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/clock.eff b/Models/Effects/clock.eff index 8ca6e6ac..52f6728c 100644 --- a/Models/Effects/clock.eff +++ b/Models/Effects/clock.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/cockpit-irradiance-vertical.eff b/Models/Effects/cockpit-irradiance-vertical.eff index 3afe351d..f0195235 100644 --- a/Models/Effects/cockpit-irradiance-vertical.eff +++ b/Models/Effects/cockpit-irradiance-vertical.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 2 0.33 diff --git a/Models/Effects/cockpit-irradiance.eff b/Models/Effects/cockpit-irradiance.eff index 7a8643f9..e1581b21 100644 --- a/Models/Effects/cockpit-irradiance.eff +++ b/Models/Effects/cockpit-irradiance.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 0.33 diff --git a/Models/Effects/ddrmi.eff b/Models/Effects/ddrmi.eff index 6b48edaa..f1af9d98 100644 --- a/Models/Effects/ddrmi.eff +++ b/Models/Effects/ddrmi.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/dummy-gap.eff b/Models/Effects/dummy-gap.eff index 73365fcc..0e23ed67 100644 --- a/Models/Effects/dummy-gap.eff +++ b/Models/Effects/dummy-gap.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/gear-lever.eff b/Models/Effects/gear-lever.eff index 7d68a73b..770da73f 100644 --- a/Models/Effects/gear-lever.eff +++ b/Models/Effects/gear-lever.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/gravity-gear.eff b/Models/Effects/gravity-gear.eff index 9014b01f..f2b1f203 100644 --- a/Models/Effects/gravity-gear.eff +++ b/Models/Effects/gravity-gear.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/iesi.eff b/Models/Effects/iesi.eff index d0bfd075..5946d413 100644 --- a/Models/Effects/iesi.eff +++ b/Models/Effects/iesi.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/left-light-brightness-glare.eff b/Models/Effects/left-light-brightness-glare.eff index 3033f327..5e63baeb 100644 --- a/Models/Effects/left-light-brightness-glare.eff +++ b/Models/Effects/left-light-brightness-glare.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/left-light-brightness.eff b/Models/Effects/left-light-brightness.eff index c7e64cbd..1ff465fb 100644 --- a/Models/Effects/left-light-brightness.eff +++ b/Models/Effects/left-light-brightness.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/panel-flood-brightness.eff b/Models/Effects/panel-flood-brightness.eff index 071ad8fa..50865784 100644 --- a/Models/Effects/panel-flood-brightness.eff +++ b/Models/Effects/panel-flood-brightness.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/panel-flood-glare-right.eff b/Models/Effects/panel-flood-glare-right.eff index 5651ab98..0673a54f 100644 --- a/Models/Effects/panel-flood-glare-right.eff +++ b/Models/Effects/panel-flood-glare-right.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/panel-flood-glare.eff b/Models/Effects/panel-flood-glare.eff index c0f8d4e6..73cd6ca2 100644 --- a/Models/Effects/panel-flood-glare.eff +++ b/Models/Effects/panel-flood-glare.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/panel-flood.eff b/Models/Effects/panel-flood.eff index 7decf2a2..92532a1d 100644 --- a/Models/Effects/panel-flood.eff +++ b/Models/Effects/panel-flood.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Effects/park-brk.eff b/Models/Effects/park-brk.eff index 2b02c758..7edf81df 100644 --- a/Models/Effects/park-brk.eff +++ b/Models/Effects/park-brk.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-atc.eff b/Models/Effects/pedestal-flood-atc.eff index 41577766..10c1215a 100644 --- a/Models/Effects/pedestal-flood-atc.eff +++ b/Models/Effects/pedestal-flood-atc.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-engine.eff b/Models/Effects/pedestal-flood-engine.eff index ee919396..9b75f83a 100644 --- a/Models/Effects/pedestal-flood-engine.eff +++ b/Models/Effects/pedestal-flood-engine.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-flap.eff b/Models/Effects/pedestal-flood-flap.eff index 873179c1..0a53b318 100644 --- a/Models/Effects/pedestal-flood-flap.eff +++ b/Models/Effects/pedestal-flood-flap.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-glare.eff b/Models/Effects/pedestal-flood-glare.eff index 4807736c..4de85c1b 100644 --- a/Models/Effects/pedestal-flood-glare.eff +++ b/Models/Effects/pedestal-flood-glare.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-radar.eff b/Models/Effects/pedestal-flood-radar.eff index 43180331..0a24c847 100644 --- a/Models/Effects/pedestal-flood-radar.eff +++ b/Models/Effects/pedestal-flood-radar.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-spdbrk.eff b/Models/Effects/pedestal-flood-spdbrk.eff index 0e23b710..0509aac5 100644 --- a/Models/Effects/pedestal-flood-spdbrk.eff +++ b/Models/Effects/pedestal-flood-spdbrk.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood-upper.eff b/Models/Effects/pedestal-flood-upper.eff index 27d60e44..4a75ed79 100644 --- a/Models/Effects/pedestal-flood-upper.eff +++ b/Models/Effects/pedestal-flood-upper.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-flood.eff b/Models/Effects/pedestal-flood.eff index ddd53d8e..1a94c31b 100644 --- a/Models/Effects/pedestal-flood.eff +++ b/Models/Effects/pedestal-flood.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/pedestal-footrest.eff b/Models/Effects/pedestal-footrest.eff index 28e60a3c..81b15a26 100644 --- a/Models/Effects/pedestal-footrest.eff +++ b/Models/Effects/pedestal-footrest.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/rudder-trim.eff b/Models/Effects/rudder-trim.eff index 290fc485..e5945b5d 100644 --- a/Models/Effects/rudder-trim.eff +++ b/Models/Effects/rudder-trim.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/thr-quad-flood.eff b/Models/Effects/thr-quad-flood.eff index f4a55fa0..8cdd5259 100644 --- a/Models/Effects/thr-quad-flood.eff +++ b/Models/Effects/thr-quad-flood.eff @@ -2,6 +2,7 @@ panel Effects/model-interior + true 1 /controls/lighting/pedestal-light 1.0 1.0 1.0 diff --git a/Models/Effects/tiller.eff b/Models/Effects/tiller.eff index 2f72fbf0..3c610a1a 100644 --- a/Models/Effects/tiller.eff +++ b/Models/Effects/tiller.eff @@ -2,6 +2,7 @@ tiller Effects/model-interior + true 1 /controls/lighting/panel-light 1.0 1.0 1.0 diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index 85258f17..b0432cc8 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -162,7 +162,7 @@ var canvas_IESI = { return; } - if (_IESITime + 90 >= notification.elapsed_seconds) { + if (_IESITime + 90 >= notification.elapsedTime) { me["IESI"].hide(); me["IESI_Init"].show(); return; @@ -191,7 +191,7 @@ var canvas_IESI = { # todo transient max 0.2s # todo 20W power consumption if (notification.attReset == 1) { - if (notification.iesiInit and _IESITime + 90 >= notification.elapsed_seconds) { + if (notification.iesiInit and _IESITime + 90 >= notification.elapsedTime) { _fast = 1; } else { _fast = 0; @@ -199,19 +199,19 @@ var canvas_IESI = { iesi_init.setBoolValue(0); } - if (notification.dcEss >= 25 or (notification.dcHot1 >= 25 and notification.airspeed >= 50 and notification.elapsed_seconds >= 5)) { + if (notification.dcEss >= 25 or (notification.dcHot1 >= 25 and notification.airspeed >= 50 and notification.elapsedTime >= 5)) { _showIESI = 1; if (notification.acconfig != 1 and notification.iesiInit != 1) { iesi_init.setBoolValue(1); if (_fast) { - _IESITime = notification.elapsed_seconds - 80; + _IESITime = notification.elapsedTime - 80; _fast = 0; } else { - _IESITime = notification.elapsed_seconds; + _IESITime = notification.elapsedTime; } } else if (notification.acconfig == 1 and notification.iesiInit != 1) { iesi_init.setBoolValue(1); - _IESITime = notification.elapsed_seconds - 87; + _IESITime = notification.elapsedTime - 87; } } else { _showIESI = 0; @@ -230,24 +230,24 @@ var IESIRecipient = { new: func(_ident) { - var IESIRecipient = emesary.Recipient.new(_ident); - IESIRecipient.MainScreen = nil; - IESIRecipient.Receive = func(notification) + var NewIESIRecipient = emesary.Recipient.new(_ident); + NewIESIRecipient.MainScreen = nil; + NewIESIRecipient.Receive = func(notification) { if (notification.NotificationType == "FrameNotification") { - if (IESIRecipient.MainScreen == nil) { - IESIRecipient.MainScreen = canvas_IESI.new("Aircraft/A320-family/Models/Instruments/IESI/res/iesi.svg", "A320 IESI"); + if (NewIESIRecipient.MainScreen == nil) { + NewIESIRecipient.MainScreen = canvas_IESI.new("Aircraft/A320-family/Models/Instruments/IESI/res/iesi.svg", "A320 IESI"); } - #if (!math.mod(notifications.frameNotification.FrameCount,2)){ - IESIRecipient.MainScreen.update(notification); - #} + if (math.mod(notifications.frameNotification.FrameCount,2) == 0) { + NewIESIRecipient.MainScreen.update(notification); + } return emesary.Transmitter.ReceiptStatus_OK; } return emesary.Transmitter.ReceiptStatus_NotProcessed; }; - return IESIRecipient; + return NewIESIRecipient; }, }; diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index a2fc49e8..a24f6453 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -1088,7 +1088,7 @@ var canvas_PFD_1 = { wow2_act = wow2.getValue(); # Errors - if (systems.ADIRS.ADIRunits[0].aligned == 1 or (systems.ADIRS.ADIRunits[2].aligned == 1 and att_switch.getValue() == -1)) { + if (systems.ADIRS.ADIRunits[0].operating == 1 or (systems.ADIRS.ADIRunits[2].operating == 1 and att_switch.getValue() == -1)) { me["AI_group"].show(); me["HDG_group"].show(); me["AI_error"].hide(); @@ -1132,7 +1132,7 @@ var canvas_PFD_1 = { me["FPV"].hide(); } else { var aoa = me.getAOAForPFD1(); - if (aoa == nil or (systems.ADIRS.ADIRunits[0].aligned != 1 and att_switch.getValue() == 0) or (systems.ADIRS.ADIRunits[2].aligned != 1 and att_switch.getValue() == -1)){ + if (aoa == nil or (systems.ADIRS.ADIRunits[0].operating != 1 and att_switch.getValue() == 0) or (systems.ADIRS.ADIRunits[2].operating != 1 and att_switch.getValue() == -1)){ me["FPV"].hide(); } else { var roll_deg = roll.getValue() or 0; @@ -1870,7 +1870,7 @@ var canvas_PFD_2 = { wow2_act = wow2.getValue(); # Errors - if (systems.ADIRS.ADIRunits[1].aligned == 1 or (systems.ADIRS.ADIRunits[2].aligned == 1 and att_switch.getValue() == 1)) { + if (systems.ADIRS.ADIRunits[1].operating == 1 or (systems.ADIRS.ADIRunits[2].operating == 1 and att_switch.getValue() == 1)) { me["AI_group"].show(); me["HDG_group"].show(); me["AI_error"].hide(); @@ -1907,7 +1907,7 @@ var canvas_PFD_2 = { me["FPV"].hide(); } else { var aoa = me.getAOAForPFD2(); - if (aoa == nil or (systems.ADIRS.ADIRunits[1].aligned != 1 and att_switch.getValue() == 0) or (systems.ADIRS.ADIRunits[2].aligned != 1 and att_switch.getValue() == 1)) { + if (aoa == nil or (systems.ADIRS.ADIRunits[1].operating != 1 and att_switch.getValue() == 0) or (systems.ADIRS.ADIRunits[2].operating != 1 and att_switch.getValue() == 1)) { me["FPV"].hide(); } else { var roll_deg = roll.getValue() or 0; diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 505e5826..cdc8609d 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -972,15 +972,14 @@ var UpperECAMRecipient = EWDRecipient.MainScreen = canvas_upperECAM.new("Aircraft/A320-family/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg", "A320 E/WD CFM", "CFM"); } } - - #if (!math.mod(notifications.frameNotification.FrameCount,2)){ + if (math.mod(notifications.frameNotification.FrameCount,2) == 0) { if (EWDRecipient.type) { EWDRecipient.MainScreen.updateIAE(notification); } else { EWDRecipient.MainScreen.updateCFM(notification); } - #} + } return emesary.Transmitter.ReceiptStatus_OK; } return emesary.Transmitter.ReceiptStatus_NotProcessed; diff --git a/Models/Liveries/A320/PW-NEO/Alitalia-eng.png b/Models/Liveries/A320/PW-NEO/Alitalia-eng.png new file mode 100644 index 00000000..1bc4c51c Binary files /dev/null and b/Models/Liveries/A320/PW-NEO/Alitalia-eng.png differ diff --git a/Models/Liveries/A320/PW-NEO/Alitalia.png b/Models/Liveries/A320/PW-NEO/Alitalia.png new file mode 100644 index 00000000..0ea9f8fb Binary files /dev/null and b/Models/Liveries/A320/PW-NEO/Alitalia.png differ diff --git a/Models/Liveries/A320/PW-NEO/Alitalia.xml b/Models/Liveries/A320/PW-NEO/Alitalia.xml new file mode 100644 index 00000000..43a1ac8e --- /dev/null +++ b/Models/Liveries/A320/PW-NEO/Alitalia.xml @@ -0,0 +1,14 @@ + + + + + + Alitalia EI-MSK + Liveries/A320/PW-NEO/Alitalia.png + + + Liveries/A320/PW-NEO/Alitalia-eng.png + + + + diff --git a/Nasal/Autopush/autopush.nas b/Nasal/Autopush/autopush.nas index 7000abd6..66e20b18 100644 --- a/Nasal/Autopush/autopush.nas +++ b/Nasal/Autopush/autopush.nas @@ -35,8 +35,8 @@ var _loop = func() { var y = 0.0; var z = 0.0; # Rollspeed is only adequate if the wheel is touching the ground. - if (getprop("gear/gear[0]/wow")) { - var V = getprop("gear/gear[0]/rollspeed-ms") * 3.6; + if (getprop("/gear/gear[0]/wow")) { + var V = getprop("/gear/gear[0]/rollspeed-ms") * 3.6; var deltaV = getprop("/sim/model/autopush/target-speed-km_h") - V; var minus_dV = _V - V; var time = getprop("/sim/time/elapsed-sec"); @@ -59,9 +59,9 @@ var _loop = func() { _V = V; _time = time; if (!_yasim) { - force = accel * getprop("fdm/jsbsim/inertia/weight-lbs") * _unitconv; + force = accel * getprop("/fdm/jsbsim/inertia/weight-lbs") * _unitconv; } else { - force = accel * getprop("fdm/yasim/gross-weight-lbs") * _unitconv; + force = accel * getprop("/fdm/yasim/gross-weight-lbs") * _unitconv; } var pitch = getprop("/sim/model/autopush/pitch-deg") * D2R; z = math.sin(pitch); @@ -85,12 +85,13 @@ var _loop = func() { } var _timer = maketimer(0.0167, func{_loop()}); +_timer.simulatedTime = 1; var _start = func() { # Else overwritten by dialog. settimer(func() { setprop("/sim/model/autopush/target-speed-km_h", 0.0) - }, 0.1); + }, 0.1, 1); _K_p = getprop("/sim/model/autopush/K_p"); _F_p = getprop("/sim/model/autopush/F_p"); _K_i = getprop("/sim/model/autopush/K_i"); diff --git a/Nasal/Autopush/autopush_driver.nas b/Nasal/Autopush/driver.nas similarity index 95% rename from Nasal/Autopush/autopush_driver.nas rename to Nasal/Autopush/driver.nas index 6c4e46f7..3b34debb 100644 --- a/Nasal/Autopush/autopush_driver.nas +++ b/Nasal/Autopush/driver.nas @@ -54,7 +54,7 @@ var _loop = func() { D *= NM2M; var (psi_leg, D_leg) = courseAndDistance(_route[_to_wp - 1], _route[_to_wp]); var deltapsi = geo.normdeg180(A - psi_leg); - var psi = getprop("orientation/heading-deg") + _push * 180.0; + var psi = getprop("/orientation/heading-deg") + _push * 180.0; var deltaA = math.min(math.max(_K_psi * geo.normdeg180(A - psi), -_F_psi), _F_psi); var time = getprop("/sim/time/elapsed-sec"); var dt = time - _time; @@ -88,6 +88,7 @@ var _loop = func() { } var _timer = maketimer(0.051, func{_loop()}); +_timer.simulatedTime = 1; var _done = func() { stop(); @@ -123,7 +124,7 @@ var start = func() { _debug = getprop("/sim/model/autopush/debug") or 0; if (!_to_wp) { var (psi_park, D_park) = courseAndDistance(_route[0], _route[1]); - _push = (abs(geo.normdeg180(getprop("orientation/heading-deg") - psi_park)) > 90.0); + _push = (abs(geo.normdeg180(getprop("/orientation/heading-deg") - psi_park)) > 90.0); _sign = 1.0 - 2.0 * _push; _advance_wp(); _psi = 0.0; diff --git a/Nasal/Autopush/autopush_route.nas b/Nasal/Autopush/route.nas similarity index 98% rename from Nasal/Autopush/autopush_route.nas rename to Nasal/Autopush/route.nas index 5dd54c8c..1dfd0781 100644 --- a/Nasal/Autopush/autopush_route.nas +++ b/Nasal/Autopush/route.nas @@ -89,7 +89,7 @@ var _stop = func(fail = 0) { settimer(func() { _finalize_top_view(); gui.popupTip("Done"); - }, 1.0); + }, 1.0, 1); } else { _finalize_top_view(); } @@ -365,12 +365,12 @@ var enter = func() { var wingspan = getprop("/sim/model/autopush/route/wingspan-m"); if ((wingspan == nil) or (wingspan == 0.0)) { # JSBSim - wingspan = getprop("fdm/jsbsim/metrics/bw-ft"); + wingspan = getprop("/fdm/jsbsim/metrics/bw-ft"); if (wingspan != nil) { wingspan *= FT2M; } else { # YAsim - wingspan = getprop("fdm/yasim/model/wings/wing/wing-span"); + wingspan = getprop("/fdm/yasim/model/wings/wing/wing-span"); } setprop("/sim/model/autopush/route/wingspan-m", wingspan); } diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas index 378b67b9..85dadb04 100644 --- a/Nasal/ECAM/ECAM-controller.nas +++ b/Nasal/ECAM/ECAM-controller.nas @@ -26,6 +26,7 @@ var flash = 0; var hasCleared = 0; var statusFlag = 0; var counter = 0; +var counterClear = 0; var noMainMsg = 0; var storeFirstWarning = nil; @@ -260,22 +261,16 @@ var status = { var ECAM_controller = { _recallCounter: 0, _noneActive: 0, - counter: 0, + _ready: 0, init: func() { - ECAMloopTimer.start(); - me.counter = 0; me.reset(); + me._ready = 1; }, - loop: func() { + loop: func(notification) { + if (!me._ready) { + return; + } if ((systems.ELEC.Bus.acEss.getValue() >= 110 or systems.ELEC.Bus.ac2.getValue() >= 110) and !pts.Acconfig.running.getBoolValue()) { - # update FWC phases - if (me.counter == 0) { - phaseLoop(); - me.counter = 1; - return; - } - me.counter = 0; - # check active messages messages_priority_3(); messages_priority_2(); @@ -303,7 +298,7 @@ var ECAM_controller = { } # write to ECAM - var counter = 0; + counter = 0; if (!pts.Acconfig.running.getBoolValue()) { foreach (var w; warnings.vector) { @@ -352,6 +347,7 @@ var ECAM_controller = { } }, reset: func() { + me._ready = 0; foreach (var w; warnings.vector) { if (w.active == 1) { w.active = 0; @@ -390,15 +386,15 @@ var ECAM_controller = { }, clear: func() { hasCleared = 0; - counter = 0; + counterClear = 0; noMainMsg = 0; storeFirstWarning = nil; # first go through the first eight, see how many mainMsg there are foreach (var w; warnings.vector) { - if (counter >= 8) { break; } + if (counterClear >= 8) { break; } if (w.active == 1 and w.clearFlag != 1 and w.isMemo != 1) { - counter += 1; + counterClear += 1; if (w.isMainMsg == 1) { if (noMainMsg == 0) { storeFirstWarning = w; @@ -410,11 +406,11 @@ var ECAM_controller = { # then, if there is an overflow and noMainMsg == 1, we clear the first shown ones if (leftOverflow.getBoolValue() and noMainMsg == 1) { - counter = 0; + counterClear = 0; foreach (var w; warnings.vector) { - if (counter >= 8) { break; } + if (counterClear >= 8) { break; } if (w.active == 1 and w.clearFlag != 1 and w.isMemo != 1) { - counter += 1; + counterClear += 1; if (w.isMainMsg == 1) { continue; } w.clearFlag = 1; hasCleared = 1; @@ -482,10 +478,6 @@ setlistener("/systems/electrical/bus/dc-ess", func { } }, 0, 0); -var ECAMloopTimer = maketimer(0.15, func { - ECAM_controller.loop(); -}); - # Flash Master Warning Light var shutUpYou = func() { lights[0].setBoolValue(0); diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index fa2c5a26..b5adbd36 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -1314,12 +1314,18 @@ var messages_priority_2 = func { ECAM_controller.warningReset(athr_lim_1); } - if (getprop("instrumentation/tcas/serviceable") == 0 and phaseVar2 != 3 and phaseVar2 != 4 and phaseVar2 != 7 and systems.ELEC.Bus.ac1.getValue() >= 110 and pts.Instrumentation.TCAS.Inputs.mode.getValue() != 1 and tcasFault.clearFlag == 0) { + if (getprop("/instrumentation/tcas/serviceable") == 0 and phaseVar2 != 1 and phaseVar2 != 3 and phaseVar2 != 4 and phaseVar2 != 5 and phaseVar2 != 7 and phaseVar2 != 8 and phaseVar2 != 10 and systems.ELEC.Bus.ac1.getValue() >= 110 and pts.Instrumentation.TCAS.Inputs.mode.getValue() != 1 and tcasFault.clearFlag == 0) { tcasFault.active = 1; } else { ECAM_controller.warningReset(tcasFault); } + if (phaseVar2 == 6 and pts.Instrumentation.TCAS.Inputs.mode.getValue() == 1 and !tcasFault.active and (atc.Transponders.vector[0].condition != 0 and atc.Transponders.vector[1].condition != 0) and tcasStby.clearFlag == 0) { + tcasStby.active = 1; + } else { + ECAM_controller.warningReset(tcasStby); + } + if (gpwsTerrFault.clearFlag == 0 and warningNodes.Timers.navTerrFault.getValue() == 1 and (phaseVar2 == 2 or phaseVar2 == 6 or phaseVar2 == 7 or phaseVar2 == 9)) { gpwsTerrFault.active = 1; @@ -2552,6 +2558,17 @@ var messages_right_memo = func { ignition.active = 0; } + if ((atc.Transponders.vector[0].condition == 0 and atc.Transponders.vector[1].condition == 0) or (!getprop("/systems/navigation/adr/operating-1") and !getprop("/systems/navigation/adr/operating-2") and !getprop("/systems/navigation/adr/operating-3")) or pts.Instrumentation.TCAS.Inputs.mode.getValue() == 1) { + if (phaseVarMemo3 == 6) { + tcas_stby.colour = "a"; + } else { + tcas_stby.colour = "g"; + } + tcas_stby.active = 1; + } else { + tcas_stby.active = 0; + } + if ((phaseVarMemo3 <= 2 or phaseVarMemo3 == 6 or phaseVarMemo3 >= 9) and atsu.CompanyCall.frequency != 999.99 and !atsu.CompanyCall.received) { company_call.active = 1; } else { diff --git a/Nasal/ECAM/ECAM-main.nas b/Nasal/ECAM/ECAM-main.nas index 535544b3..0082292e 100644 --- a/Nasal/ECAM/ECAM-main.nas +++ b/Nasal/ECAM/ECAM-main.nas @@ -5,17 +5,12 @@ var ap_active = 0; var athr_active = 0; -var phase = 0; var aileron = 0; var elevator = 0; -var stateL = 0; -var stateR = 0; var engModeSel = 0; var APUMaster = 0; var APURPM = 0; -var elapsedSec = 0; var gearDown = 0; -var agl = 0; var apOffTime = 0; var athrOffTime = 0; var apWarnNode = 0; @@ -23,165 +18,128 @@ var athrWarnNode = 0; var engStrtTimeSw = 0; var engStrtTime = 0; var page = 0; -var apuLight = 0; -var bleedLight = 0; -var condLight = 0; -var doorLight = 0; -var elecLight = 0; -var engLight = 0; -var fctlLight = 0; -var fuelLight = 0; -var hydLight = 0; -var pressLight = 0; -var stsLight = 0; -var wheelLight = 0; -var clrLight = 0; var ECAM = { _cachePage: "", init: func() { setprop("/systems/gear/landing-gear-warning-light", 0); page = props.globals.initNode("/ECAM/Lower/page", "door", "STRING"); - apuLight = props.globals.initNode("/ECAM/Lower/light/apu", 0, "BOOL"); - bleedLight = props.globals.initNode("/ECAM/Lower/light/bleed", 0, "BOOL"); - condLight = props.globals.initNode("/ECAM/Lower/light/cond", 0, "BOOL"); - doorLight = props.globals.initNode("/ECAM/Lower/light/door", 0, "BOOL"); - elecLight = props.globals.initNode("/ECAM/Lower/light/elec", 0, "BOOL"); - engLight = props.globals.initNode("/ECAM/Lower/light/eng", 0, "BOOL"); - fctlLight = props.globals.initNode("/ECAM/Lower/light/fctl", 0, "BOOL"); - fuelLight = props.globals.initNode("/ECAM/Lower/light/fuel", 0, "BOOL"); - hydLight = props.globals.initNode("/ECAM/Lower/light/hyd", 0, "BOOL"); - pressLight = props.globals.initNode("/ECAM/Lower/light/press", 0, "BOOL"); - stsLight = props.globals.initNode("/ECAM/Lower/light/sts", 0, "BOOL"); - wheelLight = props.globals.initNode("/ECAM/Lower/light/wheel", 0, "BOOL"); - clrLight = props.globals.initNode("/ECAM/Lower/light/clr", 0, "BOOL"); - phase = props.globals.initNode("/ECAM/warning-phase", 0, "INT"); - apOffTime = props.globals.initNode("/ECAM/ap-off-time", 0, "INT"); - athrOffTime = props.globals.initNode("/ECAM/athr-off-time", 0, "INT"); + apOffTime = props.globals.initNode("/ECAM/warnings/ap-off-time", 0, "INT"); + athrOffTime = props.globals.initNode("/ECAM/warnings/athr-off-time", 0, "INT"); engStrtTimeSw = props.globals.initNode("/ECAM/engine-start-time-switch", 0, "BOOL"); engStrtTime = props.globals.initNode("/ECAM/engine-start-time", 0.0, "DOUBLE"); apWarnNode = props.globals.initNode("/it-autoflight/output/ap-warning", 0, "INT"); athrWarnNode = props.globals.initNode("/it-autoflight/output/athr-warning", 0, "INT"); me.reset(); }, - reset: func() { - setprop("ECAM/msg/line1", ""); - setprop("ECAM/msg/line2", ""); - setprop("ECAM/msg/line3", ""); - setprop("ECAM/msg/line4", ""); - setprop("ECAM/msg/line5", ""); - setprop("ECAM/msg/line6", ""); - setprop("ECAM/msg/line7", ""); - setprop("ECAM/msg/line8", ""); - setprop("ECAM/msg/linec1", "w"); - setprop("ECAM/msg/linec2", "w"); - setprop("ECAM/msg/linec3", "w"); - setprop("ECAM/msg/linec4", "w"); - setprop("ECAM/msg/linec5", "w"); - setprop("ECAM/msg/linec6", "w"); - setprop("ECAM/msg/linec7", "w"); - setprop("ECAM/msg/linec8", "w"); - setprop("ECAM/rightmsg/line1", ""); - setprop("ECAM/rightmsg/line2", ""); - setprop("ECAM/rightmsg/line3", ""); - setprop("ECAM/rightmsg/line4", ""); - setprop("ECAM/rightmsg/line5", ""); - setprop("ECAM/rightmsg/line6", ""); - setprop("ECAM/rightmsg/line7", ""); - setprop("ECAM/rightmsg/line8", ""); - setprop("ECAM/rightmsg/linec1", "w"); - setprop("ECAM/rightmsg/linec2", "w"); - setprop("ECAM/rightmsg/linec3", "w"); - setprop("ECAM/rightmsg/linec4", "w"); - setprop("ECAM/rightmsg/linec5", "w"); - setprop("ECAM/rightmsg/linec6", "w"); - setprop("ECAM/rightmsg/linec7", "w"); - setprop("ECAM/rightmsg/linec8", "w"); - - page.setValue("door"); - apuLight.setValue(0); - bleedLight.setValue(0); - condLight.setValue(0); - doorLight.setValue(0); - elecLight.setValue(0); - engLight.setValue(0); - fctlLight.setValue(0); - fuelLight.setValue(0); - hydLight.setValue(0); - pressLight.setValue(0); - stsLight.setValue(0); - wheelLight.setValue(0); - clrLight.setValue(0); - }, - loop: func() { - stateL = pts.Engines.Engine.state[0].getValue(); - stateR = pts.Engines.Engine.state[1].getValue(); - wow = pts.Gear.wow[0].getValue(); - elapsedTime = pts.Sim.Time.elapsedSec.getValue(); - - if (stateL != 3 or stateR != 3) { - if (engStrtTimeSw.getBoolValue()) { + update_items: [ + props.UpdateManager.FromHashList(["ap1","ap2","apWarn"], nil, func(val) { + if (val.apWarn == 2 and (val.ap1 or val.ap2)) { + apWarnNode.setValue(0); + ecam.lights[0].setBoolValue(0); + } + }), + props.UpdateManager.FromHashList(["athr","athrWarn"], nil, func(val) { + if (val.athrWarn == 2 and val.athr) { + athrWarnNode.setValue(0); + } + }), + props.UpdateManager.FromHashList(["engine1State","engine2State","gear0Wow"], nil, func(val) { + if (val.engine1State != 3 or val.engine2State != 3) { engStrtTimeSw.setBoolValue(0); engStrtTime.setValue(0); - } - } else if (stateL == 3 and stateR == 3 and wow == 1) { - if (!engStrtTimeSw.getBoolValue()) { - engStrtTime.setValue(elapsedTime); + } else if (val.engine1State == 3 and val.engine2State == 3 and val.gear0Wow) { + engStrtTime.setValue(val.elapsedTime); engStrtTimeSw.setBoolValue(1); - } - } else if (wow == 1) { - if (engStrtTimeSw.getBoolValue()) { + } else if (val.gear0Wow) { engStrtTimeSw.setBoolValue(0); } + }), + ], + lights: { + "apu": props.globals.initNode("/ECAM/Lower/light/apu", 0, "BOOL"), + "bleed": props.globals.initNode("/ECAM/Lower/light/bleed", 0, "BOOL"), + "cond": props.globals.initNode("/ECAM/Lower/light/cond", 0, "BOOL"), + "door": props.globals.initNode("/ECAM/Lower/light/door", 0, "BOOL"), + "elec": props.globals.initNode("/ECAM/Lower/light/elec", 0, "BOOL"), + "eng": props.globals.initNode("/ECAM/Lower/light/eng", 0, "BOOL"), + "fctl": props.globals.initNode("/ECAM/Lower/light/fctl", 0, "BOOL"), + "fuel": props.globals.initNode("/ECAM/Lower/light/fuel", 0, "BOOL"), + "hyd": props.globals.initNode("/ECAM/Lower/light/hyd", 0, "BOOL"), + "press": props.globals.initNode("/ECAM/Lower/light/press", 0, "BOOL"), + "sts": props.globals.initNode("/ECAM/Lower/light/sts", 0, "BOOL"), + "wheel": props.globals.initNode("/ECAM/Lower/light/wheel", 0, "BOOL"), + "clr": props.globals.initNode("/ECAM/Lower/light/clr", 0, "BOOL"), + }, + reset: func() { + for (var i = 0; i <= 8; i = i + 1) { + setprop("ECAM/msg/line" ~ i, ""); + setprop("ECAM/rightmsg/line" ~ i, ""); + setprop("ECAM/msg/linec" ~ i, "w"); + setprop("ECAM/rightmsg/linec" ~ i, "w"); } + page.setValue("door"); + me.lights.apu.setValue(0); + me.lights.bleed.setValue(0); + me.lights.cond.setValue(0); + me.lights.door.setValue(0); + me.lights.elec.setValue(0); + me.lights.eng.setValue(0); + me.lights.fctl.setValue(0); + me.lights.fuel.setValue(0); + me.lights.hyd.setValue(0); + me.lights.press.setValue(0); + me.lights.sts.setValue(0); + me.lights.wheel.setValue(0); + me.lights.clr.setValue(0); + }, + loop: func(notification) { # AP / ATHR warnings - if (ap_active == 1 and apWarnNode.getValue() == 0) { + if (ap_active == 1 and !notification.apWarn) { ap_active = 0; - } elsif (ap_active == 1 and apWarnNode.getValue() == 1 and elapsedTime > (apOffTime.getValue() + 9)) { + } elsif (ap_active == 1 and notification.apWarn == 1 and notification.elapsedTime > (notification.apOffTime + 9)) { ap_active = 0; apWarnNode.setValue(0); - } elsif (ap_active == 0 and apWarnNode.getValue() != 0) { + } elsif (ap_active == 0 and notification.apWarn != 0) { ap_active = 1; } - if (ap_active == 1 and apWarnNode.getValue() == 1 and elapsedTime > (apOffTime.getValue() + 3) and ecam.lights[0].getBoolValue()) { + if (ap_active == 1 and notification.apWarn == 1 and notification.elapsedTime > (notification.apOffTime + 3) and notification.masterWarn) { ecam.lights[0].setBoolValue(0); } - if (apWarnNode.getValue() == 2 and (fmgc.Output.ap1.getValue() == 1 or fmgc.Output.ap2.getValue() == 1)) { - apWarnNode.setValue(0); - } - - if (athr_active == 1 and athrWarnNode.getValue() == 0) { + if (athr_active == 1 and !notification.athrWarn) { athr_active = 0; - } elsif (athr_active == 1 and athrWarnNode.getValue() == 1 and elapsedTime > (athrOffTime.getValue() + 9)) { + } elsif (athr_active == 1 and notification.athrWarn == 1 and notification.elapsedTime > (notification.athrOffTime + 9)) { athr_active = 0; athrWarnNode.setValue(0); - } elsif (athr_active == 0 and athrWarnNode.getValue() != 0) { + } elsif (athr_active == 0 and notification.athrWarn != 0) { athr_active = 1; } - - if (athr_active == 1 and athrWarnNode.getValue() == 1 and elapsedTime > (athrOffTime.getValue() + 3) and ecam.lights[1].getBoolValue()) { + if (athr_active == 1 and notification.athrWarn == 1 and notification.elapsedTime > (notification.athrOffTime + 3) and notification.masterCaution) { ecam.lights[1].setValue(0); } - if (athrWarnNode.getValue() == 2 and fmgc.Output.athr.getValue() == 1) { - athrWarnNode.setValue(0); + foreach (var update_item; me.update_items) { + update_item.update(notification); } - SystemDisplay.update(); + SystemDisplay.update(notification); if (me._cachePage != SystemDisplay.page) { - me._cachePage = SystemDisplay.page; - page.setValue(SystemDisplay.page); + me.updateSDPage(SystemDisplay.page); } }, + updateSDPage: func(newPage) { + me._cachePage = newPage; + page.setValue(newPage); + }, clrLight: func() { - clrLight.setValue(1); - } + me.lights.clr.setValue(1); + }, }; var SystemDisplay = { @@ -217,12 +175,10 @@ var SystemDisplay = { me.page = page; } }, - update: func() { - phase = pts.ECAM.fwcWarningPhase.getValue(); + update: func(notification) { APUMaster = systems.APUNodes.Controls.master.getValue(); APURPM = pts.APU.rpm.getValue(); engModeSel = pts.Controls.Engines.startSw.getValue(); - elapsedSec = pts.Sim.Time.elapsedSec.getValue(); if (APUMaster == 1 and me.APU10sec != 1) { me.autoCall("apu"); @@ -230,10 +186,10 @@ var SystemDisplay = { if (me.APU10sec == 9 and APURPM >= 95.0) { me.APU10sec = 0; - me._apuTime = elapsedSec; + me._apuTime = notification.elapsedTime; } - if (me.APU10sec != 9 and elapsedSec > me._apuTime + 10) { + if (me.APU10sec != 9 and notification.elapsedTime > me._apuTime + 10) { me.APU10sec = 1; } } elsif (engModeSel == 0 or engModeSel == 2 or (engModeSel == 1 and me.eng10sec == 0)) { @@ -242,10 +198,10 @@ var SystemDisplay = { if (me.eng10sec == 9 and engModeSel == 1) { me.eng10sec = 0; - me._engTime = elapsedSec; + me._engTime = notification.elapsedTime; } - if (me.eng10sec != 9 and elapsedSec > me._engTime + 10) { + if (me.eng10sec != 9 and notification.elapsedTime > me._engTime + 10) { me.eng10sec = 1; } } else { @@ -256,49 +212,43 @@ var SystemDisplay = { me.eng10sec = 9; # Phase logic - if (phase == 1) { + if (notification.FWCPhase == 1) { me.autoCall("door"); me.fctl20sec = 9; - } elsif (phase == 2) { - aileron = pts.Fdm.JSBsim.Fbw.aileron.getValue(); - elevator = pts.Fdm.JSBsim.Fbw.elevator.getValue(); - - if (abs(aileron) >= 0.15 or abs(elevator) >= 0.15 and me.fctl20sec == 9) { + } elsif (notification.FWCPhase == 2) { + if (notification.aileronFBW >= 0.15 or notification.elevatorFBW >= 0.15 and me.fctl20sec == 9) { me.autoCall("fctl"); if (me.fctl20sec == 9) { me.fctl20sec = 0; - me._fctlTime = elapsedSec; + me._fctlTime = notification.elapsedTime; } - if (me.fctl20sec != 9 and elapsedSec > me._fctlTime + 20) { + if (me.fctl20sec != 9 and notification.elapsedTime > me._fctlTime + 20) { me.fctl20sec = 1; } } elsif (me.fctl20sec == 0) { - if (me.fctl20sec != 9 and elapsedSec > me._fctlTime + 20) { + if (me.fctl20sec != 9 and notification.elapsedTime > me._fctlTime + 20) { me.fctl20sec = 1; } } else { me.autoCall("wheel"); me.fctl20sec = 9; } - } elsif (phase >= 3 and phase <= 5) { + } elsif (notification.FWCPhase >= 3 and notification.FWCPhase <= 5) { me.autoCall("eng"); me.fctl20sec = 9; - } elsif (phase == 6) { - gearLever = pts.Controls.Gear.gearDown.getValue(); - agl = pts.Position.gearAglFt.getValue(); - - if (gearLever and agl <= 16000) { + } elsif (notification.FWCPhase == 6) { + if (notification.gearLever and notification.agl <= 16000) { me.autoCall("wheel"); } else { me.autoCall("crz"); } me.fctl20sec = 9; - } elsif (phase >= 7 and phase <= 9) { + } elsif (notification.FWCPhase >= 7 and notification.FWCPhase <= 9) { me.autoCall("wheel"); me.fctl20sec = 9; - } elsif (phase == 10) { + } elsif (notification.FWCPhase == 10) { me.autoCall("door"); me.fctl20sec = 9; } @@ -357,35 +307,13 @@ var ECAMControlPanel = { emerCancBtn: func() { # todo }, - lightOff: func(page) { - if (page == "clr") { clrLight.setBoolValue(0); } - elsif (page == "apu") { apuLight.setBoolValue(0); } - elsif (page == "bleed") { bleedLight.setBoolValue(0); } - elsif (page == "cond") { condLight.setBoolValue(0); } - elsif (page == "door") { doorLight.setBoolValue(0); } - elsif (page == "elec") { elecLight.setBoolValue(0); } - elsif (page == "eng") { engLight.setBoolValue(0); } - elsif (page == "fctl") { fctlLight.setBoolValue(0); } - elsif (page == "fuel") { fuelLight.setBoolValue(0); } - elsif (page == "hyd") { hydLight.setBoolValue(0); } - elsif (page == "press") { pressLight.setBoolValue(0); } - elsif (page == "sts") { stsLight.setBoolValue(0); } - elsif (page == "wheel") { wheelLight.setBoolValue(0); } + lightOff: func(pageLightOff) { + if (pageLightOff == "crz") { return; } + ECAM.lights[pageLightOff].setBoolValue(0); }, - lightOn: func(page) { - if (page == "clr") { clrLight.setBoolValue(1); } - elsif (page == "apu") { apuLight.setBoolValue(1); } - elsif (page == "bleed") { bleedLight.setBoolValue(1); } - elsif (page == "cond") { condLight.setBoolValue(1); } - elsif (page == "door") { doorLight.setBoolValue(1); } - elsif (page == "elec") { elecLight.setBoolValue(1); } - elsif (page == "eng") { engLight.setBoolValue(1); } - elsif (page == "fctl") { fctlLight.setBoolValue(1); } - elsif (page == "fuel") { fuelLight.setBoolValue(1); } - elsif (page == "hyd") { hydLight.setBoolValue(1); } - elsif (page == "press") { pressLight.setBoolValue(1); } - elsif (page == "sts") { stsLight.setBoolValue(1); } - elsif (page == "wheel") { wheelLight.setBoolValue(1); } + lightOn: func(pageLightOn) { + if (pageLightOn == "crz") { return; } + ECAM.lights[pageLightOn].setBoolValue(1); }, }; @@ -414,4 +342,54 @@ var doApWarn = func(type) { apWarnNode.setValue(2); # master warning handled by warning system in this case } +} + +# Emesary +var ECAMRecipient = +{ + new: func(_ident) + { + var NewECAMRecipient = emesary.Recipient.new(_ident); + NewECAMRecipient.Receive = func(notification) + { + if (notification.NotificationType == "FrameNotification") + { + if (math.mod(notifications.frameNotification.FrameCount,5) == 0) { + ECAM.loop(notification); + } + if (math.mod(notifications.frameNotification.FrameCount,10) == 0) { + phaseLoop(); + } + if (math.mod(notifications.frameNotification.FrameCount,10) == 5) { + ECAM_controller.loop(notification); + } + return emesary.Transmitter.ReceiptStatus_OK; + } + return emesary.Transmitter.ReceiptStatus_NotProcessed; + }; + return NewECAMRecipient; + }, +}; + +var A320ECAM = ECAMRecipient.new("A320 ECAM"); +emesary.GlobalTransmitter.Register(A320ECAM); + +var input = { + "aileronFBW": "/fdm/jsbsim/fbw/aileron-sidestick", + "agl": "/position/gear-agl-ft", + "athr": "/it-autoflight/output/athr", + "athrWarn": "/it-autoflight/output/athr-warning", + "athrOffTime": "/ECAM/warnings/athr-off-time", + "ap1": "/it-autoflight/output/ap1", + "ap2": "/it-autoflight/output/ap2", + "apWarn": "/it-autoflight/output/ap-warning", + "apOffTime": "/ECAM/warnings/ap-off-time", + "elevatorFBW": "/fdm/jsbsim/fbw/elevator-sidestick", + "gearLever": "/controls/gear/gear-down", + "masterCaution": "/ECAM/warnings/master-caution-light", + "masterWarn": "/ECAM/warnings/master-warning-light", +}; + +foreach (var name; keys(input)) { + emesary.GlobalTransmitter.NotifyAll(notifications.FrameNotificationAddProperty.new("A320 ECAM", name, input[name])); } \ No newline at end of file diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas index 5df843e6..7edc9e76 100644 --- a/Nasal/ECAM/ECAM-messages.nas +++ b/Nasal/ECAM/ECAM-messages.nas @@ -275,6 +275,7 @@ var warnings = std.Vector.new([ # TCAS FAULT var tcasFault = warning.new(msg: "NAV TCAS FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), + var tcasStby = warning.new(msg: "NAV TCAS STBY", colour: "a", aural: 1, light: 1, isMainMsg: 1), var gpwsFault = warning.new(msg: "NAV GPWS FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var gpwsFaultOff = warning.new(msg: "-GPWS...............OFF", colour: "c"), var gpwsTerrFault = warning.new(msg: "NAV GPWS TERR DET FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), @@ -542,7 +543,7 @@ var memos = std.Vector.new([ 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 - var tcas_stby = memo.new(msg: "TCAS STBY" ), # Not yet implemented + var tcas_stby = memo.new(msg: "TCAS STBY" ), var company_call = memo.new(msg: "COMPANY CALL"), var satcom_alert = memo.new(msg: "SATCOM ALERT"), # Not yet implemented var company_msg = memo.new(msg: "COMPANY MSG" ), diff --git a/Nasal/ECAM/ECAM-phases.nas b/Nasal/ECAM/ECAM-phases.nas index baa5ca52..1c909150 100644 --- a/Nasal/ECAM/ECAM-phases.nas +++ b/Nasal/ECAM/ECAM-phases.nas @@ -46,7 +46,7 @@ var FWC = { recallOutput: props.globals.initNode("/ECAM/flipflop/recall-output", 0, "BOOL"), }, Logic: { - gnd: props.globals.getNode("/ECAM/ground-calc-immediate"), + gnd: props.globals.getNode("/ECAM/logic/ground-calc-immediate"), IRSinAlign: props.globals.initNode("/ECAM/irs-in-align", 0, "BOOL"), feet1500: props.globals.getNode("/ECAM/phases/phase-calculation/altitude-ge-1500"), feet800: props.globals.getNode("/ECAM/phases/phase-calculation/altitude-ge-800"), @@ -73,6 +73,7 @@ var FWC = { }; var phaseLoop = func() { + if ((systems.ELEC.Bus.acEss.getValue() < 110 and systems.ELEC.Bus.ac2.getValue() < 110) or pts.Acconfig.running.getBoolValue()) { return; } if (pts.Sim.Replay.replayActive.getBoolValue()) { return; } myPhase = pts.ECAM.fwcWarningPhase.getValue(); @@ -143,7 +144,7 @@ var phaseLoop = func() { } # Actual Phases - if ((!FWC.Logic.gnd.getBoolValue() and FWC.Timer.gnd2Sec.getValue() != 1 and FWC.Timer.eng1and2Off.getValue() and myPhase != 9) and !FWC.Monostable.phase1Output.getBoolValue()) { + if ((FWC.Logic.gnd.getBoolValue() and FWC.Timer.eng1and2Off.getValue() and myPhase != 9) and !FWC.Monostable.phase1Output.getBoolValue()) { setPhase(1); } diff --git a/Nasal/FBW/it-fbw.nas b/Nasal/FBW/it-fbw.nas index 0ea0c3a8..0ae8347d 100644 --- a/Nasal/FBW/it-fbw.nas +++ b/Nasal/FBW/it-fbw.nas @@ -13,10 +13,24 @@ var sec2 = 0; var sec3 = 0; var fac1 = 0; var fac2 = 0; - +var dualELACFault = 0; +var tripleSECFault = 0; +var dualFACFault = 0; +var adr1 = 0; +var adr2 = 0; +var adr3 = 0; +var tripleADRFail = 0; +var doubleADRFail = 0; +var ir1 = 0; +var ir2 = 0; +var ir3 = 0; +var tripleIRFail = 0; +var doubleIRFail = 0; var blue = 0; var green = 0; var yellow = 0; +var blueGreenFail = 0; +var greenYellowFail = 0; var ail = 0; var roll = 0; var rollback = 0; @@ -154,84 +168,81 @@ var update_loop = func { fac2 = FBW.Computers.fac2.getBoolValue(); law = FBW.activeLaw.getValue(); lawyaw = FBW.activeYawLaw.getValue(); + adr1 = systems.ADIRS.Operating.adr[0].getValue(); + adr2 = systems.ADIRS.Operating.adr[1].getValue(); + adr3 = systems.ADIRS.Operating.adr[2].getValue(); + ir1 = systems.ADIRS.ADIRunits[0].operating; + ir2 = systems.ADIRS.ADIRunits[1].operating; + ir3 = systems.ADIRS.ADIRunits[2].operating; # Degrade logic, all failures which degrade FBW need to go here. -JD blue = systems.HYD.Psi.blue.getValue(); green = systems.HYD.Psi.green.getValue(); yellow = systems.HYD.Psi.yellow.getValue(); - if (!pts.Gear.wow[1].getBoolValue() and !pts.Gear.wow[2].getBoolValue()) { - if (!elac1 and !elac2) { - if (lawyaw == 0) { - FBW.degradeYawLaw.setValue(1); - } - if (law == 0) { - FBW.degradeLaw.setValue(1); - FBW.apOff = 1; - } - } - if ((!elac1 and elac2 and ((green < 1500 and yellow >= 1500) or (green >= 1500 and yellow < 1500))) or (!elac2 and elac1 and blue < 1500)) { - if (lawyaw == 0) { - FBW.degradeYawLaw.setValue(1); - } - if (law == 0) { - FBW.degradeLaw.setValue(1); - FBW.apOff = 1; - } - } - if (!sec1 and !sec2 and !sec3) { - if (lawyaw == 0) { - FBW.degradeYawLaw.setValue(1); - } - if (law == 0) { - FBW.degradeLaw.setValue(1); - } - } - if (systems.ELEC.EmerElec.getBoolValue()) { - if (lawyaw == 0 or lawyaw == 1) { - } elsif (fac1 and lawyaw == 2) { - FBW.degradeYawLaw.setValue(1); - } - if (law == 0) { - FBW.degradeLaw.setValue(1); - FBW.apOff = 1; - } - } - if (blue < 1500 and green < 1500 and yellow >= 1500) { - if (lawyaw == 0) { - FBW.degradeYawLaw.setValue(1); - } - if (law == 0) { - FBW.degradeLaw.setValue(1); - FBW.apOff = 1; - } - } - if ((!fac1 and !fac2) or !FBW.yawdamper.getValue() or (blue >= 1500 and green < 1500 and yellow < 1500)) { + + dualELACFault = !elac1 and !elac2; + tripleSECFault = !sec1 and !sec2 and !sec3; + dualFACFault = !fac1 and !fac2; + + blueGreenFail = blue < 1500 and green < 1500 and yellow >= 1500; + greenYellowFail = blue >= 1500 and green < 1500 and yellow < 1500; + tripleADRFail = !adr1 and !adr2 and !adr3; + doubleADRFail = (!adr1 and !adr2 and adr3) or (adr1 and !adr2 and !adr3) or (!adr1 and adr2 and !adr3); + tripleIRFail = !ir1 and !ir2 and !ir3; + doubleIRFail = (!ir1 and !ir2 and ir3) or (ir1 and !ir2 and !ir3) or (!ir1 and ir2 and !ir3); + + if (tripleADRFail or doubleADRFail or doubleIRFail or tripleIRFail or dualFACFault or !FBW.yawdamper.getValue() or greenYellowFail or blueGreenFail or dualELACFault or (!elac1 and elac2 and ((green < 1500 and yellow >= 1500) or (green >= 1500 and yellow < 1500))) or (!elac2 and elac1 and blue < 1500) or tripleSECFault or systems.ELEC.EmerElec.getBoolValue()) { + if (dualFACFault or !FBW.yawdamper.getValue() or greenYellowFail or (systems.ELEC.EmerElec.getBoolValue() and !fac1) or tripleIRFail) { if (lawyaw == 0 or lawyaw == 1) { FBW.degradeYawLaw.setValue(2); } - if (law == 0) { - FBW.degradeLaw.setValue(1); + } elsif (fac1 and lawyaw == 2 and systems.ELEC.EmerElec.getBoolValue()) { + FBW.degradeYawLaw.setValue(1); + } elsif (lawyaw == 0) { + FBW.degradeYawLaw.setValue(1); + } + + if (law == 0 and !tripleIRFail) { + FBW.degradeLaw.setValue(1); + if (!tripleSECFault) { FBW.apOff = 1; } - } - if (!elac1 and !elac2 and !sec1 and !sec2 and !sec3 and !fac1 and !fac2) { - FBW.degradeLaw.setValue(3); + } elsif (tripleIRFail and (law == 0 or law == 1)) { + FBW.degradeLaw.setValue(2); FBW.apOff = 1; } + } else { + FBW.degradeYawLaw.setValue(0); + FBW.degradeLaw.setValue(0); + FBW.apOff = 0; } - if (pts.Controls.Gear.gearDown.getBoolValue() and !fmgc.Input.ap1.getBoolValue() and !fmgc.Input.ap2.getBoolValue()) { - if (law == 1) { - FBW.degradeLaw.setValue(2); - } + if (dualELACFault and tripleSECFault and dualFACFault) { + FBW.degradeLaw.setValue(3); + FBW.apOff = 1; } + # degrade loop runs faster; reset this variable law = FBW.activeLaw.getValue(); - # Mech Backup can always return to direct, if it can. - if (law == 3 and (elac1 or elac2 or sec1 or sec2 or sec3 or fac1 or fac2) and systems.ELEC.Bus.acEss.getValue() >= 110 and (green >= 1500 or blue >= 1500 or yellow >= 1500)) { - FBW.degradeLaw.setValue(2); + if (!pts.Gear.wow[1].getBoolValue() and !pts.Gear.wow[2].getBoolValue()) { + if (pts.Controls.Gear.gearDown.getBoolValue()) { + if (law == 1) { + FBW.degradeLaw.setValue(2); # todo 3 sec timer + } + } else { + if (law == 2 and !tripleIRFail) { + FBW.degradeLaw.setValue(1); # todo 3 sec timer + } + } + } + + # If they can, laws can go back to standard law + if (law == 3) { + if (!dualELACFault or !tripleSECFault or !dualFACFault) { + FBW.degradeLaw.setValue(2); + } } cas = pts.Instrumentation.AirspeedIndicator.indicatedSpdKt.getValue(); diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas index f53e8ccc..fc21405f 100644 --- a/Nasal/FMGC/FCU.nas +++ b/Nasal/FMGC/FCU.nas @@ -381,10 +381,10 @@ var FCUController = { } else if (d == -10) { altTemp = altTemp - 1000; } - if (altTemp < 0) { - altSet.setValue(0); - } else if (altTemp > 50000) { - altSet.setValue(50000); + if (altTemp < 100) { + altSet.setValue(100); + } else if (altTemp > 49000) { + altSet.setValue(49000); } else { altSet.setValue(altTemp); } diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas index 9a3a727f..0f58771c 100644 --- a/Nasal/Libraries/libraries.nas +++ b/Nasal/Libraries/libraries.nas @@ -255,7 +255,6 @@ var systemsLoop = maketimer(0.1, func { systems.ADIRS.loop(); systems.APUController.loop(); systems.BrakeSys.update(); - ecam.ECAM.loop(); fadec.FADEC.loop(); rmp.rmpUpdate(); fcu.FCUController.loop(); diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index c56b7f8e..ab22e2ad 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -58,7 +58,7 @@ var Controls = { }; var ECAM = { - fwcWarningPhase: props.globals.initNode("/ECAM/warning-phase", 1, "INT"), + fwcWarningPhase: props.globals.getNode("/ECAM/warning-phase"), }; var Engines = { diff --git a/Nasal/MCDU/DEPARTURE.nas b/Nasal/MCDU/DEPARTURE.nas index 697361f3..47fb4fa3 100644 --- a/Nasal/MCDU/DEPARTURE.nas +++ b/Nasal/MCDU/DEPARTURE.nas @@ -412,7 +412,8 @@ var departurePage = { me.arrowsMatrix[1][1] = 0; me.arrowsColour[1][1] = "ack"; } - } elsif (size(me.transitions) >= 2) { + } + if (size(me.transitions) >= 2) { me.R3 = [me.transitions[1] ~ " ", nil, "blu"]; if (me.transitions[1] != me.selectedTransition) { me.arrowsMatrix[1][2] = 1; @@ -421,7 +422,8 @@ var departurePage = { me.arrowsMatrix[1][2] = 0; me.arrowsColour[1][2] = "ack"; } - } elsif (size(me.transitions) >= 3) { + } + if (size(me.transitions) >= 3) { me.R4 = [me.transitions[2] ~ " ", nil, "blu"]; if (me.transitions[2] != me.selectedTransition) { me.arrowsMatrix[1][3] = 1; @@ -430,7 +432,8 @@ var departurePage = { me.arrowsMatrix[1][3] = 0; me.arrowsColour[1][3] = "ack"; } - } elsif (size(me.transitions) >= 4) { + } + if (size(me.transitions) >= 4) { me.R5 = [me.transitions[3] ~ " ", nil, "blu"]; if (me.transitions[3] != me.selectedTransition) { me.arrowsMatrix[1][4] = 1; diff --git a/Nasal/Panels/atc.nas b/Nasal/Panels/atc.nas index 99e5778c..5cf13a00 100644 --- a/Nasal/Panels/atc.nas +++ b/Nasal/Panels/atc.nas @@ -17,7 +17,7 @@ var Transponder = { code: "2000", selected: 0, electricalSrc: "", - activeADIRS: 0, + activeADIRS: 1, condition: 0, failed: 0, codeDigitsNodes: [props.globals.getNode("instrumentation/transponder/inputs/digit[0]", 1), props.globals.getNode("instrumentation/transponder/inputs/digit[1]", 1), props.globals.getNode("instrumentation/transponder/inputs/digit[2]", 1), props.globals.getNode("instrumentation/transponder/inputs/digit[3]", 1)], @@ -244,6 +244,41 @@ var transponderPanel = { Transponders.vector[1].switchADIRS(2); } } + + if (Transponders.vector[me.atcSel - 1].activeADIRS == 1) { + me.updateADR1(systems.ADIRS.Operating.adr[0].getValue()); + } elsif (Transponders.vector[me.atcSel - 1].activeADIRS == 2) { + me.updateADR2(systems.ADIRS.Operating.adr[1].getValue()); + } elsif (Transponders.vector[me.atcSel - 1].activeADIRS == 3) { + me.updateADR3(systems.ADIRS.Operating.adr[2].getValue()); + } + }, + updateADR1: func(val) { + if (Transponders.vector[me.atcSel - 1].activeADIRS == 1) { + if (val) { + setprop("/instrumentation/tcas/serviceable", 1); + } else { + setprop("/instrumentation/tcas/serviceable", 0); + } + } + }, + updateADR2: func(val) { + if (Transponders.vector[me.atcSel - 1].activeADIRS == 2) { + if (val) { + setprop("/instrumentation/tcas/serviceable", 1); + } else { + setprop("/instrumentation/tcas/serviceable", 0); + } + } + }, + updateADR3: func(val) { + if (Transponders.vector[me.atcSel - 1].activeADIRS == 3) { + if (val) { + setprop("/instrumentation/tcas/serviceable", 1); + } else { + setprop("/instrumentation/tcas/serviceable", 0); + } + } }, }; @@ -265,3 +300,15 @@ var Transponders = std.Vector.new([Transponder.new("/systems/electrical/bus/ac-e var transponderTimer = maketimer(0.1, func() { Transponders.vector[transponderPanel.atcSel - 1].update(); }); + +setlistener("/systems/navigation/adr/operating-1", func() { + transponderPanel.updateADR1(systems.ADIRS.Operating.adr[0].getValue()); +}, 1, 0); + +setlistener("/systems/navigation/adr/operating-2", func() { + transponderPanel.updateADR2(systems.ADIRS.Operating.adr[1].getValue()); +}, 1, 0); + +setlistener("/systems/navigation/adr/operating-3", func() { + transponderPanel.updateADR3(systems.ADIRS.Operating.adr[2].getValue()); +}, 1, 0); \ No newline at end of file diff --git a/Nasal/Systems/ADIRS/ADR.nas b/Nasal/Systems/ADIRS/ADR.nas index f00c3b7a..59cf9668 100644 --- a/Nasal/Systems/ADIRS/ADR.nas +++ b/Nasal/Systems/ADIRS/ADR.nas @@ -10,32 +10,31 @@ var _selfTestTime = nil; var ADIRSnodesND = [props.globals.getNode("/instrumentation/efis[0]/nd/ir-1", 1),props.globals.getNode("/instrumentation/efis[1]/nd/ir-2", 1),props.globals.getNode("/instrumentation/efis[0]/nd/ir-3", 1)]; var ADIRU = { - # local vars - _alignTime: 0, - _voltageMain: 0, - _voltageBackup: 0, - _voltageLimitedTime: 0, - _noPowerTime: 0, - _timeVar: 0, - _roll: 0, - _pitch: 0, - _gs: 0, - - num: 0, - aligned: 0, - inAlign: 0, - outputOn: 1, # 0 = disc, 1 = normal - mode: 0, # 0 = off, 1 = nav, 2 = att - energised: 0, # 0 = off, 1 = on - operative: 0, # 0 = off, - alignTimer: nil, - input: [], - output: [], - # methods new: func(n) { var adiru = { parents:[ADIRU] }; adiru.num = n; + adiru._alignTime = 0; + adiru._pfdTime = 0; + adiru._voltageMain = 0; + adiru._voltageBackup = 0; + adiru._voltageLimitedTime = 0; + adiru._noPowerTime = 0; + adiru._timeVar = 0; + adiru._roll = 0; + adiru._pitch = 0; + adiru._gs = 0; + + adiru.aligned = 0; + adiru.operating = 0; # ir operating - used for PFD + fbw failure + adiru.inAlign = 0; + adiru.outputOn = 1; # 0 = disc; 1 = normal + adiru.mode = 0; # 0 = off; 1 = nav; 2 = att + adiru.energised = 0; # 0 = off; 1 = on + adiru.operative = 0; # 0 = off; + adiru.alignTimer = nil; + adiru.input = []; + adiru.output = []; adiru.alignTimer = maketimer(0.1, adiru, me.alignLoop); return adiru; @@ -93,6 +92,7 @@ var ADIRU = { if (!ADIRS.skip.getValue()) { if (time > 0 and me.aligned == 0 and me.inAlign == 0 and me.operative == 1) { me._alignTime = pts.Sim.Time.elapsedSec.getValue() + time; + me._pfdTime = pts.Sim.Time.elapsedSec.getValue() + 20 + (rand() * 5); me.inAlign = 1; if (me.alignTimer != nil) { me.alignTimer.start(); @@ -101,6 +101,7 @@ var ADIRU = { } else { if (me.aligned == 0 and me.inAlign == 0 and me.operative == 1) { me._alignTime = pts.Sim.Time.elapsedSec.getValue() + 5; + me._pfdTime = pts.Sim.Time.elapsedSec.getValue() + 1; me.inAlign = 1; if (me.alignTimer != nil) { me.alignTimer.start(); @@ -114,6 +115,7 @@ var ADIRU = { me.aligned = 0; ADIRSnodesND[me.num].setValue(0); ADIRS.Operating.aligned[me.num].setValue(0); + me.operating = 0; if (me.alignTimer != nil) { me.alignTimer.stop(); } @@ -124,6 +126,9 @@ var ADIRU = { call(canvas_nd.ND_2.NDFo.predicates[predicate]); } }, + irOperating: func() { + me.operating = 1; + }, stopAlignAligned: func() { me.inAlign = 0; me.aligned = 1; @@ -155,9 +160,14 @@ var ADIRU = { } elsif (pts.Sim.Time.elapsedSec.getValue() >= me._alignTime) { me.stopAlignAligned(); } + + if (!me.operating and pts.Sim.Time.elapsedSec.getValue() >= me._pfdTime) { + me.irOperating(); + } }, instAlign: func() { me.stopAlignAligned(); + me.irOperating(); }, # Update loop update: func() { diff --git a/Nasal/Systems/Comm/Notification.nas b/Nasal/Systems/Comm/Notification.nas index c87f6305..408f2be1 100644 --- a/Nasal/Systems/Comm/Notification.nas +++ b/Nasal/Systems/Comm/Notification.nas @@ -312,9 +312,9 @@ var ATIS = { return 1; } - var serverString = "https://api.flybywiresim.com/atis?source=" ~ me.serverSel.getValue() ~ "&icao="; + var serverString = "https://api.flybywiresim.com/atis/" ~ airport ~ "?source=" ~ me.serverSel.getValue(); - http.load(serverString ~ airport) + http.load(serverString) .fail(func(r) return 3) .done(func(r) { var errs = []; @@ -330,14 +330,14 @@ var ATIS = { }, processATIS: func(r, i) { var raw = r.response; - if (r.response == "FBW_ERROR: D-ATIS not available at this airport" or find("atis not avail",r.response) != -1) { + if (r.response == "FBW_ERROR: D-ATIS not available at this airport" or find("atis not avail",r.response) != -1 or find('"statusCode":404',r.response) != -1) { me.received = 0; me.sent = 0; mcdu.mcdu_message(i,"NO D-ATIS AVAILABLE"); return; } if (find("combined", raw) != -1) { - raw = split('{"combined":"', raw)[1]; + raw = split('"combined":"', raw)[1]; raw = split('"}', raw)[0]; } else { if (me.type == 0) { diff --git a/Nasal/emesary/M_frame_notification.nas b/Nasal/emesary/M_frame_notification.nas index 95716a51..228b79c1 100644 --- a/Nasal/emesary/M_frame_notification.nas +++ b/Nasal/emesary/M_frame_notification.nas @@ -96,3 +96,8 @@ var FrameNotificationAddProperty = # var frameNotification = FrameNotification.new(1); + +# Frame count +# 5 = ECAM +# 7 = FWC phases +# 10 = ECAM messages \ No newline at end of file diff --git a/Nasal/emesary/exec.nas b/Nasal/emesary/exec.nas index 885e2447..1e4ca7fd 100644 --- a/Nasal/emesary/exec.nas +++ b/Nasal/emesary/exec.nas @@ -23,13 +23,11 @@ var frame_inc = 0; var cur_frame_inc = 0.05; var execLoop = func { - # notifications.frameNotification.fetchvars(); - if (notifications.frameNotification.FrameCount >= 4) { + if (notifications.frameNotification.FrameCount > 20) { notifications.frameNotification.FrameCount = 0; } emesary.GlobalTransmitter.NotifyAll(notifications.frameNotification); - # notifications.frameNotification.FrameCount = notifications.frameNotification.FrameCount + 1; @@ -57,8 +55,12 @@ var execLoop = func # setup the properties to monitor for this system input = { -frame_rate : "/sim/frame-rate", -elapsed_seconds : "/sim/time/elapsed-sec", + frame_rate: "/sim/frame-rate", + elapsedTime: "/sim/time/elapsed-sec", + FWCPhase: "/ECAM/warning-phase", + gear0Wow: "/gear/gear[0]/wow", + engine1State: "/engines/engine[0]/state", + engine2State: "/engines/engine[1]/state", }; foreach (var name; keys(input)) { diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index e98ce503..26000189 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -89,9 +89,9 @@ - PurserSnacks + cab_call once - Aircraft/A320-family/Sounds/Announce/purserSnacks.wav + Aircraft/A320-family/Sounds/Announce/cab_call.wav /controls/switches/cabinCall @@ -1432,7 +1432,7 @@ once sb - seatbelt.wav + cabin-chime.wav @@ -1450,7 +1450,7 @@ once ns - nosmoko.wav + cabin-chime.wav @@ -1754,12 +1754,12 @@ - welcomeFA + fa_boarding once - Aircraft/A320-family/Sounds/Announce/welcome.wav + Aircraft/A320-family/Sounds/Announce/fa_boarding.wav - /sim/sounde/welcomefa + /sim/sounde/fa_boarding 1 @@ -1770,12 +1770,12 @@ - welcomeCA + fa_welcome once - Aircraft/A320-family/Sounds/Announce/captwelcome.wav + Aircraft/A320-family/Sounds/Announce/fa_welcome.wav - /sim/sounde/welcomecapt + /sim/sounde/fa_welcome 1 @@ -1786,12 +1786,12 @@ - doorsDep + cpt_welcome once - Aircraft/A320-family/Sounds/Announce/doorsdepart.wav + Aircraft/A320-family/Sounds/Announce/cpt_welcome.wav - /sim/sounde/doors + /sim/sounde/cpt_welcome 1 @@ -1802,12 +1802,12 @@ - PrepTo + cpt_doors once - Aircraft/A320-family/Sounds/Announce/takeoff.wav + Aircraft/A320-family/Sounds/Announce/cpt_doors.wav - /sim/sounde/prepareto + /sim/sounde/cpt_doors 1 @@ -1818,12 +1818,12 @@ - seatbeltOff + fa_safety once - Aircraft/A320-family/Sounds/Announce/belt10k.wav + Aircraft/A320-family/Sounds/Announce/fa_safety.wav - /sim/sounde/seatbelt-10k + /sim/sounde/fa_safety 1 @@ -1834,12 +1834,76 @@ - safety + cpt_takeoff once - Aircraft/A320-family/Sounds/Announce/safety.wav + Aircraft/A320-family/Sounds/Announce/cpt_takeoff.wav - /sim/sounde/safety + /sim/sounde/cpt_takeoff + 1 + + + + /sim/current-view/internal + 0.6 + + + + + fa_seatbelt10k + once + Aircraft/A320-family/Sounds/Announce/fa_seatbelt10k.wav + + + /sim/sounde/fa_seatbelt10k + 1 + + + + /sim/current-view/internal + 0.6 + + + + + fa_descent + once + Aircraft/A320-family/Sounds/Announce/fa_descent.wav + + + /sim/sounde/fa_descent + 1 + + + + /sim/current-view/internal + 0.6 + + + + + cpt_landing + once + Aircraft/A320-family/Sounds/Announce/cpt_landing.wav + + + /sim/sounde/cpt_landing + 1 + + + + /sim/current-view/internal + 0.6 + + + + + fa_landed + once + Aircraft/A320-family/Sounds/Announce/fa_landed.wav + + + /sim/sounde/fa_landed 1 @@ -1888,6 +1952,7 @@ Aircraft/A320-family/Sounds/Cockpit/cricket.wav looped avionics + 1.5 /sim/sound/warnings/cricket @@ -1917,7 +1982,7 @@ stall-voice - looped + once Aircraft/A320-family/Sounds/Cockpit/stall_voice.wav avionics @@ -2125,4 +2190,4 @@ 200.0 - \ No newline at end of file + diff --git a/Sounds/Announce/belt10k.wav b/Sounds/Announce/belt10k.wav deleted file mode 100644 index e1cffe95..00000000 Binary files a/Sounds/Announce/belt10k.wav and /dev/null differ diff --git a/Sounds/Announce/cab_call.wav b/Sounds/Announce/cab_call.wav new file mode 100644 index 00000000..c2f6ea7f Binary files /dev/null and b/Sounds/Announce/cab_call.wav differ diff --git a/Sounds/Announce/captwelcome.wav b/Sounds/Announce/captwelcome.wav deleted file mode 100644 index cad745f4..00000000 Binary files a/Sounds/Announce/captwelcome.wav and /dev/null differ diff --git a/Sounds/Announce/cpt_doors.wav b/Sounds/Announce/cpt_doors.wav new file mode 100644 index 00000000..92eefe9b Binary files /dev/null and b/Sounds/Announce/cpt_doors.wav differ diff --git a/Sounds/Announce/cpt_landing.wav b/Sounds/Announce/cpt_landing.wav new file mode 100644 index 00000000..26fd41f8 Binary files /dev/null and b/Sounds/Announce/cpt_landing.wav differ diff --git a/Sounds/Announce/cpt_takeoff.wav b/Sounds/Announce/cpt_takeoff.wav new file mode 100644 index 00000000..5eb2e152 Binary files /dev/null and b/Sounds/Announce/cpt_takeoff.wav differ diff --git a/Sounds/Announce/cpt_welcome.wav b/Sounds/Announce/cpt_welcome.wav new file mode 100644 index 00000000..3f49ee57 Binary files /dev/null and b/Sounds/Announce/cpt_welcome.wav differ diff --git a/Sounds/Announce/doorsdepart.wav b/Sounds/Announce/doorsdepart.wav deleted file mode 100644 index aa672a71..00000000 Binary files a/Sounds/Announce/doorsdepart.wav and /dev/null differ diff --git a/Sounds/Announce/fa_boarding.wav b/Sounds/Announce/fa_boarding.wav new file mode 100644 index 00000000..38137e10 Binary files /dev/null and b/Sounds/Announce/fa_boarding.wav differ diff --git a/Sounds/Announce/fa_descent.wav b/Sounds/Announce/fa_descent.wav new file mode 100644 index 00000000..75a270ee Binary files /dev/null and b/Sounds/Announce/fa_descent.wav differ diff --git a/Sounds/Announce/fa_landed.wav b/Sounds/Announce/fa_landed.wav new file mode 100644 index 00000000..6f050aa7 Binary files /dev/null and b/Sounds/Announce/fa_landed.wav differ diff --git a/Sounds/Announce/fa_safety.wav b/Sounds/Announce/fa_safety.wav new file mode 100644 index 00000000..a71fa7f5 Binary files /dev/null and b/Sounds/Announce/fa_safety.wav differ diff --git a/Sounds/Announce/fa_seatbelt10k.wav b/Sounds/Announce/fa_seatbelt10k.wav new file mode 100644 index 00000000..c8a720d1 Binary files /dev/null and b/Sounds/Announce/fa_seatbelt10k.wav differ diff --git a/Sounds/Announce/fa_welcome.wav b/Sounds/Announce/fa_welcome.wav new file mode 100644 index 00000000..0d2dd4bd Binary files /dev/null and b/Sounds/Announce/fa_welcome.wav differ diff --git a/Sounds/Announce/mechCall.wav b/Sounds/Announce/mechCall.wav index efa58a9f..4945719f 100644 Binary files a/Sounds/Announce/mechCall.wav and b/Sounds/Announce/mechCall.wav differ diff --git a/Sounds/Announce/purserSnacks.wav b/Sounds/Announce/purserSnacks.wav deleted file mode 100644 index 81781837..00000000 Binary files a/Sounds/Announce/purserSnacks.wav and /dev/null differ diff --git a/Sounds/Announce/safety.wav b/Sounds/Announce/safety.wav deleted file mode 100644 index 5b33e56e..00000000 Binary files a/Sounds/Announce/safety.wav and /dev/null differ diff --git a/Sounds/Announce/takeoff.wav b/Sounds/Announce/takeoff.wav deleted file mode 100644 index c8f5078b..00000000 Binary files a/Sounds/Announce/takeoff.wav and /dev/null differ diff --git a/Sounds/Announce/welcome.wav b/Sounds/Announce/welcome.wav deleted file mode 100644 index 9ad61cfd..00000000 Binary files a/Sounds/Announce/welcome.wav and /dev/null differ diff --git a/Sounds/Cockpit/cricket.wav b/Sounds/Cockpit/cricket.wav index 54ba04ea..7fcd4645 100644 Binary files a/Sounds/Cockpit/cricket.wav and b/Sounds/Cockpit/cricket.wav differ diff --git a/Sounds/Cockpit/stall_voice.wav b/Sounds/Cockpit/stall_voice.wav index 8d7ae005..1aa6b74e 100644 Binary files a/Sounds/Cockpit/stall_voice.wav and b/Sounds/Cockpit/stall_voice.wav differ diff --git a/Sounds/cabin-chime.wav b/Sounds/cabin-chime.wav new file mode 100644 index 00000000..4e16ef7d Binary files /dev/null and b/Sounds/cabin-chime.wav differ diff --git a/Sounds/nosmoko.wav b/Sounds/nosmoko.wav deleted file mode 100644 index 58e3a8f7..00000000 Binary files a/Sounds/nosmoko.wav and /dev/null differ diff --git a/Sounds/seatbelt.wav b/Sounds/seatbelt.wav deleted file mode 100644 index c131695f..00000000 Binary files a/Sounds/seatbelt.wav and /dev/null differ diff --git a/Sounds/tripleBelt.wav b/Sounds/tripleBelt.wav index 8d468f52..179db05a 100644 Binary files a/Sounds/tripleBelt.wav and b/Sounds/tripleBelt.wav differ diff --git a/Systems/a320-fwc-phases.xml b/Systems/a320-fwc-phases.xml index f2e78d6a..23412c65 100644 --- a/Systems/a320-fwc-phases.xml +++ b/Systems/a320-fwc-phases.xml @@ -8,7 +8,7 @@ Timer for the ECAM phase system - /ECAM/ground-calc-immediate + /ECAM/logic/ground-calc-immediate 120 1 @@ -85,7 +85,7 @@ - + /ECAM/flipflop/radar-altimeter-5-output eq 1 diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index 17708ce9..dba62f04 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -1710,7 +1710,7 @@ /instrumentation/radar-altimeter[0]/radar-altitude-ft lt 1500 /instrumentation/radar-altimeter[1]/radar-altitude-ft lt 1500 - + /it-fbw/law ne 0 /ECAM/warnings/logic/stall/phase-flipflop eq 1 @@ -1736,7 +1736,7 @@ - + /it-fbw/law ne 0 /systems/navigation/adr/operating-1 eq 1 /systems/navigation/adr/operating-2 eq 1 diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml index ac9e1af3..e89c7dfc 100644 --- a/Systems/ecam-proprules.xml +++ b/Systems/ecam-proprules.xml @@ -198,7 +198,7 @@ 2.0 - /ECAM/ground-calc-immediate + /ECAM/logic/ground-calc-immediate ECAM/phases/monostable/gnd-output @@ -209,7 +209,7 @@ 2.5 - /ECAM/ground-calc-immediate + /ECAM/logic/ground-calc-immediate ECAM/phases/monostable/gnd-output-2