diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 2c361fe0..5f91c862 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -1008,7 +1008,7 @@ emesary.GlobalTransmitter.Register(A320EWD); var input = { fuelTotalLbs: "/consumables/fuel/total-fuel-lbs", - slatLocked: "/fdm/jsbsim/fcs/slat-locked", + slatLocked: "/fdm/jsbsim/fcs/sfcc/slat-locked", # N1 parameters N1_1: "/ECAM/Upper/N1[0]", diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index 406bcf12..833fb4da 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -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")], flapDeg: props.globals.getNode("/fdm/jsbsim/fcs/flap-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: { aileron: props.globals.getNode("/fdm/jsbsim/fbw/aileron-sidestick"), diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 0b85affc..a36b959b 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -830,39 +830,49 @@ - + - fcs/slat-locked-cmd eq 1 + + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 1 + + fcs/sfcc/slat-locked-cmd eq 1 + /systems/navigation/adr/operating-2 eq 1 /gear/gear[1]/wow ne 1 - /systems/navigation/adr/output/cas-1 ge 60 + /systems/navigation/adr/output/cas-2 ge 60 - /systems/navigation/adr/output/aoa-1 gt 7.6 - /systems/navigation/adr/output/cas-1 lt 154 + /systems/navigation/adr/output/aoa-2 gt 7.6 + /systems/navigation/adr/output/cas-2 lt 154 - fcs/slat-locked-cmd eq 0 + + fcs/sfcc/unit1-avail eq 1 + fcs/sfcc/unit2-avail eq 1 + + fcs/sfcc/slat-locked-cmd eq 0 /controls/flight/flaps-input ne 0 + /systems/navigation/adr/operating-2 eq 1 /gear/gear[1]/wow ne 1 - /systems/navigation/adr/output/cas-1 ge 60 + /systems/navigation/adr/output/cas-2 ge 60 - /systems/navigation/adr/output/aoa-1 gt 8.5 - /systems/navigation/adr/output/cas-1 lt 148 + /systems/navigation/adr/output/aoa-2 gt 8.5 + /systems/navigation/adr/output/cas-2 lt 148 - + /controls/flight/flaps-input eq 0 fcs/slat-pos-deg le 18.01 - fcs/slat-locked-cmd eq 1 + fcs/sfcc/slat-locked-cmd eq 1 @@ -871,7 +881,7 @@ /controls/flight/flaps-input eq 0 fcs/slat-pos-deg le 18.01 - fcs/slat-locked eq 1 + fcs/sfcc/slat-locked eq 1 /systems/acconfig/autoconfig-running eq 1