From 868d69fbf3e217ea09554b98e43cd39ae72aa096 Mon Sep 17 00:00:00 2001 From: Inuyaksa Date: Thu, 29 Jul 2021 23:50:22 +0200 Subject: [PATCH 1/5] Better autoland with pulse #241 --- Sounds/A320-common-sound.xml | 16 +++++++++++ Systems/a320-fwc.xml | 52 +++++++++++++++++++++++++----------- Systems/pfd.xml | 11 ++++++++ 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index af9ce4c8..21e68190 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1009,6 +1009,22 @@ 40.0 + + + autolandwarning-single + once + Aircraft/A320-family/Sounds/Cockpit/calvary-charge-once.wav + + + /instrumentation/pfd/lights/autoland-alarm + 1 + + + + /sim/current-view/internal + 40.0 + + gear0 diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index b1f53ffa..1821e7e5 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -2302,25 +2302,31 @@ - - - - - /modes/pfd/ILS1 eq 1 - /instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected le 200 - - - /modes/pfd/ILS2 eq 1 - /instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected le 200 - - - - - - + + /systems/electrical/bus/ac-2 ge 110 + /systems/electrical/bus/ac-ess-shed ge 110 + + + + /modes/pfd/ILS1 eq 1 + /instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected lt 200 + + + /modes/pfd/ILS2 eq 1 + /instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected lt 200 + + + + + + + + /instrumentation/pfd/lights/autoland-armed eq 1 + + /it-autoflight/output/vert eq 2 /it-autoflight/output/ap1 eq 0 @@ -2335,6 +2341,20 @@ + + + + + /instrumentation/pfd/lights/autoland-alarm eq 1 + /instrumentation/pfd/lights/autoland-sw-pulse eq 1 + + + /it-autoflight/output/ap-warning eq 1 + /ECAM/warnings/master-warning-flash eq 1 + + + + diff --git a/Systems/pfd.xml b/Systems/pfd.xml index 733054dc..b7c90410 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -574,4 +574,15 @@ /instrumentation/iesi/pitch-deg + + monostable + + + /instrumentation/pfd/lights/autoland-armed + + /instrumentation/pfd/lights/autoland-sw-pulse + + From 1b6bb9fd9bed5a0ec85f70249a2b47a2f9e5973e Mon Sep 17 00:00:00 2001 From: Inuyaksa Date: Tue, 24 Aug 2021 22:16:30 +0200 Subject: [PATCH 2/5] conflict pfd from dev - restored autoland-sw-pulse --- Systems/pfd.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Systems/pfd.xml b/Systems/pfd.xml index a4741f0a..2e73b76c 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -676,5 +676,16 @@ 0 256 + + + monostable + + + /instrumentation/pfd/lights/autoland-armed + + /instrumentation/pfd/lights/autoland-sw-pulse + From 704fc63fe2ae0537539f35a438e7698a0427867d Mon Sep 17 00:00:00 2001 From: Inuyaksa Date: Thu, 26 Aug 2021 22:11:45 +0200 Subject: [PATCH 3/5] autoland pulse logic rewritten --- Models/FlightDeck/a320.flightdeck.xml | 14 ++++---------- Models/Instruments/PFD/PFD.nas | 22 ++++++++++++++++++++-- Sounds/A320-common-sound.xml | 2 +- Systems/a320-fwc.xml | 15 ++++++++------- Systems/pfd.xml | 11 ----------- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 6889804a..864c0048 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -6453,16 +6453,10 @@ controls/switches/annun-test 1 - - - instrumentation/pfd/lights/autoland-armed - 1 - - - instrumentation/pfd/lights/autoland-on - 1 - - + + instrumentation/pfd/lights/autoland-on + 1 + diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 956e118a..57b710d1 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -164,8 +164,8 @@ var amberFlash1 = props.globals.initNode("/instrumentation/pfd/flash-indicators/ var amberFlash2 = props.globals.initNode("/instrumentation/pfd/flash-indicators/amber-flash-2", 0, "BOOL"); var dhFlash = props.globals.initNode("/instrumentation/pfd/flash-indicators/dh-flash", 0, "BOOL"); -var light_autoland_armed = props.globals.initNode("/instrumentation/pfd/lights/autoland-armed", 0, "BOOL"); -var light_autoland_on = props.globals.initNode("/instrumentation/pfd/lights/autoland-on", 0, "BOOL"); +var autoland_alarm = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-alarm", 0, "BOOL"); +var autoland_pulse = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-sw-pulse", 0, "BOOL"); var canvas_PFD_base = { init: func(canvas_group, file) { @@ -2967,3 +2967,21 @@ var dhTimer = maketimer(0.50, func { dh_count = dh_count + 1; } }); + +var autolandTimer = maketimer(1.0, func { + if (autoland_pulse.getBoolValue()) { + autoland_pulse.setBoolValue(0); + } else { + autoland_pulse.setBoolValue(1); + } +}); + +setlistener(autoland_alarm, func(alarm) { + if (alarm.getBoolValue()) { + autoland_pulse.setBoolValue(1); + autolandTimer.start(); + } else { + autolandTimer.stop(); + autoland_pulse.setBoolValue(0); + } +}, 0, 0); diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index a51e3b6a..2cf14d65 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1016,7 +1016,7 @@ Aircraft/A320-family/Sounds/Cockpit/calvary-charge-once.wav - /instrumentation/pfd/lights/autoland-alarm + /instrumentation/pfd/logic/autoland/autoland-alarm 1 diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index 1821e7e5..6d444378 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -2301,7 +2301,7 @@ - + @@ -2321,12 +2321,12 @@ - + - /instrumentation/pfd/lights/autoland-armed eq 1 + /instrumentation/pfd/logic/autoland/autoland-armed eq 1 - /it-autoflight/output/vert eq 2 + /it-autoflight/output/vert eq 2 /it-autoflight/output/ap1 eq 0 @@ -2345,11 +2345,12 @@ - /instrumentation/pfd/lights/autoland-alarm eq 1 - /instrumentation/pfd/lights/autoland-sw-pulse eq 1 + /instrumentation/pfd/logic/autoland/autoland-alarm eq 1 + /instrumentation/pfd/logic/autoland/autoland-sw-pulse eq 1 - /it-autoflight/output/ap-warning eq 1 + /instrumentation/pfd/logic/autoland/autoland-alarm eq 1 + /it-autoflight/output/ap-warning ge 1 /ECAM/warnings/master-warning-flash eq 1 diff --git a/Systems/pfd.xml b/Systems/pfd.xml index 2e73b76c..a4741f0a 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -676,16 +676,5 @@ 0 256 - - - monostable - - - /instrumentation/pfd/lights/autoland-armed - - /instrumentation/pfd/lights/autoland-sw-pulse - From 87f101bd280930e55632b31f9f2a8216d7b0e60f Mon Sep 17 00:00:00 2001 From: Inuyaksa Date: Sun, 29 Aug 2021 22:37:50 +0200 Subject: [PATCH 4/5] autoland light on flare only #241 --- Models/Instruments/PFD/PFD.nas | 9 +++++++++ Systems/a320-fwc.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 57b710d1..d99de4ce 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -166,6 +166,7 @@ var dhFlash = props.globals.initNode("/instrumentation/pfd/flash-indicators/dh-f var autoland_alarm = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-alarm", 0, "BOOL"); var autoland_pulse = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-sw-pulse", 0, "BOOL"); +var autoland_flare_mode = props.globals.initNode("/instrumentation/pfd/logic/autoland/flare-mode", 0, "BOOL"); var canvas_PFD_base = { init: func(canvas_group, file) { @@ -2985,3 +2986,11 @@ setlistener(autoland_alarm, func(alarm) { autoland_pulse.setBoolValue(0); } }, 0, 0); + +setlistener(pitch_mode, func(pitch) { + if (pitch.getValue() == "FLARE") { + autoland_flare_mode.setBoolValue(1); + } else { + autoland_flare_mode.setBoolValue(0); + } +},0,0); diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index 6d444378..61c60118 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -2326,7 +2326,7 @@ /instrumentation/pfd/logic/autoland/autoland-armed eq 1 - /it-autoflight/output/vert eq 2 + /instrumentation/pfd/logic/autoland/flare-mode eq 1 /it-autoflight/output/ap1 eq 0 From d6f84d45709ad39beb44bbf0e9e221762dc09d46 Mon Sep 17 00:00:00 2001 From: Inuyaksa Date: Wed, 1 Sep 2021 23:31:08 +0200 Subject: [PATCH 5/5] Autoland light on pitch mode LAND and faster light pulse --- Models/Instruments/PFD/PFD.nas | 10 +++++----- Systems/a320-fwc.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index d99de4ce..31b3e4cd 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -166,7 +166,7 @@ var dhFlash = props.globals.initNode("/instrumentation/pfd/flash-indicators/dh-f var autoland_alarm = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-alarm", 0, "BOOL"); var autoland_pulse = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-sw-pulse", 0, "BOOL"); -var autoland_flare_mode = props.globals.initNode("/instrumentation/pfd/logic/autoland/flare-mode", 0, "BOOL"); +var autoland_pitch_land = props.globals.initNode("/instrumentation/pfd/logic/autoland/pitch-land", 0, "BOOL"); var canvas_PFD_base = { init: func(canvas_group, file) { @@ -2969,7 +2969,7 @@ var dhTimer = maketimer(0.50, func { } }); -var autolandTimer = maketimer(1.0, func { +var autolandTimer = maketimer(0.5, func { if (autoland_pulse.getBoolValue()) { autoland_pulse.setBoolValue(0); } else { @@ -2988,9 +2988,9 @@ setlistener(autoland_alarm, func(alarm) { }, 0, 0); setlistener(pitch_mode, func(pitch) { - if (pitch.getValue() == "FLARE") { - autoland_flare_mode.setBoolValue(1); + if (pitch.getValue() == "LAND") { + autoland_pitch_land.setBoolValue(1); } else { - autoland_flare_mode.setBoolValue(0); + autoland_pitch_land.setBoolValue(0); } },0,0); diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index 61c60118..3629040f 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -2326,7 +2326,7 @@ /instrumentation/pfd/logic/autoland/autoland-armed eq 1 - /instrumentation/pfd/logic/autoland/flare-mode eq 1 + /instrumentation/pfd/logic/autoland/pitch-land eq 1 /it-autoflight/output/ap1 eq 0