This commit is contained in:
omega13a 2017-06-10 17:00:13 -07:00
commit 39f5190008
20 changed files with 1557 additions and 548 deletions

View file

@ -4,7 +4,7 @@
<sim>
<author>Joshua Davidson (it0uchpods), Jonathan Redpath (legoboyvdlp)</author>
<author>Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)</author>
<status>Pre V1.0</status>
@ -189,8 +189,6 @@
<float n="6" alias="/controls/flight/aileron-left" />
<float n="7" alias="/controls/flight/aileron-right" />
<float n="8" alias="/controls/flight/rudder-fdm" />
<float n="9" alias="/controls/flight/spoiler-left" />
<float n="10" alias="/controls/flight/spoiler-right" />
<float n="11" alias="/fdm/jsbsim/fcs/slat-pos-norm" />
<int n="2" alias="/controls/lighting/landing-lights[0]" />
<int n="3" alias="/controls/lighting/landing-lights[1]" />
@ -434,9 +432,19 @@
<elevator-left>0.1</elevator-left>
<elevator-right>0.1</elevator-right>
<elevator-sum>0.2</elevator-sum>
<spoiler-left>0.0</spoiler-left>
<spoiler-output>0.0</spoiler-output>
<spoiler-right>0.0</spoiler-right>
<spoiler-l1>0.0</spoiler-l1>
<spoiler-l2>0.0</spoiler-l2>
<spoiler-l3>0.0</spoiler-l3>
<spoiler-l4>0.0</spoiler-l4>
<spoiler-l5>0.0</spoiler-l5>
<spoiler-l-sum>0.0</spoiler-l-sum>
<spoiler-r1>0.0</spoiler-r1>
<spoiler-r2>0.0</spoiler-r2>
<spoiler-r3>0.0</spoiler-r3>
<spoiler-r4>0.0</spoiler-r4>
<spoiler-r5>0.0</spoiler-r5>
<spoiler-r-sum>0.0</spoiler-r-sum>
<speedbrake-output>0.0</speedbrake-output>
<speedbrake-arm>0</speedbrake-arm>
<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
<speedbrake-lever type="double">0</speedbrake-lever>
@ -697,6 +705,36 @@
<value>0</value>
</binding>
<binding>
<condition>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
</condition>
<command>property-cycle</command>
<property>controls/flight/speedbrake-lever</property>
<value>0</value>
<value>1</value>
</binding>
<binding>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-cycle</command>
<property>controls/flight/speedbrake-lever</property>
<value>0</value>

View file

