fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
legoboyvdlp R 2020-07-26 18:27:19 +01:00
commit 1718d55e5b
20 changed files with 459 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
A320-main.xml
View file

@ -4230,7 +4230,6 @@
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/ADR.nas</file>
<file>Aircraft/A320-family/Nasal/Panels/SwitchingPanel.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/Comm/HF.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakes.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakesystem.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>

2
AircraftConfig/acconfig.nas
View file

@ -520,7 +520,7 @@ var takeoff = func {
setprop("/controls/atc/mode-knob", 4);
atc.transponderPanel.modeSwitch(5);
setprop("/controls/flight/elevator-trim", -0.07);
systems.arm_autobrake(3);
systems.Autobrake.arm_autobrake(3);
setprop("/ECAM/to-config-test", 1);
settimer(func {
setprop("/ECAM/to-config-test", 0);

22
Models/FlightDeck/a320.flightdeck.xml
View file

@ -1613,10 +1613,10 @@
</condition>
<command>nasal</command>
<script>
if (getprop("controls/autobrake/mode") != 1) {
systems.arm_autobrake(1);
if (systems.Autobrake.mode.getValue() != 1) {
systems.Autobrake.arm_autobrake(1);
} else {
systems.arm_autobrake(0);
systems.Autobrake.arm_autobrake(0);
}
setprop("sim/sounde/oh-btn", 1);
</script>
@ -1640,10 +1640,10 @@
</condition>
<command>nasal</command>
<script>
if (getprop("controls/autobrake/mode") != 2) {
systems.arm_autobrake(2);
if (systems.Autobrake.mode.getValue() != 2) {
systems.Autobrake.arm_autobrake(2);
} else {
systems.arm_autobrake(0);
systems.Autobrake.arm_autobrake(0);
}
setprop("sim/sounde/oh-btn", 1);
</script>
@ -1667,10 +1667,10 @@
</condition>
<command>nasal</command>
<script>
if (getprop("controls/autobrake/mode") != 3) {
systems.arm_autobrake(3);
if (systems.Autobrake.mode.getValue() != 3) {
systems.Autobrake.arm_autobrake(3);
} else {
systems.arm_autobrake(0);
systems.Autobrake.arm_autobrake(0);
}
setprop("sim/sounde/oh-btn", 1);
</script>
@ -6228,7 +6228,7 @@
<type>rotate</type>
<object-name>LRudderPedalL</object-name>
<object-name>LRudderPedalR</object-name>
<property>controls/gear/brake-left</property>
<property>/fdm/jsbsim/fcs/brake-left</property>
<factor>15</factor>
<axis>
<x>0</x>
@ -6246,7 +6246,7 @@
<type>rotate</type>
<object-name>RRudderPedalL</object-name>
<object-name>RRudderPedalR</object-name>
<property>controls/gear/brake-right</property>
<property>/fdm/jsbsim/fcs/brake-right</property>
<factor>15</factor>
<axis>
<x>0</x>

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

@ -45,8 +45,6 @@ var acconfig_weight_kgs = props.globals.getNode("/systems/acconfig/options/weigh
var elapsed_sec = props.globals.getNode("/sim/time/elapsed-sec", 1);
var ac2 = props.globals.getNode("/systems/electrical/bus/ac-2", 1);
var autoconfig_running = props.globals.getNode("/systems/acconfig/autoconfig-running", 1);
var ac1_src = props.globals.getNode("/systems/electrical/ac1-src", 1);
var ac2_src = props.globals.getNode("/systems/electrical/ac2-src", 1);
var lighting_du4 = props.globals.getNode("/controls/lighting/DU/du4", 1);
var ecam_page = props.globals.getNode("/ECAM/Lower/page", 1);
var hour = props.globals.getNode("/sim/time/utc/hour", 1);

4
Nasal/Libraries/libraries.nas
View file

@ -184,7 +184,7 @@ var systemsInit = func {
systems.ADIRS.init();
systems.eng_init();
systems.APUController.init();
systems.autobrake_init();
systems.Autobrake.init();
systems.fire_init();
fmgc.flightPlanController.reset();
fmgc.windController.reset();
@ -526,7 +526,7 @@ setlistener("/controls/flight/auto-coordination", func {
pts.Controls.Flight.autoCoordination.setBoolValue(0);
print("System: Auto Coordination has been turned off as it is not compatible with the fly-by-wire of this aircraft.");
screen.log.write("Auto Coordination has been disabled as it is not compatible with the fly-by-wire of this aircraft", 1, 0, 0);
});
}, 0, 0);
##############
# Legacy FCU #

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

@ -4,6 +4,10 @@
# Anything that says Temp is set by another file to avoid multiple getValue calls
# Usage Example: pts.Class.SubClass.node.getValue()
var Acconfig = {
running: props.globals.getNode("/systems/acconfig/autoconfig-running"),
};
var APU = {
masterSw: props.globals.getNode("/controls/apu/master"),
rpm: props.globals.getNode("/engines/engine[2]/n1"),
@ -37,6 +41,7 @@ var Controls = {
rudderTrim: props.globals.getNode("/controls/flight/rudder-trim"),
},
Gear: {
brake: [props.globals.getNode("/controls/gear/brake-left"),props.globals.getNode("/controls/gear/brake-right")],
gearDown: props.globals.getNode("/controls/gear/gear-down"),
parkingBrake: props.globals.getNode("/controls/gear/brake-parking"),
},
@ -144,6 +149,11 @@ var Position = {
var Sim = {
aero: props.globals.getNode("/sim/aero"),
Input: {
Selected: {
engine: [props.globals.getNode("/sim/input/selected/engine[0]", 1),props.globals.getNode("/sim/input/selected/engine[1]", 1)],
}
},
Multiplay: {
online: props.globals.getNode("/sim/multiplay/online"),
},

2
Nasal/MCDU/MCDU.nas
View file

@ -540,7 +540,7 @@ var lskbutton = func(btn, i) {
setprop("/MCDU[" ~ i ~ "]/page", "F-PLNA");
} else if (getprop("/MCDU[" ~ i ~ "]/page") == "ARRIVAL") {
canvas_mcdu.myArrival[i].arrPushbuttonLeft(6);
} else if (getprop("/MCDU[" ~ i ~ "]/page") == "DEPARTURE" or getprop("/MCDU[" ~ i ~ "]/page") == "HOLD") {
} else if (getprop("/MCDU[" ~ i ~ "]/page") == "DEPARTURE" or getprop("/MCDU[" ~ i ~ "]/page") == "HOLD" or getprop("/MCDU[" ~ i ~ "]/page") == "AIRWAYS") {
if (fmgc.flightPlanController.temporaryFlag[i]) {
setprop("/MCDU[" ~ i ~ "]/page", "F-PLNA");
} else {

9
Nasal/Systems/FADEC/engines-cfm.nas
View file

@ -377,3 +377,12 @@ setlistener("/systems/pneumatics/psi/engine-2-psi", func {
}
}
}, 0, 0);
setlistener("/engines/engine[0]/state", func() {
setprop("/sim/sound/shutdown[0]", getprop("/engines/engine[0]/state"));
}, 0, 0);
setlistener("/engines/engine[1]/state", func() {
setprop("/sim/sound/shutdown[1]", getprop("/engines/engine[1]/state"));
}, 0, 0);

30
Nasal/Systems/FADEC/engines-common.nas
View file

@ -13,38 +13,38 @@ var eng_common_init = func {
# nada
}
# Various Other Stuff
# Engine thrust commands
var doIdleThrust = func {
# Idle does not respect selected engines, because it is used to respond
# to "Retard" and both engines must be idle for spoilers to deploy
setprop("/controls/engines/engine[0]/throttle", 0.0);
setprop("/controls/engines/engine[1]/throttle", 0.0);
pts.Controls.Engines.Engine.throttle[0].setValue(0.0);
pts.Controls.Engines.Engine.throttle[1].setValue(0.0);
}
var doCLThrust = func {
if (getprop("/sim/input/selected/engine[0]") == 1) {
setprop("/controls/engines/engine[0]/throttle", 0.63);
if (pts.Sim.Input.Selected.engine[0].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[0].setValue(0.63);
}
if (getprop("/sim/input/selected/engine[1]") == 1) {
setprop("/controls/engines/engine[1]/throttle", 0.63);
if (pts.Sim.Input.Selected.engine[1].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[1].setValue(0.63);
}
}
var doMCTThrust = func {
if (getprop("/sim/input/selected/engine[0]") == 1) {
setprop("/controls/engines/engine[0]/throttle", 0.8);
if (pts.Sim.Input.Selected.engine[0].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[0].setValue(0.80);
}
if (getprop("/sim/input/selected/engine[1]") == 1) {
setprop("/controls/engines/engine[1]/throttle", 0.8);
if (pts.Sim.Input.Selected.engine[1].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[1].setValue(0.80);
}
}
var doTOGAThrust = func {
if (getprop("/sim/input/selected/engine[0]") == 1) {
setprop("/controls/engines/engine[0]/throttle", 1.0);
if (pts.Sim.Input.Selected.engine[0].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[0].setValue(1.00);
}
if (getprop("/sim/input/selected/engine[1]") == 1) {
setprop("/controls/engines/engine[1]/throttle", 1.0);
if (pts.Sim.Input.Selected.engine[1].getBoolValue()) {
pts.Controls.Engines.Engine.throttle[1].setValue(1.00);
}
}

9
Nasal/Systems/FADEC/engines-iae.nas
View file

@ -376,4 +376,13 @@ setlistener("/systems/pneumatics/psi/engine-2-psi", func {
interpolate(engines[1].getNode("egt-actual"), 0, egt_shutdown_time);
}
}
}, 0, 0);
setlistener("/engines/engine[0]/state", func() {
setprop("/sim/sound/shutdown[0]", getprop("/engines/engine[0]/state"));
}, 0, 0);
setlistener("/engines/engine[1]/state", func() {
setprop("/sim/sound/shutdown[1]", getprop("/engines/engine[1]/state"));
}, 0, 0);

80
Nasal/Systems/brakes.nas
View file

@ -1,80 +0,0 @@
# A3XX Autobrake
# Joshua Davidson (Octal450)
# Copyright (c) 2020 Josh Davidson (Octal450)
var thr1 = 0;
var thr2 = 0;
var wow0 = 0;
var gnd_speed = 0;
setprop("controls/autobrake/active", 0);
setprop("controls/autobrake/mode", 0);
setprop("controls/autobrake/decel-rate", 0);
var autobrake_init = func {
setprop("controls/autobrake/active", 0);
setprop("controls/autobrake/mode", 0);
}
# Override FG's generic brake
controls.applyBrakes = func(v, which = 0) {
if (getprop("systems/acconfig/autoconfig-running") != 1) {
if (which <= 0) {
interpolate("/controls/gear/brake-left", v, 0.5);
}
if (which >= 0) {
interpolate("/controls/gear/brake-right", v, 0.5);
}
}
}
# Set autobrake mode
var arm_autobrake = func(mode) {
wow0 = getprop("gear/gear[0]/wow");
gnd_speed = getprop("velocities/groundspeed-kt");
if (mode == 0) { # OFF
absChk.stop();
if (getprop("controls/autobrake/active") == 1) {
setprop("controls/autobrake/active", 0);
setprop("controls/gear/brake-left", 0);
setprop("controls/gear/brake-right", 0);
}
setprop("controls/autobrake/decel-rate", 0);
setprop("controls/autobrake/mode", 0);
} else if (mode == 1 and wow0 != 1) { # LO
setprop("controls/autobrake/decel-rate", 1.7);
setprop("controls/autobrake/mode", 1);
absChk.start();
} else if (mode == 2 and wow0 != 1) { # MED
setprop("controls/autobrake/decel-rate", 3);
setprop("controls/autobrake/mode", 2);
absChk.start();
} else if (mode == 3 and wow0 == 1 and gnd_speed < 40) { # MAX
setprop("controls/autobrake/decel-rate", 6);
setprop("controls/autobrake/mode", 3);
absChk.start();
}
}
# Autobrake loop
var absChk = maketimer(0.2, func {
thr1 = getprop("controls/engines/engine[0]/throttle");
thr2 = getprop("controls/engines/engine[1]/throttle");
wow0 = getprop("gear/gear[0]/wow");
gnd_speed = getprop("velocities/groundspeed-kt");
if (gnd_speed > 72) {
if (getprop("controls/autobrake/mode") != 0 and thr1 < 0.15 and thr2 < 0.15 and wow0 == 1) {
setprop("controls/autobrake/active", 1);
} else {
setprop("controls/autobrake/active", 0);
setprop("controls/gear/brake-left", 0);
setprop("controls/gear/brake-right", 0);
}
}
if (getprop("controls/autobrake/mode") == 3 and getprop("controls/gear/gear-down") == 0) {
arm_autobrake(0);
}
if (getprop("controls/autobrake/mode") != 0 and wow0 == 1 and getprop("controls/autobrake/active") == 1 and (getprop("controls/gear/brake-left") > 0.05 or getprop("controls/gear/brake-right") > 0.05)) {
arm_autobrake(0);
}
});

131
Nasal/Systems/brakesystem.nas
View file

@ -1,3 +1,9 @@
# A3XX Autobrake and Braking
# Joshua Davidson (Octal450)
# Copyright (c) 2020 Josh Davidson (Octal450)
##########################################################################
# Simple Brake Simulation System
# 2010, Thorsten Brehm
@ -63,7 +69,7 @@ var BrakeSystem =
setprop("gear/gear[1]/Lbrake-thermal-energy",0.0);
setprop("gear/gear[2]/Rbrake-thermal-energy",0.0);
setprop("controls/gear/brake-fans",0);
setprop("/controls/gear/brake-fans",0);
setprop("gear/gear[1]/Lbrake-smoke",0);
setprop("gear/gear[2]/Rbrake-smoke",0);
setprop("gear/gear[1]/L-Thrust",0);
@ -80,21 +86,21 @@ var BrakeSystem =
var tatdegc = getprop("/systems/navigation/probes/tat-1/compute-tat") or 0;
var atemp = getprop("environment/temperature-degc") or 0;
var vmach = getprop("velocities/mach") or 0;
var tatdegc = getprop("systems/navigation/probes/tat-1/compute-tat");
var tatdegc = getprop("/systems/navigation/probes/tat-1/compute-tat");
setprop("gear/gear[1]/L1brake-temp-degc",tatdegc+getprop("gear/gear[1]/L1error-temp-degc"));
setprop("gear/gear[1]/L2brake-temp-degc",tatdegc+getprop("gear/gear[1]/L2error-temp-degc"));
setprop("gear/gear[2]/R3brake-temp-degc",tatdegc+getprop("gear/gear[2]/R3error-temp-degc"));
setprop("gear/gear[2]/R4brake-temp-degc",tatdegc+getprop("gear/gear[2]/R4error-temp-degc"));
setprop("sim/animation/fire-services",0);
setprop("/sim/animation/fire-services",0);
me.LastSimTime = 0.0;
},
# update brake energy
update : func()
{
var CurrentTime = getprop("sim/time/elapsed-sec");
var CurrentTime = getprop("/sim/time/elapsed-sec");
var dt = CurrentTime - me.LastSimTime;
var LThermalEnergy = getprop("gear/gear[1]/Lbrake-thermal-energy");
var RThermalEnergy = getprop("gear/gear[2]/Rbrake-thermal-energy");
@ -107,12 +113,12 @@ var BrakeSystem =
var L_thrust_lb = getprop("engines/engine[0]/thrust_lb");
var R_thrust_lb = getprop("engines/engine[1]/thrust_lb");
if (getprop("sim/freeze/replay-state")==0 and dt<1.0) {
if (getprop("/sim/freeze/replay-state")==0 and dt<1.0) {
var OnGround = getprop("gear/gear[1]/wow");
#cooling effect: adjust cooling factor by a value proportional to the environment temp (m.CoolingFactor + environment temp-degc * 0.00001)
var LCoolingRatio = me.CoolingFactor+(tatdegc*0.000001);
var RCoolingRatio = me.CoolingFactor+(tatdegc*0.000001);
if (getprop("controls/gear/brake-fans")) {
if (getprop("/controls/gear/brake-fans")) {
#increase CoolingRatio if Brake Fans are active
LCoolingRatio = LCoolingRatio * 3;
RCoolingRatio = RCoolingRatio * 3;
@ -169,8 +175,8 @@ var BrakeSystem =
var V2_R = V1 - me.BrakeDecel * dt * RBrakeLevel;
LThermalEnergy += (Mass * getprop("gear/gear[1]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
if (getprop("services/chocks/enable")) {
if (!getprop("controls/gear/brake-parking")) {
if (getprop("/services/chocks/enable")) {
if (!getprop("/controls/gear/brake-parking")) {
# cooling effect: reduce thermal energy by (LnCoolFactor) * dt
LThermalEnergy = LThermalEnergy * math.exp(LnCoolFactor * dt);
} else {
@ -179,7 +185,7 @@ var BrakeSystem =
LThermalEnergy = (LThermalEnergy * math.exp(LnCoolFactor * dt)) + (L_Thrust * dt);
};
} else {
if (!getprop("controls/gear/brake-parking")) {
if (!getprop("/controls/gear/brake-parking")) {
if (LBrakeLevel>0) {
if (V2_L>0) {
#LThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2) + L_thrust;
@ -202,8 +208,8 @@ var BrakeSystem =
};
RThermalEnergy += (Mass * getprop("gear/gear[2]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
if (getprop("services/chocks/enable")) {
if (!getprop("controls/gear/brake-parking")) {
if (getprop("/services/chocks/enable")) {
if (!getprop("/controls/gear/brake-parking")) {
# cooling effect: reduce thermal energy by (RnCoolFactor) * dt
RThermalEnergy = RThermalEnergy * math.exp(RnCoolFactor * dt);
} else {
@ -212,7 +218,7 @@ var BrakeSystem =
RThermalEnergy = (RThermalEnergy * math.exp(RnCoolFactor * dt)) + (R_Thrust * dt);
};
} else {
if (!getprop("controls/gear/brake-parking")) {
if (!getprop("/controls/gear/brake-parking")) {
if (RBrakeLevel>0) {
if (V2_R>0) {
#RThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2) + R_thrust;
@ -304,13 +310,13 @@ var BrakeSystem =
} else {
# stop smoke processing
setprop("gear/gear[1]/Lbrake-smoke",0);
setprop("sim/animation/fire-services",0);
setprop("/sim/animation/fire-services",0);
me.LSmokeActive = 0;
};
if (getprop("gear/gear[1]/Lbrake-thermal-energy") > 1.5) {
setprop("sim/animation/fire-services",1);
setprop("/sim/animation/fire-services",1);
} else {
setprop("sim/animation/fire-services",0);
setprop("/sim/animation/fire-services",0);
};
},
@ -344,21 +350,102 @@ var BrakeSystem =
me.RSmokeActive = 0;
};
if (getprop("gear/gear[2]/Rbrake-thermal-energy") > 1.5) {
setprop("sim/animation/fire-services",1);
setprop("/sim/animation/fire-services",1);
} else {
setprop("sim/animation/fire-services",0);
setprop("/sim/animation/fire-services",0);
};
},
};
var BrakeSys = BrakeSystem.new();
setlistener("sim/signals/fdm-initialized",
#############
# Autobrake #
#############
var Autobrake = {
active: props.globals.initNode("/controls/autobrake/active", 0, "BOOL"),
mode: props.globals.initNode("/controls/autobrake/mode", 0, "INT"),
decel: props.globals.initNode("/controls/autobrake/decel-rate", 0, "DOUBLE"),
_wow0: 0,
_gnd_speed: 0,
_mode: 0,
_active: 0,
init: func() {
me.active.setBoolValue(0);
me.mode.setValue(0);
me.decel.setValue(0);
},
arm_autobrake: func(mode) {
me._wow0 = pts.Gear.wow[0].getBoolValue();
me._gnd_speed = pts.Velocities.groundspeed.getValue();
if (mode == 0) { # OFF
absChk.stop();
if (me.active.getBoolValue()) {
me.active.setBoolValue(0);
pts.Controls.Gear.brake[0].setValue(0);
pts.Controls.Gear.brake[1].setValue(0);
}
me.decel.setValue(0);
me.mode.setValue(0);
} else if (mode == 1 and !me._wow0) { # LO
me.decel.setValue(2.0);
me.mode.setValue(1);
absChk.start();
} else if (mode == 2 and !me._wow0) { # MED
me.decel.setValue(3);
me.mode.setValue(2);
absChk.start();
} else if (mode == 3 and me._wow0 and me._gnd_speed < 40) { # MAX
me.decel.setValue(6);
me.mode.setValue(3);
absChk.start();
}
},
loop: func() {
me._wow0 = pts.Gear.wow[0].getBoolValue();
me._gnd_speed = pts.Velocities.groundspeed.getValue();
me._mode = me.mode.getValue();
me._active = me.active.getBoolValue();
if (me._gnd_speed > 72) {
if (me._mode != 0 and pts.Controls.Engines.Engine.throttle[0].getValue() < 0.15 and pts.Controls.Engines.Engine.throttle[1].getValue() < 0.15 and me._wow0) {
me.active.setBoolValue(1);
} elsif (me._active) {
me.active.setBoolValue(0);
pts.Controls.Gear.brake[0].setValue(0);
pts.Controls.Gear.brake[1].setValue(0);
}
}
if (me._mode == 3 and !pts.Controls.Gear.gearDown.getBoolValue()) {
me.arm_autobrake(0);
}
if (me._mode != 0 and me._wow0 and me._active and (pts.Controls.Gear.brake[0].getValue() > 0.05 or pts.Controls.Gear.brake[1].getValue() > 0.05)) {
me.arm_autobrake(0);
}
},
};
# Override FG's generic brake
controls.applyBrakes = func(v, which = 0) {
if (!pts.Acconfig.running.getBoolValue()) {
if (which <= 0) {
pts.Controls.Gear.brake[0].setValue(v);
}
if (which >= 0) {
pts.Controls.Gear.brake[1].setValue(v);
}
}
}
setlistener("/sim/signals/fdm-initialized",
# executed on _every_ FDM reset (but not installing new listeners)
func(idle) { BrakeSys.reset(); },
0,0);
settimer(func()
{
BrakeSys.update();
}, 5);
settimer(func() { BrakeSys.update(); }, 5);
# Autobrake loop
var absChk = maketimer(0.2, func {
Autobrake.loop();
});

6
Sounds/A320-common-sound.xml
View file

@ -7,7 +7,7 @@
<mode>looped</mode>
<path>Aircraft/A320-family/Sounds/SASA/A320.wav</path>
<condition>
<property>/sim/current-view/internal</property>
<property>/sim/sound/internal-custom</property>
</condition>
<volume>
<property>/engines/engine[2]/n1</property>
@ -26,7 +26,7 @@
<mode>looped</mode>
<path>Aircraft/A320-family/Sounds/SASA/x320_apu.wav</path>
<condition>
<not><property>/sim/current-view/internal</property></not>
<not><property>/sim/sound/internal-custom</property></not>
</condition>
<volume>
<property>/engines/engine[2]/n1</property>
@ -44,7 +44,7 @@
<mode>looped</mode>
<path>Aircraft/A320-family/Sounds/yellowHydPump.wav</path>
<condition>
<property>controls/hydraulic/elec-pump-yellow</property>
<property>/systems/hydraulic/sources/yellow-elec/pump-operate</property>
</condition>
<volume>
<property>/sim/current-view/internal</property>

BIN
Sounds/SASA/CFM56B/external/cfm-shutdown.wav vendored Normal file
View file

Binary file not shown.

BIN
Sounds/SASA/CFM56B/start/A320_cockpit_shutdown.wav Normal file
View file

Binary file not shown.

88
Sounds/cfm56-sound.xml
View file

@ -87,6 +87,48 @@
</position>
</engine>
<engine>
<name>a320_shutdown_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[0]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>1</factor>
</volume>
<position>
<x>0</x>
<y>20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_shutdown_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[1]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>1</factor>
</volume>
<position>
<x>0</x>
<y>-20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_cockpit_idle_1</name>
<mode>looped</mode>
@ -677,6 +719,52 @@
</position>
</engine>
<engine>
<name>a320_external_shutdown_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/external/cfm-shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[0]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
</volume>
<reference-dist>30</reference-dist>
<position>
<x>0</x>
<y>20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_external_shutdown_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/external/cfm-shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[1]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
</volume>
<reference-dist>30</reference-dist>
<position>
<x>0</x>
<y>-20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_external_idle_1</name>
<condition>

88
Sounds/v2500-sound.xml
View file

@ -87,6 +87,48 @@
</position>
</engine>
<engine>
<name>a320_shutdown_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[0]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>1</factor>
</volume>
<position>
<x>0</x>
<y>20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_shutdown_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[1]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>1</factor>
</volume>
<position>
<x>0</x>
<y>-20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_cockpit_idle_left</name>
<mode>looped</mode>
@ -432,6 +474,52 @@
</position>
</engine>
<engine>
<name>a320_external_shutdown_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/external/cfm-shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[0]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
</volume>
<reference-dist>30</reference-dist>
<position>
<x>0</x>
<y>20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_external_shutdown_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/external/cfm-shutdown.wav</path>
<condition>
<equals>
<property>/sim/sound/shutdown[1]</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
</volume>
<reference-dist>30</reference-dist>
<position>
<x>0</x>
<y>-20</y>
<z>0</z>
</position>
</engine>
<engine>
<name>a320_external_startup_rear</name>
<mode>once</mode>

16
Systems/a320-electrical.xml
View file

@ -686,7 +686,7 @@
/systems/electrical/bus/ac-2 ne 0
</test>
<test logic="AND" value="1">
/instrumentation/airspeed-indicator/indicated-speed-kt gt 100
/instrumentation/airspeed-indicator/indicated-speed-kt ge 100
/systems/electrical/bus/ac-1 eq 0
/systems/electrical/bus/ac-2 eq 0
gear/unit[0]/WOW eq 0
@ -1392,11 +1392,11 @@
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/relay/dc-ess-feed-tr/contact-pos eq 0
/systems/electrical/relay/tr-contactor-1/contact-pos eq 1
/systems/electrical/relay/dc-bus-tie-dc-1/contact-pos eq 1
/systems/electrical/relay/dc-bus-tie-dc-2/contact-pos eq 0
<test logic="OR">
/systems/electrical/relay/dc-bus-tie-dc-1/contact-pos eq 0
/systems/electrical/relay/dc-bus-tie-dc-2/contact-pos eq 0
</test>
/controls/electrical/switches/emer-gen-test eq 0
/systems/electrical/bus/dc-1 ge 25
</test>
</switch>
@ -1541,7 +1541,7 @@
</test>
<test logic="OR" value="3"> <!-- BAT -->
<test logic="AND">
/instrumentation/airspeed-indicator/indicated-speed-kt lt 50
/instrumentation/airspeed-indicator/indicated-speed-kt lt 100
<test logic="OR">
/controls/electrical/switches/bat-1 eq 1
/controls/electrical/switches/bat-2 eq 1
@ -1573,7 +1573,7 @@
</test>
<test logic="OR" value="/systems/electrical/sources/bat-1/volt">
<test logic="AND">
/instrumentation/airspeed-indicator/indicated-speed-kt lt 50
/instrumentation/airspeed-indicator/indicated-speed-kt lt 100
/controls/electrical/switches/bat-1 eq 1
/systems/electrical/bus/dc-bat-src eq 3
/systems/electrical/sources/bat-1/volt ge 25
@ -1588,7 +1588,7 @@
</test>
<test logic="OR" value="/systems/electrical/sources/bat-2/volt">
<test logic="AND">
/instrumentation/airspeed-indicator/indicated-speed-kt lt 50
/instrumentation/airspeed-indicator/indicated-speed-kt lt 100
/controls/electrical/switches/bat-2 eq 1
/systems/electrical/bus/dc-bat-src eq 3
/systems/electrical/sources/bat-2/volt ge 25

80
Systems/a320-fcs.xml
View file

@ -1087,38 +1087,88 @@
<c1>20</c1>
</lag_filter>
<summer name="fcs/left-brake-summer">
<actuator name="fcs/brake-left">
<input>/controls/gear/brake-left</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chocks/enable</input>
<rate_limit>2</rate_limit>
</actuator>
<actuator name="fcs/brake-right">
<input>/controls/gear/brake-right</input>
<rate_limit>2</rate_limit>
</actuator>
<switch name="fcs/brake-avail">
<default value="1"/>
<!--<test logic="OR" value="1">
/systems/hydraulic/green-psi ge 2000
/systems/hydraulic/yellow-psi ge 1500
</test>-->
</switch>
<fcs_function name="fcs/left-brake-input">
<function>
<product>
<property>fcs/brake-avail</property>
<max>
<property>/services/chocks/enable</property>
<property>fcs/brake-left</property>
<product>
<property>/controls/autobrake/brake-left</property>
<property>/controls/autobrake/active</property>
</product>
<property>/controls/gear/brake-parking</property>
</max>
</product>
</function>
<clipto>
<min>0</min>
<max>1</max>
</clipto>
</summer>
</fcs_function>
<actuator name="fcs/left-brake-actuator">
<input>fcs/left-brake-input</input>
<rate_limit>10</rate_limit>
</actuator>
<switch name="rubbish/left-brake-cmd-norm">
<default value="fcs/left-brake-summer"/>
<test value="/controls/autobrake/brake-left">
/controls/autobrake/active eq 1
<default value="fcs/left-brake-actuator"/>
<test value="1">
/systems/acconfig/autoconfig-running eq 1
</test>
<output>fcs/left-brake-cmd-norm</output>
</switch>
<summer name="fcs/right-brake-summer">
<input>/controls/gear/brake-right</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chocks/enable</input>
<fcs_function name="fcs/right-brake-input">
<function>
<product>
<property>fcs/brake-avail</property>
<max>
<property>/services/chocks/enable</property>
<property>fcs/brake-right</property>
<product>
<property>/controls/autobrake/brake-right</property>
<property>/controls/autobrake/active</property>
</product>
<property>/controls/gear/brake-parking</property>
</max>
</product>
</function>
<clipto>
<min>0</min>
<max>1</max>
</clipto>
</summer>
</fcs_function>
<actuator name="fcs/right-brake-actuator">
<input>fcs/right-brake-input</input>
<rate_limit>10</rate_limit>
</actuator>
<switch name="rubbish/right-brake-cmd-norm">
<default value="fcs/right-brake-summer"/>
<test value="/controls/autobrake/brake-right">
/controls/autobrake/active eq 1
<default value="fcs/right-brake-actuator"/>
<test value="1">
/systems/acconfig/autoconfig-running eq 1
</test>
<output>fcs/right-brake-cmd-norm</output>
</switch>

80
Systems/cfm56-sound.xml
View file

@ -92,8 +92,8 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>55.0</ind> <dep>0.297</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -115,7 +115,7 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -134,8 +134,8 @@
<expression>
<table>
<property>/sim/sound/fake-n2[0]</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>55.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>
@ -470,8 +470,8 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>55.0</ind> <dep>0.297</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -493,7 +493,7 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -512,8 +512,8 @@
<expression>
<table>
<property>/sim/sound/fake-n2[1]</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>55.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>
@ -854,8 +854,8 @@
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.310</dep></entry>
<entry><ind>70.0</ind> <dep>0.018</dep></entry>
<entry><ind>99.8</ind> <dep>0.000</dep></entry>
@ -876,7 +876,7 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.00</dep></entry>
<entry><ind>18.9</ind> <dep>1.00</dep></entry>
<entry><ind>42.5</ind> <dep>1.50</dep></entry>
</table>
</expression>
@ -896,8 +896,8 @@
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>1.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>1.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.410</dep></entry>
<entry><ind>55.0</ind> <dep>0.240</dep></entry>
<entry><ind>57.2</ind> <dep>0.100</dep></entry>
@ -921,8 +921,8 @@
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>1.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>1.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.410</dep></entry>
<entry><ind>70.0</ind> <dep>0.018</dep></entry>
<entry><ind>99.8</ind> <dep>0.000</dep></entry>
@ -1134,8 +1134,8 @@
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.310</dep></entry>
<entry><ind>70.0</ind> <dep>0.018</dep></entry>
<entry><ind>99.8</ind> <dep>0.000</dep></entry>
@ -1156,7 +1156,7 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.00</dep></entry>
<entry><ind>18.9</ind> <dep>1.00</dep></entry>
<entry><ind>42.5</ind> <dep>1.50</dep></entry>
</table>
</expression>
@ -1176,8 +1176,8 @@
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>1.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>1.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.410</dep></entry>
<entry><ind>55.0</ind> <dep>0.240</dep></entry>
<entry><ind>57.2</ind> <dep>0.100</dep></entry>
@ -1201,8 +1201,8 @@
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>14.0</ind> <dep>0.000</dep></entry>
<entry><ind>15.0</ind> <dep>0.010</dep></entry>
<entry><ind>19.0</ind> <dep>1.000</dep></entry>
<entry><ind>12.0</ind> <dep>0.010</dep></entry>
<entry><ind>18.9</ind> <dep>1.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.410</dep></entry>
<entry><ind>70.0</ind> <dep>0.018</dep></entry>
<entry><ind>99.8</ind> <dep>0.000</dep></entry>
@ -1420,8 +1420,8 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>53.0</ind> <dep>0.357</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -1443,7 +1443,7 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -1462,7 +1462,7 @@
<expression>
<table>
<property>/sim/sound/fake-n2[0]</property>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>53.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>
@ -1838,8 +1838,8 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>53.0</ind> <dep>0.357</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -1861,7 +1861,7 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -1880,7 +1880,7 @@
<expression>
<table>
<property>/sim/sound/fake-n2[1]</property>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>53.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>
@ -2261,8 +2261,8 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>55.0</ind> <dep>0.297</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -2284,7 +2284,7 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -2303,7 +2303,7 @@
<expression>
<table>
<property>/sim/sound/fake-n2[0]</property>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>55.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>
@ -2638,8 +2638,8 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>15.0</ind> <dep>0.000</dep></entry>
<entry><ind>19.0</ind> <dep>0.900</dep></entry>
<entry><ind>12.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.900</dep></entry>
<entry><ind>41.7</ind> <dep>0.673</dep></entry>
<entry><ind>55.0</ind> <dep>0.297</dep></entry>
<entry><ind>57.2</ind> <dep>0.042</dep></entry>
@ -2661,7 +2661,7 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind>19.0</ind> <dep>1.10</dep></entry>
<entry><ind>18.9</ind> <dep>1.10</dep></entry>
<entry><ind>42.5</ind> <dep>1.65</dep></entry>
</table>
</expression>
@ -2680,7 +2680,7 @@
<expression>
<table>
<property>/sim/sound/fake-n2[1]</property>
<entry><ind>19.0</ind> <dep>0.000</dep></entry>
<entry><ind>18.9</ind> <dep>0.000</dep></entry>
<entry><ind>41.7</ind> <dep>0.620</dep></entry>
<entry><ind>55.0</ind> <dep>0.964</dep></entry>
<entry><ind>57.2</ind> <dep>1.000</dep></entry>