1
0
Fork 0

Fix autoland alarm - trigger when AP switched off below 200ft

This commit is contained in:
Inuyaksa 2022-01-28 23:13:39 +01:00
parent 8da8981acf
commit c3ec55a21f
3 changed files with 12 additions and 6 deletions

View file

@ -43,6 +43,7 @@ var du6_offtime = props.globals.initNode("/instrumentation/du/du6-off-time", 0.0
var autoland_alarm = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-alarm", 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 autoland_pulse = props.globals.initNode("/instrumentation/pfd/logic/autoland/autoland-sw-pulse", 0, "BOOL");
var autoland_pitch_land = props.globals.initNode("/instrumentation/pfd/logic/autoland/pitch-land", 0, "BOOL"); var autoland_pitch_land = props.globals.initNode("/instrumentation/pfd/logic/autoland/pitch-land", 0, "BOOL");
var autoland_ap_disc_ft = props.globals.initNode("/instrumentation/pfd/logic/autoland/ap-disc-ft", 0, "INT");
var canvas_pfd = { var canvas_pfd = {
middleOffset: 0, middleOffset: 0,

View file

@ -507,6 +507,9 @@ var apOff = func(type, side) {
} elsif (side == 2) { } elsif (side == 2) {
fmgc.Input.ap2.setValue(0); fmgc.Input.ap2.setValue(0);
} }
var radarft = (side == 2) ? getprop("/instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected") : getprop("/instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected");
setprop("/instrumentation/pfd/logic/autoland/ap-disc-ft",radarft);
} }
# Autothrust Disconnection # Autothrust Disconnection

View file

@ -2499,6 +2499,7 @@
<switch name="/instrumentation/pfd/logic/autoland/autoland-armed"> <switch name="/instrumentation/pfd/logic/autoland/autoland-armed">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/instrumentation/pfd/logic/autoland/pitch-land eq 1
<test logic="OR"> <test logic="OR">
/systems/electrical/bus/ac-2 ge 110 /systems/electrical/bus/ac-2 ge 110
/systems/electrical/bus/ac-ess-shed ge 110 /systems/electrical/bus/ac-ess-shed ge 110
@ -2519,13 +2520,14 @@
<switch name="/instrumentation/pfd/logic/autoland/autoland-alarm"> <switch name="/instrumentation/pfd/logic/autoland/autoland-alarm">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/instrumentation/pfd/logic/autoland/autoland-armed eq 1 /instrumentation/pfd/logic/autoland/autoland-armed eq 1
/instrumentation/pfd/logic/autoland/pitch-land eq 1
<test logic="AND">
/it-autoflight/output/ap1 eq 0
/it-autoflight/output/ap2 eq 0
</test>
<test logic="OR"> <test logic="OR">
<test logic="AND">
/it-autoflight/output/ap1 eq 0
/it-autoflight/output/ap2 eq 0
/instrumentation/pfd/logic/autoland/ap-disc-ft lt 200
/instrumentation/pfd/logic/autoland/ap-disc-ft gt 0
</test>
/instrumentation/radar-altimeter-difference-ft gt 15 /instrumentation/radar-altimeter-difference-ft gt 15
<test logic="AND"> <test logic="AND">
<test logic="OR"> <test logic="OR">