@ -31,6 +31,16 @@ var failReset = func {
setprop("/systems/failures/elevator-left", 0);
setprop("/systems/failures/elevator-right", 0);
setprop("/systems/failures/rudder", 0);
setprop("/systems/failures/spoiler-l1", 0);
setprop("/systems/failures/spoiler-l2", 0);
setprop("/systems/failures/spoiler-l3", 0);
setprop("/systems/failures/spoiler-l4", 0);
setprop("/systems/failures/spoiler-l5", 0);
setprop("/systems/failures/spoiler-r1", 0);
setprop("/systems/failures/spoiler-r2", 0);
setprop("/systems/failures/spoiler-r3", 0);
setprop("/systems/failures/spoiler-r4", 0);
setprop("/systems/failures/spoiler-r5", 0);
setprop("/systems/failures/elec-ac-ess", 0);
setprop("/systems/failures/elec-batt1", 0);
setprop("/systems/failures/elec-batt2", 0);
@ -54,8 +64,6 @@ var failReset = func {
setprop("/systems/failures/pump-yellow-elec", 0);
}
setprop("/systems/failures/spoiler-left", 0);
setprop("/systems/failures/spoiler-right", 0);
failReset();
setprop("/systems/acconfig/autoconfig-running", 0);
setprop("/systems/acconfig/spinning", 0);
@ -90,7 +98,6 @@ var systemsReset = func {
systems.ADIRSreset();
systems.pneu_init();
systems.hyd_init();
systems.press_init();
systems.fuel_init();
fmgc.FMGCinit();
mcdu1.MCDU_reset();

View file

@ -67,6 +67,8 @@
<object-name>ADR3Btn2O</object-name>
<object-name>BlueElecPump1F</object-name>
<object-name>BlueElecPump2O</object-name>
<object-name>CabinPressModeBtn1F</object-name>
<object-name>CabinPressModeBtn2M</object-name>
<object-name>CFuelTank1Btn1F</object-name>
<object-name>CFuelTank1Btn2O</object-name>
<object-name>CFuelTank2Btn1F</object-name>
@ -77,6 +79,7 @@
<object-name>Eng2BleedBtn2O</object-name>
<object-name>FuelModeBtn1F</object-name>
<object-name>FuelModeBtn2O</object-name>
<object-name>FuelXfeedBtn1A</object-name>
<object-name>FuelXfeedBtn2O</object-name>
<object-name>GalleyPwrBtn1F</object-name>
<object-name>GalleyPwrBtn2O</object-name>
@ -1395,6 +1398,7 @@
<type>pick</type>
<object-name>FuelXfeedBtn1</object-name>
<object-name>FuelXfeedBtn2</object-name>
<object-name>FuelXfeedBtn1A</object-name>
<object-name>FuelXfeedBtn2O</object-name>
<action>
<button>0</button>
@ -1422,14 +1426,13 @@
</action>
</animation>
<!-- Did not make light yet-->
<!--animation>
<animation>
<type>select</type>
<object-name>FuelXfeedBtn1F</object-name>
<object-name>FuelXfeedBtn1A</object-name>
<condition>
<or>
<equals>
<property>/something</property>
<property>/systems/fuel/x-feed</property>
<value>1</value>
</equals>
<equals>
@ -1438,7 +1441,7 @@
</equals>
</or>
</condition>
</animation-->
</animation>
<animation>
<type>select</type>
<object-name>FuelXfeedBtn2O</object-name>
@ -2437,14 +2440,40 @@
<object-name>ExtPwrBtn1A</object-name>
<condition>
<or>
<equals>
<property>/controls/switches/cart</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>/controls/switches/cart</property>
<value>1</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
</and>
<and>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
</equals>
<or>
<greater-than-equals>
<property>/systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/battery2-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</or>
</condition>
</animation>
@ -3167,11 +3196,11 @@
<type>pick</type>
<object-name>CabinPressModeBtn</object-name>
<object-name>CabinPressModeBtn1F</object-name>
<object-name>CabinPressModeBtn2O</object-name>
<object-name>CabinPressModeBtn2M</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<!--binding>
<binding>
<condition>
<or>
<greater-than-equals>
@ -3185,8 +3214,8 @@
</or>
</condition>
<command>property-toggle</command>
<property>/controls/pressurization/auto</property>
</binding-->
<property>/systems/pressurization/auto</property>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
@ -3213,11 +3242,11 @@
<animation>
<type>select</type>
<object-name>CabinPressModeBtn2O</object-name>
<object-name>CabinPressModeBtn2M</object-name>
<condition>
<or>
<equals>
<property>/controls/pressurization/auto</property>
<property>/systems/pressurization/auto</property>
<value>0</value>
</equals>
<equals>
@ -3230,12 +3259,12 @@
<animation>
<type>pick</type>
<object-name>DitchBtn</object-name>
<object-name>DitchBtn1</object-name>
<object-name>DitchBtn2O</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<!--binding>
<binding>
<condition>
<or>
<greater-than-equals>
@ -3257,8 +3286,8 @@
</or>
</condition>
<command>property-toggle</command>
<property>/controls/ditching</property>
</binding-->
<property>/systems/pressurization/ditchingpb</property>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
@ -3272,7 +3301,7 @@
<condition>
<or>
<equals>
<property>/controls/pressurization/unused-oh-btn</property>
<property>/systems/pressurization/ditchingpb</property>
<value>1</value>
</equals>
<equals>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 147 KiB

View file

@ -8,7 +8,53 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5
MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
OBJECT world
kids 265
kids 266
OBJECT poly
name "FuelXfeedBtn1A"
loc 0.000175806 0.13925 0.04185
data 8
Cube.064
texture "buttons3.png"
crease 30.000000
numvert 8
-0.01 -0.0364 -0.0528
-0.01 -0.0364 -0.0328
-0.007 -0.0364 -0.0328
-0.007 -0.0364 -0.0528
-0.01 -0.0464 -0.0528
-0.01 -0.0464 -0.0328
-0.007 -0.0464 -0.0328
-0.007 -0.0464 -0.0528
numsurf 4
SURF 0x0
mat 4
refs 4
3 0.5 1
7 0.5 0.75
4 0.5 0.75
0 0.5 1
SURF 0x0
mat 4
refs 4
6 0 0.75
2 9.31321e-008 1
1 9.31321e-008 1
5 0 0.75
SURF 0x0
mat 4
refs 4
7 0.5 0.75
3 0.5 1
2 9.31321e-008 1
6 0 0.75
SURF 0x0
mat 4
refs 4
3 0.5 1
0 0.5 1
1 9.31321e-008 1
2 9.31321e-008 1
kids 0
OBJECT poly
name "DitchBtn2O"
loc 0.000175806 -0.17005 -0.10065
@ -488,11 +534,11 @@ refs 4
2 9.31321e-008 0.5
kids 0
OBJECT poly
name "CabinPressModeBtn2O"
name "CabinPressModeBtn2M"
loc 0.000175806 -0.17185 -0.11335
data 8
Cube.062
texture "buttons2.png"
texture "buttons4.png"
crease 30.000000
numvert 8
-0.007 -0.0564 0.0314

View file

@ -303,9 +303,9 @@
<name>Left spoiler 1</name>
<type>rotate</type>
<object-name>SpoilerL1</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l1</property>
<interpolation>
<entry><ind>0.5</ind><dep> 0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
</interpolation>
<axis>
@ -321,7 +321,7 @@
<name>Left spoiler 2</name>
<type>rotate</type>
<object-name>SpoilerL2</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l2</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -339,7 +339,7 @@
<name>Left spoiler 3</name>
<type>rotate</type>
<object-name>SpoilerL3</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l3</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -357,7 +357,7 @@
<name>Left spoiler 4</name>
<type>rotate</type>
<object-name>SpoilerL4</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l4</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -375,7 +375,7 @@
<name>Left spoiler 5</name>
<type>rotate</type>
<object-name>SpoilerL5</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l5</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -393,9 +393,9 @@
<name>Right spoiler 1</name>
<type>rotate</type>
<object-name>SpoilerR1</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r1</property>
<interpolation>
<entry><ind>0.5</ind><dep> 0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
</interpolation>
<axis>
@ -411,7 +411,7 @@
<name>Right spoiler 2</name>
<type>rotate</type>
<object-name>SpoilerR2</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r2</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -429,7 +429,7 @@
<name>Right spoiler 3</name>
<type>rotate</type>
<object-name>SpoilerR3</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r3</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -447,7 +447,7 @@
<name>Right spoiler 4</name>
<type>rotate</type>
<object-name>SpoilerR4</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r4</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -465,7 +465,7 @@
<name>Right spoiler 5</name>
<type>rotate</type>
<object-name>SpoilerR5</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r5</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>

View file

@ -303,9 +303,9 @@
<name>Left spoiler 1</name>
<type>rotate</type>
<object-name>SpoilerL1</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l1</property>
<interpolation>
<entry><ind>0.5</ind><dep> 0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
</interpolation>
<axis>
@ -321,7 +321,7 @@
<name>Left spoiler 2</name>
<type>rotate</type>
<object-name>SpoilerL2</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l2</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -339,7 +339,7 @@
<name>Left spoiler 3</name>
<type>rotate</type>
<object-name>SpoilerL3</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l3</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -357,7 +357,7 @@
<name>Left spoiler 4</name>
<type>rotate</type>
<object-name>SpoilerL4</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l4</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -375,7 +375,7 @@
<name>Left spoiler 5</name>
<type>rotate</type>
<object-name>SpoilerL5</object-name>
<property>/sim/multiplay/generic/float[9]</property>
<property>/controls/flight/spoiler-l5</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -393,9 +393,9 @@
<name>Right spoiler 1</name>
<type>rotate</type>
<object-name>SpoilerR1</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r1</property>
<interpolation>
<entry><ind>0.5</ind><dep> 0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
</interpolation>
<axis>
@ -411,7 +411,7 @@
<name>Right spoiler 2</name>
<type>rotate</type>
<object-name>SpoilerR2</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r2</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -429,7 +429,7 @@
<name>Right spoiler 3</name>
<type>rotate</type>
<object-name>SpoilerR3</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r3</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -447,7 +447,7 @@
<name>Right spoiler 4</name>
<type>rotate</type>
<object-name>SpoilerR4</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r4</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>
@ -465,7 +465,7 @@
<name>Right spoiler 5</name>
<type>rotate</type>
<object-name>SpoilerR5</object-name>
<property>/sim/multiplay/generic/float[10]</property>
<property>/controls/flight/spoiler-r5</property>
<interpolation>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep>30</dep></entry>

View file

@ -18,6 +18,8 @@ var hyd_init = func {
setprop("/systems/hydraulic/blue-psi", 0);
setprop("/systems/hydraulic/green-psi", 0);
setprop("/systems/hydraulic/yellow-psi", 0);
setprop("/systems/hydraulic/spoiler3and4-inhibit", 0);
setprop("/systems/hydraulic/spoiler-inhibit", 0);
setprop("/controls/gear/brake-parking", 0);
hyd_timer.start();
}
@ -133,6 +135,26 @@ var master_hyd = func {
setprop("/systems/hydraulic/yellow-psi", 0);
}
}
var lelev = getprop("/systems/failures/elevator-left");
var relev = getprop("/systems/failures/elevator-right");
var flap = getprop("/controls/flight/flap-txt");
var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2");
var alpha = getprop("/systems/thrust/alpha-floor");
var sec1 = getprop("/systems/failures/sec1");
var sec3 = getprop("/systems/failures/sec3");
#var aoa_prot = getprop("aoaprotection);
if (lelev or relev) {
setprop("/systems/hydraulic/spoiler3and4-inhibit", 1);
} else {
setprop("/systems/hydraulic/spoiler3and4-inhibit", 0);
}
if ((flap == "FULL") or alpha or (sec1 and sec3) or (((state1 == "MCT") or (state1 == "TOGA")) and ((state2 == "MCT") or (state2 == "TOGA")))) {
setprop("/systems/hydraulic/spoiler-inhibit", 1);
} else {
setprop("/systems/hydraulic/spoiler-inhibit", 0);
}
}
#######################

