diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 25469134..4259068d 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -453,6 +453,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 684c57f4..749236c4 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -453,6 +453,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index 111fc55b..73d540cd 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -453,6 +453,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> + diff --git a/A320-main.xml b/A320-main.xml index 113ff4cb..6d4263d5 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -114,37 +114,34 @@ - Aircraft/IDG-A32X/Systems/hydraulics.xml - - Aircraft/IDG-A32X/Systems/fbw-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-drivers.xml - + Aircraft/IDG-A32X/Systems/fmgc-roll-yaw.xml - + Aircraft/IDG-A32X/Systems/fmgc-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-thrust.xml - + Aircraft/IDG-A32X/Systems/libraries.xml - + Aircraft/IDG-A32X/Systems/upper-ecam.xml - + Aircraft/IDG-A32X/Systems/lower-ecam.xml + + Aircraft/IDG-A32X/Systems/pfd.xml + - Aircraft/IDG-A32X/Systems/pfd.xml - - Aircraft/IDG-A32X/Systems/zoom-views.xml @@ -321,11 +318,11 @@ - - - - - + + + + + @@ -540,31 +537,12 @@ 0 0 - 0.5 - -0.5 0 - 0.1 - 0.1 0.0 0 0 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 0 - 0 - 0 0 @@ -1372,32 +1350,37 @@ Ctrl-b Cycle speedbrake setting - - property-assign - controls/flight/speedbrake-arm - 0 - - - - /gear/gear[1]/wow + + + /controls/flight/speedbrake-arm 1 - - - /gear/gear[2]/wow - 1 - - + + + + /gear/gear[1]/wow + 1 + + + /gear/gear[2]/wow + 1 + + + property-cycle - controls/flight/speedbrake-lever - 0 - 1 + controls/flight/speedbrake + 0.0 + 1.0 + + /controls/flight/speedbrake-arm + 1 + /gear/gear[1]/wow 0 @@ -1409,10 +1392,15 @@ property-cycle - controls/flight/speedbrake-lever - 0 + controls/flight/speedbrake + 0.0 0.5 - 1 + 1.0 + + + property-assign + controls/flight/speedbrake-arm + 0 diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 06583b4d..090a3a24 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -453,6 +453,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> + diff --git a/A320neo-PW.xml b/A320neo-PW.xml index cb7fcf25..386850a3 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -453,6 +453,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 85c34687..bb7be90e 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -207,6 +207,7 @@ var colddark = func { setprop("/controls/flight/flap-txt", " "); libraries.flaptimer.stop(); setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); setprop("/controls/gear/gear-down", 1); setprop("/controls/flight/elevator-trim", 0); libraries.systemsInit(); @@ -255,6 +256,7 @@ var beforestart = func { setprop("/controls/flight/flap-txt", " "); libraries.flaptimer.stop(); setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); setprop("/controls/gear/gear-down", 1); setprop("/controls/flight/elevator-trim", 0); libraries.systemsInit(); @@ -329,6 +331,7 @@ var taxi = func { setprop("/controls/flight/flap-txt", " "); libraries.flaptimer.stop(); setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); setprop("/controls/gear/gear-down", 1); setprop("/controls/flight/elevator-trim", 0); libraries.systemsInit(); diff --git a/AircraftConfig/fbw.xml b/AircraftConfig/fbw.xml index 238d3d28..167de43e 100644 --- a/AircraftConfig/fbw.xml +++ b/AircraftConfig/fbw.xml @@ -129,13 +129,34 @@ vbox - + + + + - 150 - /fdm/jsbsim/hydraulics/roll-control - -1 - 1 - 0.0001 + 150 + true + /fdm/jsbsim/hydraulics/aileron-l/final-deg + -25 + 25 + 0.0025 + true + + + + + vbox + + + + + + 150 + true + /fdm/jsbsim/hydraulics/aileron-r/final-deg + -25 + 25 + 0.0025 true @@ -162,17 +183,15 @@ vbox - + - 2 - 0 150 true - /fdm/jsbsim/hydraulics/pitch-control - -1 - 1 - 0.0001 + /fdm/jsbsim/hydraulics/elevator-l/final-deg + -30 + 17 + 0.003 true @@ -181,17 +200,32 @@ vbox - + - 2 - 0 150 true - /controls/flight/elevator-trim-fdm - -1 - 1 - 0.0001 + /fdm/jsbsim/hydraulics/elevator-trim/final-deg + -12.5 + 4 + 0.00125 + true + + + + + vbox + + + + + + 150 + true + /fdm/jsbsim/hydraulics/elevator-r/final-deg + -30 + 17 + 0.003 true @@ -204,7 +238,7 @@ true - + true @@ -219,10 +253,10 @@ 150 - /controls/flight/rudder-fdm - -1 - 1 - 0.0001 + /fdm/jsbsim/hydraulics/rudder/final-deg + -25 + 25 + 0.0025 true diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 07cd56f8..9dd871b2 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -508,7 +508,7 @@ xy-plane number-value %2.1f - fdm/jsbsim/fcs/rudder-trim-cmd-deg + fdm/jsbsim/hydraulics/rudder/trim-cmd-deg false led.txf true @@ -4772,7 +4772,7 @@ rotate trim_2_lts - fdm/jsbsim/fcs/pitch-trim-cmd-deg + fdm/jsbsim/hydraulics/elevator-trim/cmd-deg -15.55 -0.9
@@ -4876,7 +4876,7 @@ false property-assign - controls/flight/speedbrake-lever + controls/flight/speedbrake 0 @@ -4892,14 +4892,14 @@ nasal @@ -4935,7 +4935,7 @@ rotate SpdBrk - controls/flight/speedbrake-lever + controls/flight/speedbrake 45 diff --git a/Models/Fuselages/A320-100/hstab.xml b/Models/Fuselages/A320-100/hstab.xml index 349f83a0..6f5e48ff 100644 --- a/Models/Fuselages/A320-100/hstab.xml +++ b/Models/Fuselages/A320-100/hstab.xml @@ -16,11 +16,7 @@ rotate ElevatorL sim/multiplay/generic/float[4] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 4.8217428 -6.225 @@ -35,11 +31,7 @@ rotate ElevatorR sim/multiplay/generic/float[5] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 2.9796817 0.96224 diff --git a/Models/Fuselages/A320-100/vstab.xml b/Models/Fuselages/A320-100/vstab.xml index df1d52c6..90cc9ff6 100644 --- a/Models/Fuselages/A320-100/vstab.xml +++ b/Models/Fuselages/A320-100/vstab.xml @@ -22,7 +22,7 @@ rotate Rudder sim/multiplay/generic/float[8] - 25 + 1 4.013 0 diff --git a/Models/Fuselages/A320/hstab.xml b/Models/Fuselages/A320/hstab.xml index 349f83a0..6f5e48ff 100644 --- a/Models/Fuselages/A320/hstab.xml +++ b/Models/Fuselages/A320/hstab.xml @@ -16,11 +16,7 @@ rotate ElevatorL sim/multiplay/generic/float[4] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 4.8217428 -6.225 @@ -35,11 +31,7 @@ rotate ElevatorR sim/multiplay/generic/float[5] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 2.9796817 0.96224 diff --git a/Models/Fuselages/A320/vstab.xml b/Models/Fuselages/A320/vstab.xml index df1d52c6..90cc9ff6 100644 --- a/Models/Fuselages/A320/vstab.xml +++ b/Models/Fuselages/A320/vstab.xml @@ -22,7 +22,7 @@ rotate Rudder sim/multiplay/generic/float[8] - 25 + 1 4.013 0 diff --git a/Models/Fuselages/A320neo/hstab.xml b/Models/Fuselages/A320neo/hstab.xml index 349f83a0..6f5e48ff 100644 --- a/Models/Fuselages/A320neo/hstab.xml +++ b/Models/Fuselages/A320neo/hstab.xml @@ -16,11 +16,7 @@ rotate ElevatorL sim/multiplay/generic/float[4] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 4.8217428 -6.225 @@ -35,11 +31,7 @@ rotate ElevatorR sim/multiplay/generic/float[5] - - -0.5-30.0 - 0.00.0 - 0.517.0 - + 1 2.9796817 0.96224 diff --git a/Models/Fuselages/A320neo/vstab.xml b/Models/Fuselages/A320neo/vstab.xml index df1d52c6..90cc9ff6 100644 --- a/Models/Fuselages/A320neo/vstab.xml +++ b/Models/Fuselages/A320neo/vstab.xml @@ -22,7 +22,7 @@ rotate Rudder sim/multiplay/generic/float[8] - 25 + 1 4.013 0 diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 467129eb..1430422d 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -50,7 +50,7 @@ setprop("/ECAM/Lower/aileron-ind-right", 0); setprop("/ECAM/Lower/elevator-ind-left", 0); setprop("/ECAM/Lower/elevator-ind-right", 0); setprop("/ECAM/Lower/elevator-trim-deg", 0); -setprop("/controls/flight/rudder-fdm", 0); +setprop("/fdm/jsbsim/hydraulics/rudder/final-deg", 0); setprop("/environment/temperature-degc", 0); setprop("/FMGC/internal/gw", 0); setprop("/controls/flight/spoiler-l1-failed", 0); @@ -526,8 +526,8 @@ var canvas_lowerECAM_fctl = { } # Ailerons - me["ailL"].setTranslation(0,getprop("/ECAM/Lower/aileron-ind-left")*100); - me["ailR"].setTranslation(0,getprop("/ECAM/Lower/aileron-ind-right")*(-100)); + me["ailL"].setTranslation(0, getprop("/ECAM/Lower/aileron-ind-left") * 100); + me["ailR"].setTranslation(0, getprop("/ECAM/Lower/aileron-ind-right") * (-100)); if (blue_psi < 1500 and green_psi < 1500) { me["ailL"].setColor(0.7333,0.3803,0); @@ -538,8 +538,8 @@ var canvas_lowerECAM_fctl = { } # Elevators - me["elevL"].setTranslation(0,getprop("/ECAM/Lower/elevator-ind-left")*100); - me["elevR"].setTranslation(0,getprop("/ECAM/Lower/elevator-ind-right")*100); + me["elevL"].setTranslation(0, getprop("/ECAM/Lower/elevator-ind-left") * 100); + me["elevR"].setTranslation(0, getprop("/ECAM/Lower/elevator-ind-right") * 100); if (blue_psi < 1500 and green_psi < 1500) { me["elevL"].setColor(0.7333,0.3803,0); @@ -554,7 +554,7 @@ var canvas_lowerECAM_fctl = { } # Rudder - me["rudder"].setRotation(getprop("/controls/flight/rudder-fdm")*(-0.6)); + me["rudder"].setRotation(getprop("/fdm/jsbsim/hydraulics/rudder/final-deg") * -0.024); if (blue_psi < 1500 and yellow_psi < 1500 and green_psi < 1500) { me["rudder"].setColor(0.7333,0.3803,0); @@ -563,7 +563,7 @@ var canvas_lowerECAM_fctl = { } # Spoilers - if (getprop("/controls/flight/spoiler-l1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l1/final-deg") < 1.5) { me["spoiler1Lex"].hide(); me["spoiler1Lrt"].show(); } else { @@ -571,7 +571,7 @@ var canvas_lowerECAM_fctl = { me["spoiler1Lex"].show(); } - if (getprop("/controls/flight/spoiler-l2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l2/final-deg") < 1.5) { me["spoiler2Lex"].hide(); me["spoiler2Lrt"].show(); } else { @@ -579,7 +579,7 @@ var canvas_lowerECAM_fctl = { me["spoiler2Lex"].show(); } - if (getprop("/controls/flight/spoiler-l3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l3/final-deg") < 1.5) { me["spoiler3Lex"].hide(); me["spoiler3Lrt"].show(); } else { @@ -587,7 +587,7 @@ var canvas_lowerECAM_fctl = { me["spoiler3Lex"].show(); } - if (getprop("/controls/flight/spoiler-l4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l4/final-deg") < 1.5) { me["spoiler4Lex"].hide(); me["spoiler4Lrt"].show(); } else { @@ -595,7 +595,7 @@ var canvas_lowerECAM_fctl = { me["spoiler4Lex"].show(); } - if (getprop("/controls/flight/spoiler-l5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l5/final-deg") < 1.5) { me["spoiler5Lex"].hide(); me["spoiler5Lrt"].show(); } else { @@ -603,7 +603,7 @@ var canvas_lowerECAM_fctl = { me["spoiler5Lex"].show(); } - if (getprop("/controls/flight/spoiler-r1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r1/final-deg") < 1.5) { me["spoiler1Rex"].hide(); me["spoiler1Rrt"].show(); } else { @@ -611,7 +611,7 @@ var canvas_lowerECAM_fctl = { me["spoiler1Rex"].show(); } - if (getprop("/controls/flight/spoiler-r2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r2/final-deg") < 1.5) { me["spoiler2Rex"].hide(); me["spoiler2Rrt"].show(); } else { @@ -619,7 +619,7 @@ var canvas_lowerECAM_fctl = { me["spoiler2Rex"].show(); } - if (getprop("/controls/flight/spoiler-r3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r3/final-deg") < 1.5) { me["spoiler3Rex"].hide(); me["spoiler3Rrt"].show(); } else { @@ -627,7 +627,7 @@ var canvas_lowerECAM_fctl = { me["spoiler3Rex"].show(); } - if (getprop("/controls/flight/spoiler-r4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r4/final-deg") < 1.5) { me["spoiler4Rex"].hide(); me["spoiler4Rrt"].show(); } else { @@ -635,7 +635,7 @@ var canvas_lowerECAM_fctl = { me["spoiler4Rex"].show(); } - if (getprop("/controls/flight/spoiler-r5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r5/final-deg") < 1.5) { me["spoiler5Rex"].hide(); me["spoiler5Rrt"].show(); } else { diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml index 42999621..1af82cd5 100644 --- a/Models/Wings/a320.wings.cfm.xml +++ b/Models/Wings/a320.wings.cfm.xml @@ -36,7 +36,7 @@ rotate AileronL sim/multiplay/generic/float[6] - 50 + 1 8.7295 -16.3231163 @@ -51,7 +51,7 @@ rotate AileronR sim/multiplay/generic/float[7] - -50 + 1 7.6792 13.3967144 @@ -315,11 +315,8 @@ Left spoiler 1 rotate SpoilerL1 - controls/flight/spoiler-l1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l1/final-deg + 1 4.879 -4.455 @@ -333,11 +330,8 @@ Left spoiler 2 rotate SpoilerL2 - controls/flight/spoiler-l2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l2/final-deg + 1 5.084 -6.905 @@ -351,11 +345,8 @@ Left spoiler 3 rotate SpoilerL3 - controls/flight/spoiler-l3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l3/final-deg + 1 5.685 -8.581 @@ -369,11 +360,8 @@ Left spoiler 4 rotate SpoilerL4 - controls/flight/spoiler-l4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l4/final-deg + 1 6.253 -10.164 @@ -387,11 +375,8 @@ Left spoiler 5 rotate SpoilerL5 - controls/flight/spoiler-l5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l5/final-deg + 1 6.776 -11.622 @@ -405,11 +390,8 @@ Right spoiler 1 rotate SpoilerR1 - controls/flight/spoiler-r1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r1/final-deg + 1 4.879 6.201 @@ -423,11 +405,8 @@ Right spoiler 2 rotate SpoilerR2 - controls/flight/spoiler-r2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r2/final-deg + 1 5.678 8.563 @@ -441,11 +420,8 @@ Right spoiler 3 rotate SpoilerR3 - controls/flight/spoiler-r3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r3/final-deg + 1 6.246 10.145 @@ -459,11 +435,8 @@ Right spoiler 4 rotate SpoilerR4 - controls/flight/spoiler-r4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r4/final-deg + 1 6.769 11.603 @@ -477,11 +450,8 @@ Right spoiler 5 rotate SpoilerR5 - controls/flight/spoiler-r5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r5/final-deg + 1 7.292 13.06 @@ -491,7 +461,7 @@ 0.949 - + SlatsL translate SlatR1 diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml index 0244408d..9fd1fa5f 100644 --- a/Models/Wings/a320.wings.iae.xml +++ b/Models/Wings/a320.wings.iae.xml @@ -36,7 +36,7 @@ rotate AileronL sim/multiplay/generic/float[6] - 50 + 1 8.7295 -16.3231163 @@ -51,7 +51,7 @@ rotate AileronR sim/multiplay/generic/float[7] - -50 + 1 7.6792 13.3967144 @@ -315,11 +315,8 @@ Left spoiler 1 rotate SpoilerL1 - controls/flight/spoiler-l1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l1/final-deg + 1 4.879 -4.455 @@ -333,11 +330,8 @@ Left spoiler 2 rotate SpoilerL2 - controls/flight/spoiler-l2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l2/final-deg + 1 5.084 -6.905 @@ -351,11 +345,8 @@ Left spoiler 3 rotate SpoilerL3 - controls/flight/spoiler-l3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l3/final-deg + 1 5.685 -8.581 @@ -369,11 +360,8 @@ Left spoiler 4 rotate SpoilerL4 - controls/flight/spoiler-l4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l4/final-deg + 1 6.253 -10.164 @@ -387,11 +375,8 @@ Left spoiler 5 rotate SpoilerL5 - controls/flight/spoiler-l5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l5/final-deg + 1 6.776 -11.622 @@ -405,11 +390,8 @@ Right spoiler 1 rotate SpoilerR1 - controls/flight/spoiler-r1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r1/final-deg + 1 4.879 6.201 @@ -423,11 +405,8 @@ Right spoiler 2 rotate SpoilerR2 - controls/flight/spoiler-r2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r2/final-deg + 1 5.678 8.563 @@ -441,11 +420,8 @@ Right spoiler 3 rotate SpoilerR3 - controls/flight/spoiler-r3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r3/final-deg + 1 6.246 10.145 @@ -459,11 +435,8 @@ Right spoiler 4 rotate SpoilerR4 - controls/flight/spoiler-r4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r4/final-deg + 1 6.769 11.603 @@ -477,11 +450,8 @@ Right spoiler 5 rotate SpoilerR5 - controls/flight/spoiler-r5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r5/final-deg + 1 7.292 13.06 @@ -491,7 +461,7 @@ 0.949 - + SlatsL translate SlatR1 diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml index b4f4bafe..8206e680 100644 --- a/Models/Wings/a320.wings.neocfm.xml +++ b/Models/Wings/a320.wings.neocfm.xml @@ -36,7 +36,7 @@ rotate AileronL sim/multiplay/generic/float[6] - 50 + 1 8.7295 -16.3231163 @@ -51,7 +51,7 @@ rotate AileronR sim/multiplay/generic/float[7] - -50 + 1 7.6792 13.3967144 @@ -315,11 +315,8 @@ Left spoiler 1 rotate SpoilerL1 - controls/flight/spoiler-l1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l1/final-deg + 1 4.879 -4.455 @@ -333,11 +330,8 @@ Left spoiler 2 rotate SpoilerL2 - controls/flight/spoiler-l2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l2/final-deg + 1 5.084 -6.905 @@ -351,11 +345,8 @@ Left spoiler 3 rotate SpoilerL3 - controls/flight/spoiler-l3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l3/final-deg + 1 5.685 -8.581 @@ -369,11 +360,8 @@ Left spoiler 4 rotate SpoilerL4 - controls/flight/spoiler-l4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l4/final-deg + 1 6.253 -10.164 @@ -387,11 +375,8 @@ Left spoiler 5 rotate SpoilerL5 - controls/flight/spoiler-l5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l5/final-deg + 1 6.776 -11.622 @@ -405,11 +390,8 @@ Right spoiler 1 rotate SpoilerR1 - controls/flight/spoiler-r1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r1/final-deg + 1 4.879 6.201 @@ -423,11 +405,8 @@ Right spoiler 2 rotate SpoilerR2 - controls/flight/spoiler-r2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r2/final-deg + 1 5.678 8.563 @@ -441,11 +420,8 @@ Right spoiler 3 rotate SpoilerR3 - controls/flight/spoiler-r3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r3/final-deg + 1 6.246 10.145 @@ -459,11 +435,8 @@ Right spoiler 4 rotate SpoilerR4 - controls/flight/spoiler-r4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r4/final-deg + 1 6.769 11.603 @@ -477,11 +450,8 @@ Right spoiler 5 rotate SpoilerR5 - controls/flight/spoiler-r5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r5/final-deg + 1 7.292 13.06 @@ -491,7 +461,7 @@ 0.949 - + SlatsL translate SlatR1 diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml index 62bb4cc8..0b774fc3 100644 --- a/Models/Wings/a320.wings.neopw.xml +++ b/Models/Wings/a320.wings.neopw.xml @@ -36,7 +36,7 @@ rotate AileronL sim/multiplay/generic/float[6] - 50 + 1 8.7295 -16.3231163 @@ -51,7 +51,7 @@ rotate AileronR sim/multiplay/generic/float[7] - -50 + 1 7.6792 13.3967144 @@ -315,11 +315,8 @@ Left spoiler 1 rotate SpoilerL1 - controls/flight/spoiler-l1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l1/final-deg + 1 4.879 -4.455 @@ -333,11 +330,8 @@ Left spoiler 2 rotate SpoilerL2 - controls/flight/spoiler-l2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l2/final-deg + 1 5.084 -6.905 @@ -351,11 +345,8 @@ Left spoiler 3 rotate SpoilerL3 - controls/flight/spoiler-l3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l3/final-deg + 1 5.685 -8.581 @@ -369,11 +360,8 @@ Left spoiler 4 rotate SpoilerL4 - controls/flight/spoiler-l4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l4/final-deg + 1 6.253 -10.164 @@ -387,11 +375,8 @@ Left spoiler 5 rotate SpoilerL5 - controls/flight/spoiler-l5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-l5/final-deg + 1 6.776 -11.622 @@ -405,11 +390,8 @@ Right spoiler 1 rotate SpoilerR1 - controls/flight/spoiler-r1 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r1/final-deg + 1 4.879 6.201 @@ -423,11 +405,8 @@ Right spoiler 2 rotate SpoilerR2 - controls/flight/spoiler-r2 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r2/final-deg + 1 5.678 8.563 @@ -441,11 +420,8 @@ Right spoiler 3 rotate SpoilerR3 - controls/flight/spoiler-r3 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r3/final-deg + 1 6.246 10.145 @@ -459,11 +435,8 @@ Right spoiler 4 rotate SpoilerR4 - controls/flight/spoiler-r4 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r4/final-deg + 1 6.769 11.603 @@ -477,11 +450,8 @@ Right spoiler 5 rotate SpoilerR5 - controls/flight/spoiler-r5 - - 0.0 0 - 1.035 - + fdm/jsbsim/hydraulics/spoiler-r5/final-deg + 1 7.292 13.06 @@ -491,7 +461,7 @@ 0.949 - + SlatsL translate SlatR1 diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index d6314e6c..c90bc28e 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -61,13 +61,23 @@ - - Lift due to pitch control deflection + + Lift due to left elevator deflection aero/qbar-psf metrics/Sw-sqft - fcs/pitch-pos-geared - 0.2395 + hydraulics/elevator-l/final-deg-aero + 0.11975 + + + + + Lift due to right elevator deflection + + aero/qbar-psf + metrics/Sw-sqft + hydraulics/elevator-r/final-deg-aero + 0.11975 @@ -76,7 +86,7 @@ aero/qbar-psf metrics/Sw-sqft - fcs/pitch-trim-pos-geared + hydraulics/elevator-trim/final-deg-aero 0.0151 @@ -220,13 +230,23 @@ - - Drag due to pitch control deflection + + Drag due to left elevator deflection aero/qbar-psf metrics/Sw-sqft - fcs/pitch-pos-geared - 0.02 + hydraulics/elevator-l/final-deg-aero + 0.01 + + + + + Drag due to right elevator deflection + + aero/qbar-psf + metrics/Sw-sqft + hydraulics/elevator-r/final-deg-aero + 0.01 @@ -235,7 +255,7 @@ aero/qbar-psf metrics/Sw-sqft - fcs/pitch-trim-pos-geared + hydraulics/elevator-trim/final-deg-aero 0.02 @@ -270,13 +290,60 @@ - - Drag due to speedbrake + + Drag due to left aileron aero/qbar-psf metrics/Sw-sqft - fcs/speedbrake-pos-norm - 0.0275 + hydraulics/aileron-l/final-deg + 0.00811826141696 + + + + + Drag due to left spoiler + + aero/qbar-psf + metrics/Sw-sqft + fcs/spoiler-left-deg + 0.025369566928 + + + + + Drag due to right spoiler + + aero/qbar-psf + metrics/Sw-sqft + fcs/spoiler-right-deg + 0.025369566928 + + + + + Drag due to right aileron + + aero/qbar-psf + metrics/Sw-sqft + hydraulics/aileron-r/final-deg + 0.00811826141696 + + + + + Drag_due_to_ice_on_wing + + aero/qbar-psf + metrics/Sw-sqft + + ice/wing + + 0.0 0.000 + 0.5 0.004 + 1.0 0.010 + 2.0 0.100 + +
@@ -333,23 +400,6 @@ 0.2653 - - - Drag_due_to_ice_on_wing - - aero/qbar-psf - metrics/Sw-sqft - - ice/wing - - 0.0 0.000 - 0.5 0.004 - 1.0 0.010 - 2.0 0.100 - -
- - @@ -390,14 +440,47 @@ - - Roll moment due to roll control + + Roll moment due to left aileron aero/qbar-psf metrics/Sw-sqft metrics/bw-ft - fcs/roll-pos-rad - 0.11 + hydraulics/aileron-l/final-deg + 0.044 + + + + + Roll moment due to right aileron + + aero/qbar-psf + metrics/Sw-sqft + metrics/bw-ft + hydraulics/aileron-r/final-deg + -0.044 + + + + + Roll moment due to left spoiler + + aero/qbar-psf + metrics/Sw-sqft + metrics/bw-ft + fcs/spoiler-left-deg + -0.033 + + + + + Roll moment due to right spoiler + + aero/qbar-psf + metrics/Sw-sqft + metrics/bw-ft + fcs/spoiler-right-deg + 0.033 @@ -427,24 +510,35 @@ - - Pitch moment due to pitch control + + Pitch moment due to left elevator aero/qbar-psf metrics/Sw-sqft metrics/cbarw-ft - fcs/pitch-pos-geared - -1.425 + hydraulics/elevator-l/final-deg-aero + -0.7125 - - Pitch moment due to pitch trim control + + Pitch moment due to right elevator aero/qbar-psf metrics/Sw-sqft metrics/cbarw-ft - fcs/pitch-trim-pos-geared + hydraulics/elevator-r/final-deg-aero + -0.7125 + + + + + Pitch moment due to elevator trim control + + aero/qbar-psf + metrics/Sw-sqft + metrics/cbarw-ft + hydraulics/elevator-trim/final-deg-aero -2.845 @@ -518,21 +612,10 @@ aero/qbar-psf metrics/Sw-sqft metrics/bw-ft - fcs/rudder-pos-rad + hydraulics/rudder/final-deg 0.053 - - - Adverse yaw - - aero/qbar-psf - metrics/Sw-sqft - metrics/bw-ft - fcs/roll-pos-rad - 0 - - diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index e14bbbd6..3241c0f5 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -13,6 +13,7 @@ fbw/pitch/g-pi fbw/pitch/pid fbw/yaw/tc-pid + fbw/spoiler-output fbw/roll/p-gain @@ -546,7 +547,6 @@ /it-fbw/law ne 3 /systems/failures/aileron-left eq 1 - /controls/flight/spoiler-left-fbw-cmd @@ -559,7 +559,6 @@ /it-fbw/law ne 3 /systems/failures/aileron-right eq 1 - /controls/flight/spoiler-right-fbw-cmd @@ -1179,11 +1178,6 @@ - - hydraulics/aileron-droop - -1.0 - - @@ -1195,19 +1189,24 @@
- - - - - - fbw/aileron-output - /controls/flight/aileron-trim - - -1 - 1 - - + + fbw/spoiler-output + 0.9 + 2.5 + + + + + + spoilers/anti-droop-cmd + + 0.5 0.0 + 1.0 1.0 + +
+ + @@ -1215,31 +1214,22 @@ - - - /controls/flight/speedbrake-norm - - hydraulics/roll-fbw-summer - -1 - - - -0.5 - + + -1 + fbw/aileron-output + - - hydraulics/roll-fbw-summer - 0.5 - + fbw/aileron-output /fdm/jsbsim/fcs/flap-pos-deg 1 0.00 - 5 0.13 + 5 0.26
@@ -1258,7 +1248,7 @@ hydraulics/aileron-l/pressure-switch-or eq 1 - /controls/flight/speedbrake-norm eq 1 + spoilers/anti-droop-final ne 0 /gear/gear[1]/wow eq 1 /gear/gear[2]/wow eq 1 /systems/failures/aileron-left eq 0 @@ -1268,16 +1258,23 @@ /systems/failures/aileron-left eq 0 - -0.5 - 0.5 + -1.0 + 1.0 hydraulics/aileron-l/switch 14.5 - /controls/flight/aileron-left + + + hydraulics/aileron-l/final + + -25 + 25 + + @@ -1287,10 +1284,10 @@ - /controls/flight/speedbrake-norm - hydraulics/roll-fbw-summer + 1 + fbw/aileron-output - 0.5 + -1.0 @@ -1299,14 +1296,14 @@ - hydraulics/roll-fbw-summer - 0.5 + fbw/aileron-output + -1.0 /fdm/jsbsim/fcs/flap-pos-deg 1 0.00 - 5 -0.13 + 5 0.26
@@ -1322,10 +1319,10 @@ - + hydraulics/aileron-r/pressure-switch-or eq 1 - /controls/flight/speedbrake-norm eq 1 + spoilers/anti-droop-final ne 0 /gear/gear[1]/wow eq 1 /gear/gear[2]/wow eq 1 /systems/failures/aileron-right eq 0 @@ -1335,57 +1332,21 @@ /systems/failures/aileron-right eq 0 - -0.5 - 0.5 + -1.0 + 1.0 hydraulics/aileron-r/switch 14.5 - /controls/flight/aileron-right - - - - - - - - - - - hydraulics/aileron-l/final - hydraulics/aileron-r/final - - 1.75 - - - - - /controls/flight/spoiler-l-sum - -1.0 - - /controls/flight/spoiler-r-sum - - 0.25 - - - 0.444444 - - - - -1.0 - 1.0 - - - - - hydraulics/roll-control + + hydraulics/aileron-r/final - -0.436332 - 0.436332 + -25 + 25 @@ -1407,11 +1368,6 @@ /velocities/groundspeed-kt lt 75 - - - hydraulics/elevator-output-switch - 0.5 - @@ -1427,13 +1383,13 @@ - + hydraulics/elevator-l/pressure-switch-or eq 1 /systems/failures/elevator-left eq 0 - -0.5 - 0.5 + -1.0 + 1.0 @@ -1442,6 +1398,14 @@ 14.5 /controls/flight/elevator-left + + + hydraulics/elevator-l/final + + -30 + 17 + + @@ -1457,13 +1421,13 @@ - + hydraulics/elevator-r/pressure-switch-or eq 1 /systems/failures/elevator-right eq 0 - -0.5 - 0.5 + -1.0 + 1.0 @@ -1472,50 +1436,20 @@ 14.5 /controls/flight/elevator-right - - - - - - - - hydraulics/elevator-l/final - hydraulics/elevator-r/final - - - - -1.0 - 1.0 - - - - - hydraulics/pitch-control + + hydraulics/elevator-r/final - -0.523599 - 0.296706 + -30 + 17 - - - fcs/pitch-pos-rad - - velocities/mach - atmosphere/density-altitude - - 0 43000 - 0.0 1.00 0.850 - 0.9 0.02 0.750 - -
- - + - + /controls/flight/elevator-trim -1.00 @@ -1527,20 +1461,13 @@ - + /controls/flight/elevator-trim-fdm - - -1.00 - 0.32 - - - -0.2181662 - 0.0698132 - - + 0.5 + - - /controls/flight/elevator-trim-fdm + + hydraulics/elevator-trim/lag -1.00 0.32 @@ -1550,9 +1477,13 @@ 4.0 + + + + - - fcs/pitch-trim-pos-rad + + hydraulics/elevator-l/final-deg velocities/machatmosphere/density-altitude @@ -1563,52 +1494,32 @@
- - - - - - /controls/engines/engine[0]/throttle-output - 0.95 - fcs/throttle-cmd-norm - fcs/throttle-pos-norm - + + hydraulics/elevator-r/final-deg + + velocities/mach + atmosphere/density-altitude + + 0 43000 + 0.0 1.00 0.850 + 0.9 0.02 0.750 + +
+ - - /controls/engines/engine[1]/throttle-output - 0.95 - fcs/throttle-cmd-norm[1] - fcs/throttle-pos-norm[1] - - - - /engines/engine[0]/n1 - 2.25 - /engines/engine[0]/n1-actual - /engines/engine[3]/n1 - - - - /engines/engine[1]/n1 - 2.25 - /engines/engine[1]/n1-actual - /engines/engine[4]/n1 - - - - /engines/engine[0]/n2 - 2.25 - /engines/engine[0]/n2-actual - /engines/engine[3]/n2 - - - - /engines/engine[1]/n2 - 2.25 - /engines/engine[1]/n2-actual - /engines/engine[4]/n2 - + + hydraulics/elevator-trim/final-deg + + velocities/mach + atmosphere/density-altitude + + 0 43000 + 0.0 1.00 0.850 + 0.9 0.02 0.750 + +
+ @@ -1693,7 +1604,7 @@ - + /controls/flight/rudder-trim -1.0 @@ -1737,21 +1648,61 @@ hydraulics/rudder/switch 13.5 - /controls/flight/rudder-fdm + + + hydraulics/rudder/final + + -25 + 25 + + - + - - hydraulics/rudder/final - - -0.436332 - 0.436332 - - fcs/rudder-pos-rad - + + /controls/engines/engine[0]/throttle-output + 0.95 + fcs/throttle-cmd-norm + fcs/throttle-pos-norm + + + + /controls/engines/engine[1]/throttle-output + 0.95 + fcs/throttle-cmd-norm[1] + fcs/throttle-pos-norm[1] + + + + /engines/engine[0]/n1 + 2.25 + /engines/engine[0]/n1-actual + /engines/engine[3]/n1 + + + + /engines/engine[1]/n1 + 2.25 + /engines/engine[1]/n1-actual + /engines/engine[4]/n1 + + + + /engines/engine[0]/n2 + 2.25 + /engines/engine[0]/n2-actual + /engines/engine[3]/n2 + + + + /engines/engine[1]/n2 + 2.25 + /engines/engine[1]/n2-actual + /engines/engine[4]/n2 + @@ -1838,16 +1789,6 @@ - - - - /controls/flight/speedbrake-output - 1.0 - fcs/speedbrake-pos-norm - - - - diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml new file mode 100644 index 00000000..de24e8de --- /dev/null +++ b/Systems/a320-spoiler.xml @@ -0,0 +1,924 @@ + + + + + + + + hydraulics/spoiler-l2/main-cmd-feedback + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + /controls/engines/engine[0]/reverser eq 1 + + + + + + + /controls/engines/engine[1]/reverser eq 1 + + + + + + + spoilers/throttle[0] ge 0.01 + spoilers/throttle[1] ge 0.01 + /controls/flight/speedbrake-arm ne 1 + + + spoilers/throttle[0] lt 0.01 + spoilers/throttle[1] lt 0.01 + /controls/flight/speedbrake-arm eq 1 + spoilers/main-gear-or eq 1 + /velocities/groundspeed-kt ge 72 + + + + + + + spoilers/main-gear-or eq 0 + fbw/fmgc/enabled eq 1 + + + + + + + /controls/flight/speedbrake + + 0.10 0.0 + 0.45 0.5 + 0.55 0.5 + 0.95 1.0 + +
+ + + + + spoilers/speedbrake-nul + spoilers/auto-speedbrake-cmd + + 0.0 + spoilers/max-spoiler + + fbw/spoiler-output + + + + + + + + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 0 + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-l1 eq 1 + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-l1 eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-l1/switch + 0.9 + + + + hydraulics/spoiler-l1/final + 16.3 + + + + hydraulics/spoiler-l1/final-lag + 40.0 + + + + + + + + + + spoilers/main-gear-and eq 1 + + + + + spoilers/main-cmd + hydraulics/spoiler-l2/main-cmd-rate + hydraulics/spoiler-l2/main-cmd-feedback + + + + + + + hydraulics/spoiler-l2/main-cmd + 0.5 + + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.4 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + fbw/roll/s-l + + -1.0 0.5 + 0.0 0.0 + +
+ + + + + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-l2 eq 1 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-l2 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-l2 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-l2 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-l2/switch + 0.9 + + + + hydraulics/spoiler-l2/final + 16.3 + + + + hydraulics/spoiler-l2/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + fbw/roll/s-l + + -1.0 0.5 + 0.0 0.0 + +
+ + + + + + + /systems/hydraulic/blue-psi ge 1500 + /systems/failures/spoiler-l3 eq 1 + + + /systems/hydraulic/blue-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-l3 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/blue-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-l3 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/blue-psi ge 1500 + /systems/failures/spoiler-l3 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-l3/switch + 0.9 + + + + hydraulics/spoiler-l3/final + 16.3 + + + + hydraulics/spoiler-l3/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + fbw/roll/s-l + + -1.0 0.5 + 0.0 0.0 + +
+ + + + + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-l4 eq 1 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-l4 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-l4 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-l4 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-l4/switch + 0.9 + + + + hydraulics/spoiler-l4/final + 16.3 + + + + hydraulics/spoiler-l4/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + 0.0 0.0 + 1.0 -0.5 + +
+ + + + + + + + fbw/roll/s-l + + -1.0 0.5 + 0.0 0.0 + +
+ + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-l5 eq 1 + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-l5 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-l5 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-l5/switch + 0.9 + + + + hydraulics/spoiler-l5/final + 16.3 + + + + hydraulics/spoiler-l5/final-lag + 40.0 + + + + + + + + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 0 + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-r1 eq 1 + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-r1 eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-r1/switch + 0.9 + + + + hydraulics/spoiler-r1/final + 16.3 + + + + hydraulics/spoiler-r1/final-lag + 40.0 + + + + + + + + + + spoilers/main-gear-and eq 1 + + + + + spoilers/main-cmd + hydraulics/spoiler-r2/main-cmd-rate + hydraulics/spoiler-r2/main-cmd-feedback + + + + + + + hydraulics/spoiler-r2/main-cmd + 0.5 + + + fbw/roll/s-l + + -1.0 -0.4 + 0.0 0.0 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + fbw/roll/s-l + + 0.0 0.0 + 1.0 0.5 + +
+ + + + + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-r2 eq 1 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-r2 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-r2 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-r2 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-r2/switch + 0.9 + + + + hydraulics/spoiler-r2/final + 16.3 + + + + hydraulics/spoiler-r2/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + fbw/roll/s-l + + 0.0 0.0 + 1.0 0.5 + +
+ + + + + + + /systems/hydraulic/blue-psi ge 1500 + /systems/failures/spoiler-r3 eq 1 + + + /systems/hydraulic/blue-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-r3 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/blue-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-r3 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/blue-psi ge 1500 + /systems/failures/spoiler-r3 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-r3/switch + 0.9 + + + + hydraulics/spoiler-r3/final + 16.3 + + + + hydraulics/spoiler-r3/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + fbw/roll/s-l + + 0.0 0.0 + 1.0 0.5 + +
+ + + + + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-r4 eq 1 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 0 + /systems/failures/spoiler-r4 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-r4 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/yellow-psi ge 1500 + /systems/failures/spoiler-r4 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-r4/switch + 0.9 + + + + hydraulics/spoiler-r4/final + 16.3 + + + + hydraulics/spoiler-r4/final-lag + 40.0 + + + + + + + + + + spoilers/main-cmd + + fbw/roll/s-l + + -1.0 -0.5 + 0.0 0.0 + +
+ + + + + + + + fbw/roll/s-l + + 0.0 0.0 + 1.0 0.5 + +
+ + + + + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-r5 eq 1 + + + /systems/hydraulic/green-psi ge 1500 + spoilers/main-gear-and eq 1 + /systems/failures/spoiler-r5 eq 0 + spoilers/main-cmd gt 0 + + + /systems/hydraulic/green-psi ge 1500 + /systems/failures/spoiler-r5 eq 0 + spoilers/main-cmd eq 0 + + + 0.0 + 1.0 + + + + + hydraulics/spoiler-r5/switch + 0.9 + + + + hydraulics/spoiler-r5/final + 16.3 + + + + hydraulics/spoiler-r5/final-lag + 40.0 + + + + + + + + hydraulics/spoiler-l1/final-deg + hydraulics/spoiler-l2/final-deg + hydraulics/spoiler-l3/final-deg + hydraulics/spoiler-l4/final-deg + hydraulics/spoiler-l5/final-deg + + + + + + fcs/spoiler-left-sum + 5 + + + + + + hydraulics/spoiler-r1/final-deg + hydraulics/spoiler-r2/final-deg + hydraulics/spoiler-r3/final-deg + hydraulics/spoiler-r4/final-deg + hydraulics/spoiler-r5/final-deg + + + + + + fcs/spoiler-right-sum + 5 + + + + + + + diff --git a/Systems/autopilot-dlg.xml b/Systems/autopilot-dlg.xml index c95bd24f..e7bb63e0 100644 --- a/Systems/autopilot-dlg.xml +++ b/Systems/autopilot-dlg.xml @@ -37,9 +37,17 @@ hbox +