From 8107bb73f5fc29ea970bbf7d1b4f06565978279d Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 13 Oct 2020 20:50:22 +0100 Subject: [PATCH 1/8] New OH panel pushbutton sound --- A320-main.xml | 1 + Models/Instruments/OHpanel/OHpanel.xml | 132 +++++++++++----------- Models/Instruments/OHpanel/OHpanelEPR.xml | 4 +- Models/Instruments/OHpanel/SteepAppr.xml | 2 +- Nasal/Libraries/buttons.nas | 6 + Nasal/Systems/electrical.nas | 2 +- Sounds/A320-common-sound.xml | 14 +++ Sounds/Cockpit/pushbutton.wav | Bin 0 -> 16890 bytes 8 files changed, 91 insertions(+), 70 deletions(-) create mode 100644 Sounds/Cockpit/pushbutton.wav diff --git a/A320-main.xml b/A320-main.xml index b9980816..eaaa9e7c 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -212,6 +212,7 @@ 0 0 0 + 0 0 0 0 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 158c886b..fbdf5f3a 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -355,7 +355,7 @@ nasal - + @@ -416,7 +416,7 @@ nasal - + @@ -464,7 +464,7 @@ nasal - + @@ -872,7 +872,7 @@ nasal - + @@ -934,7 +934,7 @@ nasal - + @@ -996,7 +996,7 @@ nasal - + @@ -1230,7 +1230,7 @@ nasal - + @@ -1297,7 +1297,7 @@ nasal - + @@ -1364,7 +1364,7 @@ nasal - + @@ -1431,7 +1431,7 @@ nasal - + @@ -1498,7 +1498,7 @@ nasal - + @@ -1565,7 +1565,7 @@ nasal - + @@ -1632,7 +1632,7 @@ nasal - + @@ -1700,7 +1700,7 @@ nasal - + @@ -1767,7 +1767,7 @@ nasal - + @@ -1833,7 +1833,7 @@ nasal - + @@ -1876,7 +1876,7 @@ nasal - + @@ -1919,7 +1919,7 @@ nasal - + @@ -1964,7 +1964,7 @@ nasal - + @@ -2040,7 +2040,7 @@ nasal - + @@ -2126,7 +2126,7 @@ nasal - + @@ -2193,7 +2193,7 @@ nasal - + @@ -2260,7 +2260,7 @@ nasal - + @@ -2327,7 +2327,7 @@ nasal - + @@ -2395,7 +2395,7 @@ nasal - + @@ -2454,7 +2454,7 @@ nasal - + @@ -2519,7 +2519,7 @@ nasal - + @@ -2584,7 +2584,7 @@ nasal - + @@ -2648,7 +2648,7 @@ nasal - + @@ -2713,7 +2713,7 @@ nasal - + @@ -2778,7 +2778,7 @@ nasal - + @@ -2843,7 +2843,7 @@ nasal - + @@ -2909,7 +2909,7 @@ nasal - + @@ -2970,7 +2970,7 @@ nasal - + @@ -3037,7 +3037,7 @@ nasal - + @@ -3226,7 +3226,7 @@ nasal - + @@ -3292,7 +3292,7 @@ nasal - + @@ -3353,7 +3353,7 @@ nasal - + @@ -3424,7 +3424,7 @@ nasal - + @@ -3468,7 +3468,7 @@ nasal - + @@ -3548,7 +3548,7 @@ nasal - + @@ -3725,7 +3725,7 @@ nasal - + @@ -3887,7 +3887,7 @@ nasal - + @@ -4248,7 +4248,7 @@ nasal - + @@ -4312,7 +4312,7 @@ nasal - + @@ -4385,7 +4385,7 @@ nasal - + @@ -4458,7 +4458,7 @@ nasal - + @@ -4524,7 +4524,7 @@ nasal - + @@ -4597,7 +4597,7 @@ nasal - + @@ -4671,7 +4671,7 @@ nasal - + @@ -4862,7 +4862,7 @@ nasal - + @@ -4939,7 +4939,7 @@ nasal - + @@ -5448,7 +5448,7 @@ nasal - + @@ -5509,7 +5509,7 @@ nasal - + @@ -5570,7 +5570,7 @@ nasal - + @@ -5635,7 +5635,7 @@ nasal - + @@ -5678,7 +5678,7 @@ nasal - + @@ -5729,7 +5729,7 @@ nasal - + @@ -5793,7 +5793,7 @@ nasal - + @@ -5865,7 +5865,7 @@ nasal - + @@ -5970,7 +5970,7 @@ nasal - + @@ -7355,7 +7355,7 @@ nasal - + @@ -7401,7 +7401,7 @@ nasal - + @@ -7499,7 +7499,7 @@ nasal - + @@ -7540,7 +7540,7 @@ nasal - + @@ -7592,7 +7592,7 @@ nasal - + diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml index 8fb64484..fa2021b5 100644 --- a/Models/Instruments/OHpanel/OHpanelEPR.xml +++ b/Models/Instruments/OHpanel/OHpanelEPR.xml @@ -68,7 +68,7 @@ nasal - + @@ -169,7 +169,7 @@ nasal - + diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml index bb56c86e..655894f7 100644 --- a/Models/Instruments/OHpanel/SteepAppr.xml +++ b/Models/Instruments/OHpanel/SteepAppr.xml @@ -53,7 +53,7 @@ nasal - + diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas index f5ade43d..edbc2a09 100644 --- a/Nasal/Libraries/buttons.nas +++ b/Nasal/Libraries/buttons.nas @@ -150,3 +150,9 @@ var toggleSTD = func { pts.Instrumentation.Altimeter.std.setBoolValue(1); } } + +var pushbuttonSound = props.globals.getNode("/sim/sounde/pushbutton"); +var pushbutton = func { + pushbuttonSound.setValue(1); + settimer(func {pushbuttonSound.setValue(0);},0.20); +} \ No newline at end of file diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas index 4e295ea7..6ceb0463 100644 --- a/Nasal/Systems/electrical.nas +++ b/Nasal/Systems/electrical.nas @@ -153,9 +153,9 @@ var ELEC = { }, Switch: { acEssFeed: props.globals.getNode("/controls/electrical/switches/ac-ess-feed"), - busTie: props.globals.getNode("/controls/electrical/switches/bus-tie"), bat1: props.globals.getNode("/controls/electrical/switches/bat-1"), bat2: props.globals.getNode("/controls/electrical/switches/bat-2"), + busTie: props.globals.getNode("/controls/electrical/switches/bus-tie"), emerGenTest: props.globals.getNode("/controls/electrical/switches/emer-gen-test"), extPwr: props.globals.getNode("/controls/electrical/switches/ext-pwr"), galley: props.globals.getNode("/controls/electrical/switches/galley"), diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index df99d463..a37ffdfa 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1528,6 +1528,20 @@ + + Pushbutton + once + avionics + Aircraft/A320-family/Sounds/Cockpit/pushbutton.wav + + /sim/sounde/pushbutton + + + sim/current-view/internal + 0.35 + + + Flaps Lever once diff --git a/Sounds/Cockpit/pushbutton.wav b/Sounds/Cockpit/pushbutton.wav new file mode 100644 index 0000000000000000000000000000000000000000..313bdf87c51c02e9281c3e0cc787eab5cf5871b0 GIT binary patch literal 16890 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 literal 0 HcmV?d00001 From 473b85d106ca006e7116a31a87d7d6edbd68c074 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 13 Oct 2020 21:45:48 +0100 Subject: [PATCH 2/8] Fix pushbutton sound volume; fix lower ecam typo. Prepare to add static inverter fault --- Nasal/Systems/electrical.nas | 2 +- Sounds/A320-common-sound.xml | 2 +- Sounds/Cockpit/pushbutton.wav | Bin 16890 -> 16890 bytes Systems/a320-electrical.xml | 9 +++++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas index 6ceb0463..1ff311e2 100644 --- a/Nasal/Systems/electrical.nas +++ b/Nasal/Systems/electrical.nas @@ -120,10 +120,10 @@ var ELEC = { EmerGen: { volts: props.globals.getNode("/systems/electrical/sources/emer-gen/output-volt"), hertz: props.globals.getNode("/systems/electrical/sources/emer-gen/output-hertz"), + voltsRelay: props.globals.getNode("/systems/electrical/relay/emer-glc/output"), }, Ext: { volts: props.globals.getNode("/systems/electrical/sources/ext/output-volt"), - voltsRelay: props.globals.getNode("/systems/electrical/relay/emer-glc/output"), hertz: props.globals.getNode("/systems/electrical/sources/ext/output-hertz"), }, tr1: { diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index a37ffdfa..e93408c2 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1538,7 +1538,7 @@ sim/current-view/internal - 0.35 + 0.25 diff --git a/Sounds/Cockpit/pushbutton.wav b/Sounds/Cockpit/pushbutton.wav index 313bdf87c51c02e9281c3e0cc787eab5cf5871b0..f935763ee2bb73d5ba816ea9e096fd79ace6f2a1 100644 GIT binary patch literal 16890 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 diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index 85687401..f646860a 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -656,6 +656,15 @@ /systems/electrical/sources/si-1/inverter-gain + + + + /systems/electrical/sources/bat-1/volt lt 23.5 + /systems/electrical/sources/si-1/output-volt lt 110 + /systems/electrical/sources/si-1/output-volt ge 120 + + + From 59c092a5bd485d26a8846305be5be012d873a0b4 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 13 Oct 2020 23:19:06 +0100 Subject: [PATCH 3/8] IDG improvements: 1) restrict disconnection with underspeed condition (14%) 2) Fire pushbutton should deactivate, not disconnect IDG. Therefore, it opens the GCR rather than setting input rpm to zero. 3) Generator comes online at 52% N2 (4730 RPM) 4) Wider range of acceptable frequencies per AMM 5) Gen faults latch -- allows for potential restoration upon reset of the generator switch 6) CSD: restrict rpm range between 4500 -- 9120 rpm --- Models/Instruments/OHpanel/OHpanel.xml | 10 +++- Systems/a320-electrical.xml | 78 +++++++++++++++++++------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index fbdf5f3a..773b2bf1 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -3134,7 +3134,11 @@ false - + + + /engines/engine[0]/n2-actual + 14.0 + systems/electrical/bus/dc-ess 25 @@ -3634,6 +3638,10 @@ + + /engines/engine[1]/n2-actual + 14.0 + systems/electrical/bus/dc-ess 25 diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index f646860a..9fa11456 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -361,7 +361,6 @@ - /controls/engines/engine[0]/fire-btn eq 1 /systems/failures/electrical/idg-1 eq 1 /controls/electrical/switches/idg-1-disc eq 0 @@ -380,8 +379,8 @@ - 1.3 - 2.8 + 1.315 + 2.667 @@ -423,7 +422,8 @@ /systems/failures/electrical/gen-1 ne 1 - /systems/electrical/sources/idg-1/csd-rpm ge 11500 + /controls/engines/engine[0]/fire-btn eq 0 + /systems/electrical/sources/idg-1/drive-rpm ge 4730 @@ -446,7 +446,6 @@ - /controls/engines/engine[1]/fire-btn eq 1 /systems/failures/electrical/idg-2 eq 1 /controls/electrical/switches/idg-2-disc eq 0 @@ -465,8 +464,8 @@ - 1.3 - 2.8 + 1.315 + 2.667 @@ -508,7 +507,8 @@ /systems/failures/electrical/gen-2 ne 1 - /systems/electrical/sources/idg-2/csd-rpm ge 11500 + /controls/engines/engine[1]/fire-btn eq 0 + /systems/electrical/sources/idg-2/drive-rpm ge 4730 @@ -770,14 +770,30 @@ + + + + /systems/acconfig/autoconfig-running eq 1 + /sim/time/elapsed-sec lt 10 + + + /systems/electrical/sources/idg-1/gcu-1-fault eq 1 + /controls/electrical/switches/gen-1 eq 1 + + + /systems/electrical/sources/idg-1/output-volt lt 110 + /systems/electrical/sources/idg-1/output-volt gt 130 + /systems/electrical/sources/idg-1/output-hertz lt 363 + /systems/electrical/sources/idg-1/output-hertz gt 433 + /systems/electrical/sources/idg-1/drive-rpm lt 4730 + + + /controls/electrical/switches/gen-1 eq 1 - /systems/electrical/sources/idg-1/output-volt ge 110 - /systems/electrical/sources/idg-1/output-volt le 130 - /systems/electrical/sources/idg-1/output-hertz ge 390 - /systems/electrical/sources/idg-1/output-hertz le 410 + /systems/electrical/sources/idg-1/gcu-1-fault eq 0 /controls/electrical/switches/gen-1-line-contactor ne 1 @@ -789,14 +805,30 @@ + + + + /systems/acconfig/autoconfig-running eq 1 + /sim/time/elapsed-sec lt 10 + + + /systems/electrical/sources/idg-2/gcu-2-fault eq 1 + /controls/electrical/switches/gen-2 eq 1 + + + /systems/electrical/sources/idg-2/output-volt lt 110 + /systems/electrical/sources/idg-2/output-volt gt 130 + /systems/electrical/sources/idg-2/output-hertz lt 363 + /systems/electrical/sources/idg-2/output-hertz gt 433 + /systems/electrical/sources/idg-2/drive-rpm lt 4730 + + + /controls/electrical/switches/gen-2 eq 1 - /systems/electrical/sources/idg-2/output-volt ge 110 - /systems/electrical/sources/idg-2/output-volt lt 130 - /systems/electrical/sources/idg-2/output-hertz ge 390 - /systems/electrical/sources/idg-2/output-hertz le 410 + /systems/electrical/sources/idg-2/gcu-2-fault eq 0 @@ -1790,7 +1822,10 @@ /controls/electrical/switches/gen-1 eq 1 - /systems/electrical/relay/gen-1-glc/contact-pos eq 0 + + /systems/electrical/sources/idg-1/gcu-1-fault eq 1 + /systems/electrical/relay/gen-1-glc/contact-pos eq 0 + @@ -1798,7 +1833,10 @@ /controls/electrical/switches/gen-2 eq 1 - /systems/electrical/relay/gen-2-glc/contact-pos eq 0 + + /systems/electrical/sources/idg-2/gcu-2-fault eq 1 + /systems/electrical/relay/gen-2-glc/contact-pos eq 0 + @@ -1806,7 +1844,7 @@ /systems/failures/electrical/idg-1 eq 1 - /systems/electrical/sources/idg-1/csd-rpm gt 2000 + /systems/electrical/sources/idg-1/drive-rpm gt 2000 /controls/electrical/switches/idg-1-disc-momentary eq 1 @@ -1817,7 +1855,7 @@ /systems/failures/electrical/idg-2 eq 1 - /systems/electrical/sources/idg-2/csd-rpm gt 2000 + /systems/electrical/sources/idg-2/drive-rpm gt 2000 /controls/electrical/switches/idg-2-disc-momentary eq 1 From 117f0256f848681e12f2f15ddeb670f574c5af5e Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 14 Oct 2020 00:32:24 +0100 Subject: [PATCH 4/8] Electrical: GCU should be powered by PMG or by DC BAT bus. Therefore, you can control with GEN pb sw if you have PMG volts _or_ if you have DC BAT. Also, disc power is on DC BAT, not DC ESS, even though indication is on ESS. Typically weird Airbus --- Models/Instruments/OHpanel/OHpanel.xml | 26 ++++---------------------- Systems/a320-electrical.xml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 773b2bf1..c978dde7 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -3140,7 +3140,7 @@ 14.0 - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-bat 25 @@ -3214,16 +3214,7 @@ false - - - systems/electrical/bus/dc-bat - 25 - - - systems/electrical/bus/dc-ess - 25 - - + /systems/electrical/sources/idg-1/gcu-1-powered property-toggle controls/electrical/switches/gen-1 @@ -3536,16 +3527,7 @@ false - - - systems/electrical/bus/dc-bat - 25 - - - systems/electrical/bus/dc-ess - 25 - - + /systems/electrical/sources/idg-2/gcu-2-powered property-toggle controls/electrical/switches/gen-2 @@ -3643,7 +3625,7 @@ 14.0 - systems/electrical/bus/dc-ess + systems/electrical/bus/dc-bat 25 diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index 9fa11456..d3cfbb65 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -770,6 +770,14 @@ + + + + /systems/electrical/bus/dc-bat ge 25 + /systems/electrical/sources/idg-1/pmg-volt ge 110 + + + @@ -805,6 +813,14 @@ + + + + /systems/electrical/bus/dc-bat ge 25 + /systems/electrical/sources/idg-2/pmg-volt ge 110 + + + From 6a8f13aeb46f7a409bda9ba262695fc1103389c0 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 14 Oct 2020 13:51:30 +0100 Subject: [PATCH 5/8] Emergency bugfix: fix that GCU fault would inhibit gens connecting on startup... --- Nasal/Libraries/libraries.nas | 1 - Systems/a320-electrical.xml | 101 +++++++++++++++++++++++++++------- revision.txt | 2 +- 3 files changed, 83 insertions(+), 21 deletions(-) diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas index b0000108..c0ef6ad0 100644 --- a/Nasal/Libraries/libraries.nas +++ b/Nasal/Libraries/libraries.nas @@ -7,7 +7,6 @@ print("------------------------------------------------"); print("Copyright (c) 2016-2020 Josh Davidson (Octal450)"); print("------------------------------------------------"); - setprop("/sim/menubar/default/menu[0]/item[0]/enabled", 0); setprop("/sim/menubar/default/menu[2]/item[0]/enabled", 0); setprop("/sim/menubar/default/menu[2]/item[2]/enabled", 0); diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index d3cfbb65..6c1f4771 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -5,6 +5,8 @@ /systems/electrical/some-electric-thingie/rat-deploy + /systems/electrical/relay/gen-1-glc/contact-pos + /systems/electrical/relay/gen-2-glc/contact-pos @@ -778,31 +780,61 @@ + + + + /systems/electrical/sources/idg-1/gcu-1-voltage-trip eq 1 + /controls/electrical/switches/gen-1 eq 1 + + + /systems/electrical/relay/gen-1-glc/contact-pos eq 1 + + /systems/electrical/sources/idg-1/output-volt lt 110 + /systems/electrical/sources/idg-1/output-volt gt 130 + + + + + + + + /systems/electrical/sources/idg-1/gcu-1-frequency-trip eq 1 + /controls/electrical/switches/gen-1 eq 1 + + + /systems/electrical/relay/gen-1-glc/contact-pos eq 1 + + /systems/electrical/sources/idg-1/output-hertz lt 363 + /systems/electrical/sources/idg-1/output-hertz gt 433 + + + + /systems/acconfig/autoconfig-running eq 1 /sim/time/elapsed-sec lt 10 - - /systems/electrical/sources/idg-1/gcu-1-fault eq 1 - /controls/electrical/switches/gen-1 eq 1 - - /systems/electrical/sources/idg-1/output-volt lt 110 - /systems/electrical/sources/idg-1/output-volt gt 130 - /systems/electrical/sources/idg-1/output-hertz lt 363 - /systems/electrical/sources/idg-1/output-hertz gt 433 + /systems/electrical/sources/idg-1/gcu-1-voltage-trip eq 1 + /systems/electrical/sources/idg-1/gcu-1-frequency-trip eq 1 /systems/electrical/sources/idg-1/drive-rpm lt 4730 + + /sim/time/elapsed-sec lt 10 + /controls/electrical/switches/gen-1 eq 1 - /systems/electrical/sources/idg-1/gcu-1-fault eq 0 - /controls/electrical/switches/gen-1-line-contactor ne 1 + /systems/electrical/sources/idg-1/output-hertz ge 363 + /systems/electrical/sources/idg-1/output-hertz le 433 + /systems/electrical/sources/idg-1/output-volt ge 110 + /systems/electrical/sources/idg-1/output-volt le 130 + /systems/electrical/sources/idg-1/gcu-1-fault ne 1 @@ -821,30 +853,61 @@ + + + + /systems/electrical/sources/idg-2/gcu-2-voltage-trip eq 1 + /controls/electrical/switches/gen-2 eq 1 + + + /systems/electrical/relay/gen-2-glc/contact-pos eq 1 + + /systems/electrical/sources/idg-2/output-volt lt 110 + /systems/electrical/sources/idg-2/output-volt gt 130 + + + + + + + + /systems/electrical/sources/idg-2/gcu-2-frequency-trip eq 1 + /controls/electrical/switches/gen-2 eq 1 + + + /systems/electrical/relay/gen-2-glc/contact-pos eq 1 + + /systems/electrical/sources/idg-2/output-hertz lt 363 + /systems/electrical/sources/idg-2/output-hertz gt 433 + + + + /systems/acconfig/autoconfig-running eq 1 /sim/time/elapsed-sec lt 10 - - /systems/electrical/sources/idg-2/gcu-2-fault eq 1 - /controls/electrical/switches/gen-2 eq 1 - - /systems/electrical/sources/idg-2/output-volt lt 110 - /systems/electrical/sources/idg-2/output-volt gt 130 - /systems/electrical/sources/idg-2/output-hertz lt 363 - /systems/electrical/sources/idg-2/output-hertz gt 433 + /systems/electrical/sources/idg-2/gcu-2-voltage-trip eq 1 + /systems/electrical/sources/idg-2/gcu-2-frequency-trip eq 1 /systems/electrical/sources/idg-2/drive-rpm lt 4730 + + /sim/time/elapsed-sec lt 10 + /controls/electrical/switches/gen-2 eq 1 - /systems/electrical/sources/idg-2/gcu-2-fault eq 0 + /systems/electrical/sources/idg-2/output-hertz ge 363 + /systems/electrical/sources/idg-2/output-hertz le 433 + /systems/electrical/sources/idg-2/output-volt ge 110 + /systems/electrical/sources/idg-2/output-volt le 130 + /systems/electrical/sources/idg-2/gcu-2-fault ne 1 diff --git a/revision.txt b/revision.txt index 86ee83a4..aaa6442f 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -40 \ No newline at end of file +41 \ No newline at end of file From aed192c7ae7ebd26dc9e79ff37c65d1d095e0f32 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 14 Oct 2020 15:08:29 +0100 Subject: [PATCH 6/8] Same thing for APU --- Models/Instruments/OHpanel/OHpanel.xml | 5 +- Systems/a320-electrical.xml | 98 +++++++++++++++++++------- 2 files changed, 74 insertions(+), 29 deletions(-) diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index c978dde7..eb0764d4 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -3338,10 +3338,7 @@ false - - systems/electrical/bus/dc-bat - 25 - + /systems/electrical/sources/apu/gcu-powered property-toggle controls/electrical/switches/apu diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index 6c1f4771..dcb0067b 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -525,27 +525,15 @@ - + /engines/engine[2]/n1 240.34 - - - - /controls/apu/fire-btn eq 1 - - - - - /systems/electrical/sources/apu/drive-rpm-input - /systems/electrical/sources/apu/working - - - /systems/electrical/sources/apu/drive-rpm-input + /systems/electrical/sources/apu/drive-rpm 115 24000 @@ -558,7 +546,7 @@ - /systems/electrical/sources/apu/drive-rpm-input + /systems/electrical/sources/apu/drive-rpm 2 120 @@ -569,9 +557,10 @@ + /controls/apu/fire-btn ne 1 /controls/electrical/switches/apu eq 1 /systems/failures/electrical/apu ne 1 - /systems/electrical/sources/apu/drive-rpm-input ge 23000 + /systems/electrical/sources/apu/drive-rpm ge 22800 @@ -934,16 +923,70 @@ + + + + /systems/electrical/bus/dc-bat ge 25 + /systems/electrical/sources/apu/pmg-volt ge 101.5 + + + + + + + /systems/electrical/sources/apu/gcu-voltage-trip eq 1 + /controls/electrical/switches/apu eq 1 + + + /systems/electrical/relay/apu-glc/contact-pos eq 1 + + /systems/electrical/sources/apu/output-volt lt 101.5 + /systems/electrical/sources/apu/output-volt gt 130 + + + + + + + + /systems/electrical/sources/apu/gcu-frequency-trip eq 1 + /controls/electrical/switches/apu eq 1 + + + /systems/electrical/relay/apu-glc/contact-pos eq 1 + + /systems/electrical/sources/apu/output-hertz lt 361 + /systems/electrical/sources/apu/output-hertz gt 435 + + + + + + + + /systems/acconfig/autoconfig-running eq 1 + /sim/time/elapsed-sec lt 10 + + + /systems/electrical/sources/apu/gcu-voltage-trip eq 1 + /systems/electrical/sources/apu/gcu-frequency-trip eq 1 + + + + + /sim/time/elapsed-sec lt 10 + /controls/apu/master eq 1 /controls/electrical/switches/apu eq 1 - /systems/electrical/sources/apu/output-volt ge 110 - /systems/electrical/sources/apu/output-volt lt 130 - /systems/electrical/sources/apu/output-hertz ge 390 - /systems/electrical/sources/apu/output-hertz le 410 + /systems/electrical/sources/apu/output-volt ge 101.5 + /systems/electrical/sources/apu/output-volt le 130 + /systems/electrical/sources/apu/output-hertz ge 361 + /systems/electrical/sources/apu/output-hertz le 435 /systems/electrical/relay/ext-epc/contact-pos eq 0 + /systems/electrical/sources/apu/gcu-fault ne 1 @@ -1870,11 +1913,16 @@ /controls/electrical/switches/apu eq 1 - /systems/electrical/relay/apu-glc/contact-pos eq 0 - /systems/electrical/relay/ext-epc/contact-pos eq 0 - /systems/electrical/relay/gen-1-glc/contact-pos eq 0 - /systems/electrical/relay/gen-2-glc/contact-pos eq 0 - /systems/electrical/sources/apu/drive-rpm gt 2000 + + /systems/electrical/sources/apu/gcu-fault eq 1 + + /systems/electrical/relay/apu-glc/contact-pos eq 0 + /systems/electrical/relay/ext-epc/contact-pos eq 0 + /systems/electrical/relay/gen-1-glc/contact-pos eq 0 + /systems/electrical/relay/gen-2-glc/contact-pos eq 0 + + + /systems/electrical/sources/apu/drive-rpm gt 22800 From 68593890bfc9e9fad9ebe7c27d6d4ad170d7efe4 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 14 Oct 2020 15:32:58 +0100 Subject: [PATCH 7/8] Add auto-switching for the AC ESS after three seconds; also correct switch control power to ac1 / ac2 --- Models/Instruments/OHpanel/OHpanel.xml | 12 ++++++------ Systems/a320-electrical.xml | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index eb0764d4..25e3fafc 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -11,8 +11,6 @@ select - ACESSFeedBtn1F - ACESSFeedBtn2A ACPack1Btn1F ACPack1Btn2O ACPack2Btn1F @@ -95,6 +93,8 @@ select + ACESSFeedBtn1F + ACESSFeedBtn2A AftCargoIsoBtn1F AftCargoIsoBtn2O AftCargoSmkBtn1S @@ -3273,12 +3273,12 @@ - systems/electrical/bus/dc-bat - 25 + systems/electrical/bus/ac-1 + 110 - systems/electrical/bus/dc-ess - 25 + systems/electrical/bus/ac-2 + 110 diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml index dcb0067b..3cd7cffb 100644 --- a/Systems/a320-electrical.xml +++ b/Systems/a320-electrical.xml @@ -1070,10 +1070,24 @@ + + + + /systems/electrical/bus/ac-1 lt 110 + + + + + /systems/electrical/relay/ac-ess-feed-1/auto-switch + 100 + 0.33333333333 + + /controls/electrical/switches/ac-ess-feed eq 0 + /systems/electrical/relay/ac-ess-feed-1/auto-switch-timer lt 1 /controls/electrical/switches/emer-gen-test eq 0 @@ -1088,7 +1102,10 @@ - /controls/electrical/switches/ac-ess-feed eq 1 + + /controls/electrical/switches/ac-ess-feed eq 1 + /systems/electrical/relay/ac-ess-feed-1/auto-switch-timer eq 1 + /controls/electrical/switches/emer-gen-test eq 0 @@ -1862,7 +1879,6 @@ - Timer for the ECAM system /systems/electrical/relay/ac-ess-feed-inverter/contact-pos 100 0.1 From 293270f57e5d66b57052c6cc59dd3e7d077813ce Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 14 Oct 2020 18:08:18 +0100 Subject: [PATCH 8/8] ECAM warnings for the GEN 1 / 2 fault --- Nasal/ECAM/ECAM-controller.nas | 6 + Nasal/ECAM/ECAM-logic.nas | 66 +++++++++++ Nasal/ECAM/ECAM-messages.nas | 20 +++- Systems/a320-fwc.xml | 202 +++++++++++++++++++++++++++++++++ Systems/ecam-proprules.xml | 99 ++++++++++++++++ 5 files changed, 392 insertions(+), 1 deletion(-) diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas index 09832bdd..e39d7afb 100644 --- a/Nasal/ECAM/ECAM-controller.nas +++ b/Nasal/ECAM/ECAM-controller.nas @@ -90,8 +90,14 @@ var warningNodes = { navTerrFault: props.globals.initNode("/ECAM/warnings/timer/nav-gpws-terr-fault"), }, Flipflops: { + apuGenFault: props.globals.initNode("/ECAM/warnings/flipflop/apu-gen-fault"), + apuGenFaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/apu-gen-fault-on-off"), bleed1LowTemp: props.globals.initNode("/ECAM/warnings/logic/bleed-1-low-temp-flipflop-output"), bleed2LowTemp: props.globals.initNode("/ECAM/warnings/logic/bleed-2-low-temp-flipflop-output"), + gen1Fault: props.globals.initNode("/ECAM/warnings/flipflop/gen-1-fault"), + gen2Fault: props.globals.initNode("/ECAM/warnings/flipflop/gen-2-fault"), + gen1FaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/gen-1-fault-on-off"), + gen2FaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/gen-2-fault-on-off"), pack1Ovht: props.globals.initNode("/ECAM/warnings/flipflop/pack-1-ovht"), pack2Ovht: props.globals.initNode("/ECAM/warnings/flipflop/pack-2-ovht"), }, diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index 1993baa4..fe11ceee 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -1139,6 +1139,72 @@ var messages_priority_2 = func { ECAM_controller.warningReset(acBusEssShedAtc); } + if (gen1fault.clearFlag == 0 and warningNodes.Flipflops.gen1Fault.getValue() and (phaseVar2 == 2 or phaseVar2 == 3 or phaseVar2 == 6 or phaseVar2 == 9)) { + gen1fault.active = 1; + if (!warningNodes.Flipflops.gen1FaultOnOff.getValue()) { + gen1faultGen.active = 1; + } else { + ECAM_controller.warningReset(gen1faultGen); + } + + if (systems.ELEC.Switch.gen1.getBoolValue()) { + gen1faultGen2.active = 1; + gen1faultGen3.active = 1; + } else { + ECAM_controller.warningReset(gen1faultGen2); + ECAM_controller.warningReset(gen1faultGen3); + } + } else { + ECAM_controller.warningReset(gen1fault); + ECAM_controller.warningReset(gen1faultGen); + ECAM_controller.warningReset(gen1faultGen2); + ECAM_controller.warningReset(gen1faultGen3); + } + + if (gen2fault.clearFlag == 0 and warningNodes.Flipflops.gen2Fault.getValue() and (phaseVar2 == 2 or phaseVar2 == 3 or phaseVar2 == 6 or phaseVar2 == 9)) { + gen2fault.active = 1; + if (!warningNodes.Flipflops.gen2FaultOnOff.getValue()) { + gen2faultGen.active = 1; + } else { + ECAM_controller.warningReset(gen2faultGen); + } + + if (systems.ELEC.Switch.gen2.getBoolValue()) { + gen2faultGen2.active = 1; + gen2faultGen3.active = 1; + } else { + ECAM_controller.warningReset(gen2faultGen2); + ECAM_controller.warningReset(gen2faultGen3); + } + } else { + ECAM_controller.warningReset(gen2fault); + ECAM_controller.warningReset(gen2faultGen); + ECAM_controller.warningReset(gen2faultGen2); + ECAM_controller.warningReset(gen2faultGen3); + } + + if (apuGenfault.clearFlag == 0 and warningNodes.Flipflops.apuGenFault.getValue() and (phaseVar2 <= 3 or phaseVar2 == 6 or phaseVar2 >= 9)) { + apuGenfault.active = 1; + if (!warningNodes.Flipflops.apuGenFaultOnOff.getValue()) { + apuGenfaultGen.active = 1; + } else { + ECAM_controller.warningReset(apuGenfaultGen); + } + + if (systems.ELEC.Switch.genApu.getBoolValue()) { + apuGenfaultGen2.active = 1; + apuGenfaultGen3.active = 1; + } else { + ECAM_controller.warningReset(apuGenfaultGen2); + ECAM_controller.warningReset(apuGenfaultGen3); + } + } else { + ECAM_controller.warningReset(apuGenfault); + ECAM_controller.warningReset(apuGenfaultGen); + ECAM_controller.warningReset(apuGenfaultGen2); + ECAM_controller.warningReset(apuGenfaultGen3); + } + if ((athr_offw.clearFlag == 0) and athrWarn.getValue() == 2 and phaseVar2 != 4 and phaseVar2 != 8 and phaseVar2 != 10) { athr_offw.active = 1; athr_offw_1.active = 1; diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas index 1e0cc66b..7d6e0462 100644 --- a/Nasal/ECAM/ECAM-messages.nas +++ b/Nasal/ECAM/ECAM-messages.nas @@ -212,9 +212,27 @@ var warnings = std.Vector.new([ var dcBusEssShedIcing = warning.new(msg: " AVOID ICING CONDITIONS", colour: "c"), # AC ESS BUS SHED - var acBusEssShed = warning.new(msg: "ELEC DC ESS BUS SHED", colour: "a", aural: 1, light: 1, isMainMsg: 1), + var acBusEssShed = warning.new(msg: "ELEC AC ESS BUS SHED", colour: "a", aural: 1, light: 1, isMainMsg: 1), var acBusEssShedAtc = warning.new(msg: " -ATC..............SYS 2", colour: "c"), + # GEN 1 FAULT + var gen1fault = warning.new(msg: "ELEC GEN 1 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), + var gen1faultGen = warning.new(msg: "-GEN 1......OFF THEN ON", colour: "c"), + var gen1faultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var gen1faultGen3 = warning.new(msg: "-GEN 1..............OFF", colour: "c"), + + # GEN 2 FAULT + var gen2fault = warning.new(msg: "ELEC GEN 2 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), + var gen2faultGen = warning.new(msg: "-GEN 2......OFF THEN ON", colour: "c"), + var gen2faultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var gen2faultGen3 = warning.new(msg: "-GEN 2..............OFF", colour: "c"), + + # APU GEN FAULT + var apuGenfault = warning.new(msg: "ELEC APU GEN FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), + var apuGenfaultGen = warning.new(msg: "-APU GEN....OFF THEN ON", colour: "c"), + var apuGenfaultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var apuGenfaultGen3 = warning.new(msg: "-APU GEN............OFF", colour: "c"), + # Autothrust var athr_offw = warning.new(msg: "AUTO FLT A/THR OFF", colour: "a", aural: 1, light: 1, isMainMsg: 1), var athr_offw_1 = warning.new(msg: "-THR LEVERS........MOVE", colour: "c"), diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index b74add82..6820de11 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -341,6 +341,34 @@ 100 1.0 + + + Timer for the ECAM system + /ECAM/warnings/logic/gen-1-fault-set + 100 + 0.1818 + + + + Timer for the ECAM system + /ECAM/warnings/logic/gen-2-fault-set + 100 + 0.1818 + + + + Timer for the ECAM system + /ECAM/warnings/logic/apu-gen-fault-set + 100 + 0.2 + + + + Timer for the ECAM system + /ECAM/warnings/logic/apu-gen-fault-reset + 100 + 0.5 + @@ -1458,5 +1486,179 @@ + + + + + + + /engines/engine[0]/state eq 3 + /systems/electrical/relay/gen-1-glc/contact-pos eq 0 + + + + + + + /controls/electrical/switches/gen-1 eq 1 + /controls/electrical/switches/idg-1-disc eq 1 + /ECAM/warnings/logic/gen-1-inop eq 1 + + + + + + + /ECAM/warnings/timer/gen-1-fault-set eq 1 + + + + + /systems/electrical/relay/gen-1-glc/contact-pos + 100 + 0.5 + + + + + + /ECAM/warning-phase eq 1 + /ECAM/warning-phase eq 10 + /systems/electrical/some-electric-thingie/emer-elec-config eq 1 + /ECAM/warnings/logic/glc-1-online-2-sec eq 1 + + + + + + + + /ECAM/warnings/flipflop/gen-1-fault eq 1 + + /ECAM/warnings/logic/gen-1-pulse eq 1 + /controls/electrical/switches/gen-1 eq 1 + + + + + + + + /ECAM/warnings/flipflop/gen-1-fault eq 0 + /ECAM/warning-phase eq 1 + /ECAM/warning-phase eq 10 + + + + + + + /engines/engine[1]/state eq 3 + /systems/electrical/relay/gen-2-glc/contact-pos eq 0 + + + + + + + /controls/electrical/switches/gen-2 eq 1 + /controls/electrical/switches/idg-2-disc eq 1 + /ECAM/warnings/logic/gen-2-inop eq 1 + + + + + + + /ECAM/warnings/timer/gen-2-fault-set eq 1 + + + + + /systems/electrical/relay/gen-2-glc/contact-pos + 100 + 0.5 + + + + + + /ECAM/warning-phase eq 1 + /ECAM/warning-phase eq 10 + /systems/electrical/some-electric-thingie/emer-elec-config eq 1 + /ECAM/warnings/logic/glc-2-online-2-sec eq 1 + + + + + + + + /ECAM/warnings/flipflop/gen-2-fault eq 1 + + /ECAM/warnings/logic/gen-2-pulse eq 1 + /controls/electrical/switches/gen-2 eq 1 + + + + + + + + /ECAM/warnings/flipflop/gen-2-fault eq 0 + /ECAM/warning-phase eq 1 + /ECAM/warning-phase eq 10 + + + + + + + /systems/apu/available eq 1 + /systems/electrical/sources/apu/gcu-fault eq 1 + + + + + + + /controls/electrical/switches/apu eq 1 + /ECAM/warnings/logic/apu-gen-fault eq 1 + + + + + + + /ECAM/warning-phase eq 1 + + /systems/apu/available eq 1 + /controls/electrical/switches/apu eq 1 + /systems/electrical/sources/apu/gcu-fault eq 0 + + + + + + + + /ECAM/warnings/flipflop/apu-gen-fault eq 1 + + /ECAM/warnings/logic/apu-elec-gen-pulse eq 1 + /controls/electrical/switches/apu eq 1 + + + + + + + + /ECAM/warnings/flipflop/apu-gen-fault eq 0 + /ECAM/warning-phase eq 1 + /ECAM/warning-phase eq 10 + + + + diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml index e6545cf2..80d56c3b 100644 --- a/Systems/ecam-proprules.xml +++ b/Systems/ecam-proprules.xml @@ -558,6 +558,39 @@ /ECAM/warnings/logic/apu-bleed-sw-pulse + + monostable + + + /controls/electrical/switches/apu + + /ECAM/warnings/logic/apu-elec-gen-pulse + + + + monostable + + + /controls/electrical/switches/gen-1 + + /ECAM/warnings/logic/gen-1-pulse + + + + monostable + + + /controls/electrical/switches/gen-2 + + /ECAM/warnings/logic/gen-2-pulse + + monostable + + RS + + /ECAM/warnings/logic/gen-1-fault-set-output + + + /ECAM/warnings/logic/gen-1-fault-reset + + /ECAM/warnings/flipflop/gen-1-fault + + + + RS + + /ECAM/warnings/logic/gen-1-fault-on-off-set + + + /ECAM/warnings/logic/gen-1-fault-on-off-reset + + /ECAM/warnings/flipflop/gen-1-fault-on-off + + + + RS + + /ECAM/warnings/logic/gen-2-fault-set-output + + + /ECAM/warnings/logic/gen-2-fault-reset + + /ECAM/warnings/flipflop/gen-2-fault + + + + RS + + /ECAM/warnings/logic/gen-2-fault-on-off-set + + + /ECAM/warnings/logic/gen-2-fault-on-off-reset + + /ECAM/warnings/flipflop/gen-2-fault-on-off + + + + + RS + + /ECAM/warnings/timer/apu-gen-fault-set + + + /ECAM/warnings/timer/apu-gen-fault-reset + + /ECAM/warnings/flipflop/apu-gen-fault + + + + RS + + /ECAM/warnings/logic/apu-gen-fault-on-off-set + + + /ECAM/warnings/logic/apu-gen-fault-on-off-reset + + /ECAM/warnings/flipflop/apu-gen-fault-on-off +