View file

@ -162,7 +162,6 @@ setlistener("/sim/signals/fdm-initialized", func {
systems.adirs_init();
systems.pneu_init();
systems.hyd_init();
systems.press_init();
systems.fuel_init();
fmgc.APinit();
librariesLoop.start();

View file

@ -29,10 +29,6 @@ var pneu_init = func {
setprop("/systems/pneumatic/startpsir", 0);
setprop("/systems/pneumatic/eng1-starter", 0);
setprop("/systems/pneumatic/eng2-starter", 0);
pneu_timer.start();
}
var press_init = func {
setprop("/FMGC/internal/dep-arpt", "");
setprop("/systems/pressurization/mode", "GN");
setprop("/systems/pressurization/vs", "0");
@ -43,10 +39,13 @@ var press_init = func {
setprop("/systems/pressurization/outflowpos", "0");
setprop("/systems/pressurization/deltap-norm", "0");
setprop("/systems/pressurization/outflowpos-norm", "0");
var altitude = getprop("/position/altitude-ft");
var altitude = getprop("/instrumentation/altimeter/indicated-altitude-ft");
setprop("/systems/pressurization/cabinalt", altitude);
setprop("/systems/pressurization/targetalt", altitude);
setprop("/systems/pressurization/diff-to-target", "0");
setprop("/systems/pressurization/ditchingpb", 0);
setprop("/systems/pressurization/targetvs", "0");
pneu_timer.start();
}
#######################
@ -157,27 +156,25 @@ var master_pneu = func {
var deltap = getprop("/systems/pressurization/deltap");
var outflow = getprop("/systems/pressurization/outflowpos");
var speed = getprop("/velocities/groundspeed-kt");
var cabinalt = getprop("/systems/pressurization/cabinalt");
var dep_apt = getprop("autopilot/route-manager/departure/airport");
var airport_dep_elev_ft = getprop("autopilot/route-manager/departure/field-elevation-ft");
var altitude = getprop("/position/altitude-ft");
var altitude = getprop("/instrumentation/altimeter/indicated-altitude-ft");
var airport_arr_elev_ft = getprop("autopilot/route-manager/destination/field-elevation-ft");
var vs = getprop("/systems/pressurization/vs-norm");
var ditch = getprop("/systems/pressurization/ditchingpb");
var outflowpos = getprop("/systems/pressurization/outflowpos");
var cabinalt = getprop("/systems/pressurization/cabinalt");
var targetalt = getprop("/systems/pressurization/targetalt");
var targetvs = getprop("/systems/pressurization/targetvs");
var ambient = getprop("/systems/pressurization/ambientpsi");
var cabinpsi = getprop("/systems/pressurization/cabinpsi");
var pause = getprop("/sim/freeze/master");
var auto = getprop("/systems/pressurization/auto");
setprop("/systems/pressurization/diff-to-target", targetalt - cabinalt);
setprop("/systems/pressurization/deltap", cabinpsi - ambient);
if ((pressmode == "GN") and (pressmode != "CL") and (wowl and wowr) and ((state1 == "MCT") or (state1 == "TOGA")) and ((state2 == "MCT") or (state2 == "TOGA"))) {
setprop("/systems/pressurization/mode", "TO");
}
if (((!wowl) or (!wowr)) and (speed > 100) and (pressmode == "TO")) {
} else if (((!wowl) or (!wowr)) and (speed > 100) and (pressmode == "TO")) {
setprop("/systems/pressurization/mode", "CL");
}
@ -185,9 +182,13 @@ var master_pneu = func {
setprop("/systems/pressurization/vs", targetvs);
}
if (cabinalt != targetalt and !wowl and !wowr) {
if (cabinalt != targetalt and !wowl and !wowr and !pause) {
setprop("/systems/pressurization/cabinalt", cabinalt + vs);
}
if (ditch and auto) {
setprop("/systems/pressurization/outflowpos", "1");
}
}
###################

View file

@ -276,7 +276,7 @@
<channel name="Speedbrake">
<kinematic name="Speedbrake">
<input>/controls/flight/spoiler-output</input>
<input>/controls/flight/speedbrake-output</input>
<traverse>
<setting>
<position>0</position>

View file

@ -50,10 +50,6 @@
<type>float</type>
<property>/engines/engine[1]/reverser-pos-norm</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/elevator-sum</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/elevator-left</property>
@ -62,10 +58,6 @@
<type>float</type>
<property>/controls/flight/elevator-right</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/aileron-sum</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/aileron-left</property>
@ -76,11 +68,43 @@
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-left</property>
<property>/controls/flight/spoiler-l1</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-right</property>
<property>/controls/flight/spoiler-l2</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-l3</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-l4</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-l5</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-r1</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-r2</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-r3</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-r4</property>
</signal>
<signal>
<type>float</type>
<property>/controls/flight/spoiler-r5</property>
</signal>
<signal>
<type>float</type>

File diff suppressed because it is too large Load diff

View file

@ -115,7 +115,7 @@
<property>/controls/flight/aileron-fbw-cmd</property>
</output>
<config>
<Kp>0.06</Kp>
<Kp>0.11</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
@ -159,7 +159,6 @@
</and>
</condition>
<property>/controls/flight/aileron-fbw-cmd</property>
<scale>2.0</scale>
</input>
<input>
<condition>
@ -208,7 +207,6 @@
<name>IT-FBW: AILERON</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>/controls/flight/roll-fbw</input>
<output>/controls/flight/aileron-fbw</output>
</filter>
@ -217,21 +215,85 @@
<name>IT-FBW: LEFT SPOILER</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>/controls/flight/roll-fbw</input>
<input>
<condition>
<equals>
<property>/systems/failures/aileron-left</property>
<value>0</value>
</equals>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<equals>
<property>/systems/failures/aileron-left</property>
<value>1</value>
</equals>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<output>/controls/flight/spoiler-left-fbw-cmd</output>
<min>-1</min>
<max>0</max>
<max>1</max>
</filter>
<filter>
<name>IT-FBW: RIGHT SPOILER</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>/controls/flight/roll-fbw</input>
<input>
<condition>
<equals>
<property>/systems/failures/aileron-right</property>
<value>0</value>
</equals>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<equals>
<property>/systems/failures/aileron-right</property>
<value>1</value>
</equals>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<output>/controls/flight/spoiler-right-fbw-cmd</output>
<min>0</min>
<min>-1</min>
<max>1</max>
</filter>
@ -288,11 +350,11 @@
<property>/controls/flight/elevator-fbw-cmd</property>
</output>
<config>
<Kp>-0.10</Kp>
<Kp>-0.21</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
<Ti>5</Ti>
<Ti>10</Ti>
<Td>0.002</Td>
<u_min>-0.5</u_min>
<u_max>0.5</u_max>
@ -510,7 +572,6 @@
</and>
</condition>
<property>/controls/flight/elevator-fbw-cmd</property>
<scale>2.0</scale>
</input>
<input>
<condition>
@ -760,7 +821,7 @@
<alpha>0.1</alpha>
<gamma>0</gamma>
<Ti>5.0</Ti>
<Td>0.00000001</Td>
<Td>0.000001</Td>
<u_min>-0.3</u_min>
<u_max>0.3</u_max>
</config>
@ -835,7 +896,7 @@
</input>
<output>/controls/flight/rudder-fbw</output>
<type>noise-spike</type>
<max-rate-of-change>10</max-rate-of-change>
<max-rate-of-change>2.5</max-rate-of-change>
</filter>
</PropertyList>

View file

@ -37,19 +37,19 @@
<table>
<independentVar lookup="row">/controls/flight/aileron-input</independentVar>
<tableData>
-1.0 -0.150
-0.7 -0.100
-0.5 -0.050
-0.3 -0.025
-0.15 -0.010
-0.05 -0.005
0.00 0.000
0.05 0.005
0.15 0.010
0.3 0.025
0.5 0.050
0.7 0.100
1.0 0.150
-1.0 -0.1500
-0.7 -0.1000
-0.5 -0.0500
-0.3 -0.0270
-0.15 -0.0140
-0.05 -0.0055
0.00 0.0000
0.05 0.0055
0.15 0.0140
0.3 0.0270
0.5 0.0500
0.7 0.1000
1.0 0.1500
</tableData>
</table>
</sum>
@ -100,9 +100,9 @@
<table>
<independentVar lookup="row">/controls/flight/elevator-input</independentVar>
<tableData>
-1.0 0.0755
-0.7 0.0535
-0.5 0.0225
-1.0 0.075
-0.7 0.053
-0.5 0.022
-0.3 0.0115
-0.15 0.0045
-0.05 0.0007
@ -110,9 +110,9 @@
0.05 -0.0007
0.15 -0.0045
0.3 -0.0115
0.5 -0.0225
0.7 -0.0535
1.0 -0.0755
0.5 -0.022
0.7 -0.053
1.0 -0.075
</tableData>
</table>
</sum>

View file

@ -203,29 +203,61 @@
</filter>
<filter>
<name>Target Pressurize Altitude</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<expression>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 1000</ind><dep> 500</dep></entry>
<entry><ind> 5000</ind><dep>1100</dep></entry>
<entry><ind>20000</ind><dep>5200</dep></entry>
<entry><ind>30000</ind><dep>6700</dep></entry>
<entry><ind>30000</ind><dep>7900</dep></entry>
<entry><ind>40500</ind><dep>8000</dep></entry>
</table>
</expression>
</input>
<output>/systems/pressurization/targetalt</output>
</filter>
<name>Target Pressurize Altitude CMD</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<expression>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 1000</ind><dep> 500</dep></entry>
<entry><ind> 5000</ind><dep>1100</dep></entry>
<entry><ind>20000</ind><dep>5200</dep></entry>
<entry><ind>30000</ind><dep>6700</dep></entry>
<entry><ind>30000</ind><dep>7900</dep></entry>
<entry><ind>40500</ind><dep>8000</dep></entry>
</table>
</expression>
</input>
<output>/systems/pressurization/targetalt-cmd</output>
</filter>
<filter>
<name>Cabin PSI</name>
<name>Target Pressurize Altitude</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<condition>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<less-than>
<property>/systems/pressurization/targetalt-cmd</property>
<property>/systems/pressurization/cabinalt-norm</property>
</less-than>
</or>
</condition>
<property>/systems/pressurization/cabinalt-norm</property>
</input>
<input>
<condition>
<not>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</not>
</condition>
<property>/systems/pressurization/targetalt-cmd</property>
</input>
<output>/systems/pressurization/targetalt</output>
</filter>
<filter>
<name>Cabin PSI target</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
@ -233,20 +265,49 @@
<expression>
<table>
<property>/systems/pressurization/cabinalt-norm</property>
<entry><ind>-1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind> 1000</ind><dep> 14.6</dep></entry>
<entry><ind> 5000</ind><dep> 14.4</dep></entry>
<entry><ind>20000</ind><dep> 12.1</dep></entry>
<entry><ind>30000</ind><dep> 11.4</dep></entry>
<entry><ind>30000</ind><dep> 11.0</dep></entry>
<entry><ind>40500</ind><dep> 10.9</dep></entry>
<entry><ind>-1000</ind><dep> 16.50000</dep></entry>
<entry><ind> 0</ind><dep> 14.70000</dep></entry>
<entry><ind> 0</ind><dep> 14.70000</dep></entry>
<entry><ind> 1000</ind><dep> 14.20000</dep></entry>
<entry><ind> 2000</ind><dep> 13.60000</dep></entry>
<entry><ind> 3000</ind><dep> 13.20000</dep></entry>
<entry><ind> 4000</ind><dep> 12.70000</dep></entry>
<entry><ind> 5000</ind><dep> 12.20000</dep></entry>
<entry><ind> 6000</ind><dep> 11.70000</dep></entry>
<entry><ind> 7000</ind><dep> 11.30000</dep></entry>
<entry><ind> 8000</ind><dep> 10.90000</dep></entry>
</table>
</expression>
</input>
<output>/systems/pressurization/cabinpsi</output>
<output>/systems/pressurization/cabinpsi-target</output>
</filter>
<filter>
<name>VS-target</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<condition>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
</condition>
<property>/systems/pressurization/ambientpsi</property>
</input>
<input>
<condition>
<not>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</not>
</condition>
<property>/systems/pressurization/cabinpsi-target</property>
</input>
<output>/systems/pressurization/cabinpsi</output>
</filter>
<filter>
<name>Ambient PSI (ICAO std)</name>
<type>gain</type>
@ -256,41 +317,41 @@
<expression>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind>-1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind> 1000</ind><dep> 14.2</dep></entry>
<entry><ind> 2000</ind><dep> 13.6</dep></entry>
<entry><ind> 3000</ind><dep> 13.2</dep></entry>
<entry><ind> 4000</ind><dep> 12.7</dep></entry>
<entry><ind> 5000</ind><dep> 12.2</dep></entry>
<entry><ind> 6000</ind><dep> 11.7</dep></entry>
<entry><ind> 7000</ind><dep> 11.3</dep></entry>
<entry><ind> 8000</ind><dep> 10.9</dep></entry>
<entry><ind> 9000</ind><dep> 10.5</dep></entry>
<entry><ind>10000</ind><dep> 10.1</dep></entry>
<entry><ind>11000</ind><dep> 9.7</dep></entry>
<entry><ind>12000</ind><dep> 9.3</dep></entry>
<entry><ind>13000</ind><dep> 9.0</dep></entry>
<entry><ind>14000</ind><dep> 8.6</dep></entry>
<entry><ind>15000</ind><dep> 8.3</dep></entry>
<entry><ind>16000</ind><dep> 8.0</dep></entry>
<entry><ind>17000</ind><dep> 7.6</dep></entry>
<entry><ind>18000</ind><dep> 7.3</dep></entry>
<entry><ind>19000</ind><dep> 7.0</dep></entry>
<entry><ind>20000</ind><dep> 6.8</dep></entry>
<entry><ind>22000</ind><dep> 6.2</dep></entry>
<entry><ind>24000</ind><dep> 5.7</dep></entry>
<entry><ind>26000</ind><dep> 5.2</dep></entry>
<entry><ind>28000</ind><dep> 4.7</dep></entry>
<entry><ind>30000</ind><dep> 4.4</dep></entry>
<entry><ind>32000</ind><dep> 4.0</dep></entry>
<entry><ind>34000</ind><dep> 3.6</dep></entry>
<entry><ind>36000</ind><dep> 3.3</dep></entry>
<entry><ind>38000</ind><dep> 3.0</dep></entry>
<entry><ind>39000</ind><dep> 2.9</dep></entry>
<entry><ind>40000</ind><dep> 2.7</dep></entry>
<entry><ind>41000</ind><dep> 2.6</dep></entry>
<entry><ind>42000</ind><dep> 2.5</dep></entry>
<entry><ind>-1000</ind><dep>16.50000</dep></entry>
<entry><ind> 0</ind><dep>14.70000</dep></entry>
<entry><ind> 1000</ind><dep>14.20000</dep></entry>
<entry><ind> 2000</ind><dep>13.60000</dep></entry>
<entry><ind> 3000</ind><dep>13.20000</dep></entry>
<entry><ind> 4000</ind><dep>12.70000</dep></entry>
<entry><ind> 5000</ind><dep>12.20000</dep></entry>
<entry><ind> 6000</ind><dep>11.70000</dep></entry>
<entry><ind> 7000</ind><dep>11.30000</dep></entry>
<entry><ind> 8000</ind><dep>10.90000</dep></entry>
<entry><ind> 9000</ind><dep>10.50000</dep></entry>
<entry><ind>10000</ind><dep>10.10000</dep></entry>
<entry><ind>11000</ind><dep> 9.70000</dep></entry>
<entry><ind>12000</ind><dep> 9.30000</dep></entry>
<entry><ind>13000</ind><dep> 9.00000</dep></entry>
<entry><ind>14000</ind><dep> 8.60000</dep></entry>
<entry><ind>15000</ind><dep> 8.30000</dep></entry>
<entry><ind>16000</ind><dep> 8.00000</dep></entry>
<entry><ind>17000</ind><dep> 7.60000</dep></entry>
<entry><ind>18000</ind><dep> 7.30000</dep></entry>
<entry><ind>19000</ind><dep> 7.00000</dep></entry>
<entry><ind>20000</ind><dep> 6.80000</dep></entry>
<entry><ind>22000</ind><dep> 6.20000</dep></entry>
<entry><ind>24000</ind><dep> 5.70000</dep></entry>
<entry><ind>26000</ind><dep> 5.20000</dep></entry>
<entry><ind>28000</ind><dep> 4.70000</dep></entry>
<entry><ind>30000</ind><dep> 4.40000</dep></entry>
<entry><ind>32000</ind><dep> 4.00000</dep></entry>
<entry><ind>34000</ind><dep> 3.60000</dep></entry>
<entry><ind>36000</ind><dep> 3.30000</dep></entry>
<entry><ind>38000</ind><dep> 3.00000</dep></entry>
<entry><ind>39000</ind><dep> 2.90000</dep></entry>
<entry><ind>40000</ind><dep> 2.70000</dep></entry>
<entry><ind>41000</ind><dep> 2.60000</dep></entry>
<entry><ind>42000</ind><dep> 2.50000</dep></entry>
</table>
</expression>
</input>
@ -314,7 +375,7 @@
<property>/systems/pressurization/vs</property>
</input>
<output>/systems/pressurization/vs-norm</output>
<max-rate-of-change>100</max-rate-of-change>
<max-rate-of-change>500</max-rate-of-change>
</filter>
<filter>
@ -338,7 +399,7 @@
</filter>
<filter>
<name>VS-target</name>
<name>VS-target-cmd</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
@ -346,16 +407,48 @@
<expression>
<table>
<property>/it-autoflight/internal/vert-speed-fpm</property>
<entry><ind>-1000</ind><dep>-410</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 1000</ind><dep> 205</dep></entry>
<entry><ind> 2000</ind><dep> 410</dep></entry>
<entry><ind> 3000</ind><dep> 615</dep></entry>
<entry><ind> 4000</ind><dep> 820</dep></entry>
<entry><ind> 5000</ind><dep>1025</dep></entry>
<entry><ind>-50000</ind><dep>-50000</dep></entry>
<entry><ind>-10000</ind><dep> -5000</dep></entry>
<entry><ind> -5000</ind><dep> -1230</dep></entry>
<entry><ind> -4000</ind><dep> -1025</dep></entry>
<entry><ind> -3000</ind><dep> -820</dep></entry>
<entry><ind> -2000</ind><dep> -615</dep></entry>
<entry><ind> -1000</ind><dep> -410</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 1000</ind><dep> 205</dep></entry>
<entry><ind> 2000</ind><dep> 410</dep></entry>
<entry><ind> 3000</ind><dep> 615</dep></entry>
<entry><ind> 4000</ind><dep> 820</dep></entry>
<entry><ind> 5000</ind><dep> 1025</dep></entry>
</table>
</expression>
</input>
<output>/systems/pressurization/targetvs</output>
<output>/systems/pressurization/targetvs-cmd</output>
</filter>
<filter>
<name>VS-target</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<condition>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
</condition>
<value>0</value>
</input>
<input>
<condition>
<not>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</not>
</condition>
<property>/systems/pressurization/targetvs-cmd</property>
</input>
<output>/systems/pressurization/targetvs</output>
</filter>
</PropertyList>