fly/A320-family
1
0
Fork 0
Code Activity

SFCC: use the ADR2 input; add conditioning on ADR2 status

Browse source
This commit is contained in:
Jonathan Redpath 2021-12-04 17:03:28 +00:00
parent 1f13e2d971
commit eff3640288
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/Instruments/Upper-ECAM/Upper-ECAM.nas
View file

@ -1008,7 +1008,7 @@ emesary.GlobalTransmitter.Register(A320EWD);
var input = { var input = {
fuelTotalLbs: "/consumables/fuel/total-fuel-lbs", fuelTotalLbs: "/consumables/fuel/total-fuel-lbs",
slatLocked: "/fdm/jsbsim/fcs/slat-locked", slatLocked: "/fdm/jsbsim/fcs/sfcc/slat-locked",
# N1 parameters # N1 parameters
N1_1: "/ECAM/Upper/N1[0]", N1_1: "/ECAM/Upper/N1[0]",

2
Nasal/Libraries/property-tree-setup.nas
View file

@ -110,7 +110,7 @@ var Fdm = {
brake: [props.globals.getNode("/fdm/jsbsim/fcs/left-brake-cmd-norm"),props.globals.getNode("/fdm/jsbsim/fcs/right-brake-cmd-norm")], brake: [props.globals.getNode("/fdm/jsbsim/fcs/left-brake-cmd-norm"),props.globals.getNode("/fdm/jsbsim/fcs/right-brake-cmd-norm")],
flapDeg: props.globals.getNode("/fdm/jsbsim/fcs/flap-pos-deg"), flapDeg: props.globals.getNode("/fdm/jsbsim/fcs/flap-pos-deg"),
slatDeg: props.globals.getNode("/fdm/jsbsim/fcs/slat-pos-deg"), slatDeg: props.globals.getNode("/fdm/jsbsim/fcs/slat-pos-deg"),
slatLocked: props.globals.getNode("/fdm/jsbsim/fcs/slat-locked"), slatLocked: props.globals.getNode("/fdm/jsbsim/fcs/sfcc/slat-locked"),
}, },
Fbw: { Fbw: {
aileron: props.globals.getNode("/fdm/jsbsim/fbw/aileron-sidestick"), aileron: props.globals.getNode("/fdm/jsbsim/fbw/aileron-sidestick"),

34
Systems/a320-fcs.xml
View file

@ -830,39 +830,49 @@
<channel name="Slats"> <channel name="Slats">
<switch name="fcs/slat-locked-cmd"> <switch name="fcs/sfcc/slat-locked-cmd">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
fcs/slat-locked-cmd eq 1 <test logic="OR">
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
fcs/sfcc/slat-locked-cmd eq 1
/systems/navigation/adr/operating-2 eq 1
<test logic="OR"> <test logic="OR">
/gear/gear[1]/wow ne 1 /gear/gear[1]/wow ne 1
/systems/navigation/adr/output/cas-1 ge 60 /systems/navigation/adr/output/cas-2 ge 60
</test> </test>
<test logic="OR"> <test logic="OR">
/systems/navigation/adr/output/aoa-1 gt 7.6 /systems/navigation/adr/output/aoa-2 gt 7.6
/systems/navigation/adr/output/cas-1 lt 154 /systems/navigation/adr/output/cas-2 lt 154
</test> </test>
</test> </test>
<test logic="AND" value="1"> <test logic="AND" value="1">
fcs/slat-locked-cmd eq 0 <test logic="OR">
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
fcs/sfcc/slat-locked-cmd eq 0
/controls/flight/flaps-input ne 0 /controls/flight/flaps-input ne 0
/systems/navigation/adr/operating-2 eq 1
<test logic="OR"> <test logic="OR">
/gear/gear[1]/wow ne 1 /gear/gear[1]/wow ne 1
/systems/navigation/adr/output/cas-1 ge 60 /systems/navigation/adr/output/cas-2 ge 60
</test> </test>
<test logic="OR"> <test logic="OR">
/systems/navigation/adr/output/aoa-1 gt 8.5 /systems/navigation/adr/output/aoa-2 gt 8.5
/systems/navigation/adr/output/cas-1 lt 148 /systems/navigation/adr/output/cas-2 lt 148
</test> </test>
</test> </test>
</switch> </switch>
<switch name="fcs/slat-locked"> <switch name="fcs/sfcc/slat-locked">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/controls/flight/flaps-input eq 0 /controls/flight/flaps-input eq 0
fcs/slat-pos-deg le 18.01 fcs/slat-pos-deg le 18.01
fcs/slat-locked-cmd eq 1 fcs/sfcc/slat-locked-cmd eq 1
</test> </test>
</switch> </switch>
@ -871,7 +881,7 @@
<test logic="AND" value="0.0"> <test logic="AND" value="0.0">
/controls/flight/flaps-input eq 0 /controls/flight/flaps-input eq 0
fcs/slat-pos-deg le 18.01 fcs/slat-pos-deg le 18.01
fcs/slat-locked eq 1 fcs/sfcc/slat-locked eq 1
</test> </test>
<test value="100"> <test value="100">
/systems/acconfig/autoconfig-running eq 1 /systems/acconfig/autoconfig-running eq 1