fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into MCDU

Browse source
This commit is contained in:
Joshua Davidson 2017-12-27 10:45:59 -05:00
commit 472f8f5a4e
7 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
A320-main.xml
View file

@ -527,6 +527,7 @@
</engine>
</engines>
<flight>
<aileron-drives-tiller type="bool">0</aileron-drives-tiller>
<aileron-input>0</aileron-input>
<aileron-left>0.5</aileron-left>
<aileron-right>-0.5</aileron-right>

2
Nasal/hydraulics.nas
View file

@ -123,7 +123,7 @@ var HYD = {
ptu_active = getprop("/systems/hydraulic/ptu-active");
if ((elec_pump_blue_sw and dc_ess >= 25 and !blue_pump_fail) and (stateL == 3 or stateR == 3) and !blue_leak) {
if ((elec_pump_blue_sw and dc_ess >= 25 and !blue_pump_fail) and (stateL == 3 or stateR == 3 or getprop("/gear/gear[0]/wow") == 0) and !blue_leak) {
if (blue_psi < 2900) {
setprop("/systems/hydraulic/blue-psi", blue_psi + 50);
} else {

2
Nasal/it-fbw.nas
View file

@ -158,7 +158,7 @@ var update_loop = func {
var law = getprop("/it-fbw/law");
# Mech Backup can always return to direct, if it can.
if (law == 3 and getprop("/systems/electrical/bus/ac-ess") >= 110 and getprop("/systems/hydraulic/blue-psi") >= 1500) {
if (law == 3 and getprop("/systems/electrical/bus/ac-ess") >= 110 and (getprop("/systems/hydraulic/green-psi") >= 1500 or getprop("/systems/hydraulic/blue-psi") >= 1500 or getprop("/systems/hydraulic/yellow-psi") >= 1500)) {
setprop("/it-fbw/degrade-law", 2);
}

5
Nasal/libraries.nas
View file

@ -516,8 +516,9 @@ var r2Pedal = func {
if (getprop("/controls/flight/auto-coordination") == 1) {
setprop("/controls/flight/auto-coordination", 0);
gui.popupTip("System: Auto Coordination has been turned off for this session.");
print("System: Auto Coordination has been turned off for this session.");
setprop("/controls/flight/aileron-drives-tiller", 1);
} else {
setprop("/controls/flight/aileron-drives-tiller", 0);
}
setprop("/systems/acconfig/libraries-loaded", 1);

13
Systems/a320-fcs.xml
View file

@ -796,11 +796,18 @@
<channel name="Tiller">
<fcs_function name="fcs/steer-nose-deg[0]">
<switch name="hydraulics/tiller/switch">
<default value="/controls/flight/rudder"/>
<test value="/controls/flight/aileron">
/controls/flight/aileron-drives-tiller EQ 1
</test>
</switch>
<fcs_function name="hydraulics/tiller/function">
<function>
<table>
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
<independentVar lookup="column">/controls/flight/rudder</independentVar>
<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
<tableData>
-1 0 1
30.000 -70.0 0 70.0
@ -811,7 +818,7 @@
</fcs_function>
<actuator name="fcs/steer-deg">
<input>fcs/steer-nose-deg[0]</input>
<input>hydraulics/tiller/function</input>
<rate_limit>70</rate_limit>
<output>fcs/steer-pos-deg[0]</output>
</actuator>

24
Systems/libraries.xml
View file

@ -675,23 +675,17 @@
</filter>
<filter>
<name>Rudder Limit</name>
<name>Force Auto Coordination Off</name>
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<expression>
<table>
<property>/velocities/airspeed-kt</property>
<entry><ind> 0</ind><dep> 30</dep></entry>
<entry><ind> 140</ind><dep> 30</dep></entry>
<entry><ind> 240</ind><dep> 10</dep></entry>
<entry><ind> 380</ind><dep>3.4</dep></entry>
<entry><ind>1000</ind><dep>3.4</dep></entry>
</table>
</expression>
</input>
<output>/controls/flight/rudder-limit</output>
<enable>
<condition>
<property>/controls/flight/aileron-drives-tiller</property>
</condition>
</enable>
<input>0</input>
<output>/controls/flight/auto-coordination</output>
</filter>
</PropertyList>

2
revision.txt
View file

@ -1 +1 @@
4111
4113