fly/A320-family
1
0
Fork 0
Code Activity

Merge branch '3D' into 3D-flightdeck

Browse source
This commit is contained in:
Jonathan Redpath 2022-02-15 12:37:27 +00:00
commit f88032ff1b
13 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

@ -1151,7 +1151,7 @@
<bleed-1 type="bool">1</bleed-1>
<bleed-2 type="bool">1</bleed-2>
<blower type="bool">0</blower>
<cabin-fans type="bool">0</cabin-fans>
<cabin-fans type="bool">1</cabin-fans>
<extract type="bool">0</extract>
<ground-air type="bool">0</ground-air>
<hot-air type="bool">1</hot-air>

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

@ -30,7 +30,7 @@
</condition>
<volume>
<property>/engines/engine[2]/n1</property>
<factor>0.005</factor>
<factor>0.004</factor>
</volume>
<pitch>
<property>/engines/engine[2]/n1</property>
@ -42,7 +42,7 @@
<hyd-yellow>
<name>yellowHydPump</name>
<mode>looped</mode>
<path>Aircraft/A320-family/Sounds/yellowHydPump.wav</path>
<path>Aircraft/A320-family/Sounds/Hydraulic/yellowHydPump.wav</path>
<condition>
<property>/systems/hydraulic/sources/yellow-elec/pump-operate</property>
</condition>
@ -55,7 +55,7 @@
<hyd>
<name>PTU</name>
<mode>once</mode>
<path>airbus_ptu_on.wav</path>
<path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu_on.wav</path>
<condition>
<or>
<property>/systems/hydraulic/sources/ptu/yellow-green</property>
@ -73,7 +73,7 @@
<hyd>
<name>PTU-loop</name>
<mode>looped</mode>
<path>airbus_ptu.wav</path>
<path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu.wav</path>
<condition>
<equals>
<property>/systems/hydraulic/sources/ptu/ptu-loop-sound</property>
@ -127,7 +127,7 @@
<announcement>
<name>EmerCall</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/tripleBelt.wav</path>
<path>Aircraft/A320-family/Sounds/Cockpit/tripleBelt.wav</path>
<condition>
<equals>
<property>/controls/switches/emerCall</property>
@ -146,7 +146,7 @@
<name>V1</name>
<mode>once</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/V1.wav</path>
<path>Aircraft/A320-family/Sounds/Cockpit/V1.wav</path>
<condition>
<and>
<equals>
@ -1585,7 +1585,7 @@
<sb>
<mode>once</mode>
<name>sb</name>
<path>cabin-chime.wav</path>
<path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
<condition>
<and>
<greater-than>
@ -1603,7 +1603,7 @@
<ns>
<mode>once</mode>
<name>ns</name>
<path>cabin-chime.wav</path>
<path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
<condition>
<and>
<greater-than>
@ -1747,6 +1747,7 @@
<property>/surface-positions/flap-pos-norm</property>
<volume>
<property>sim/sound/wingview</property>
<factor>2</factor>
</volume>
</switch>
@ -1889,7 +1890,7 @@
<relay>
<name>Avionics</name>
<mode>looped</mode>
<path>Aircraft/A320-family/Sounds/320efis.wav</path>
<path>Aircraft/A320-family/Sounds/Cockpit/320efis.wav</path>
<condition>
<and>
<property>/sim/current-view/internal</property>
@ -1906,7 +1907,7 @@
</and>
</condition>
<volume>
<factor>0.6</factor>
<factor>0.5</factor>
</volume>
</relay>

0
Sounds/320efis.wav → Sounds/Cockpit/320efis.wav
View file

0
Sounds/V1.wav → Sounds/Cockpit/V1.wav
View file

0
Sounds/cabin-chime.wav → Sounds/Cockpit/cabin-chime.wav
View file

0
Sounds/tripleBelt.wav → Sounds/Cockpit/tripleBelt.wav
View file

0
Sounds/airbus_ptu.wav → Sounds/Hydraulic/airbus_ptu.wav
View file

0
Sounds/airbus_ptu_on.wav → Sounds/Hydraulic/airbus_ptu_on.wav
View file

0
Sounds/yellowHydPump.wav → Sounds/Hydraulic/yellowHydPump.wav
View file

17
Sounds/cfm56-sound.xml
View file

@ -4,7 +4,7 @@
<fx>
<!-- cockpit -->
<engine>
<name>a320_startup_left</name>
<name>a320_starter_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition>
@ -25,7 +25,7 @@
</engine>
<engine>
<name>a320_startup_right</name>
<name>a320_starter_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition>
@ -46,7 +46,7 @@
</engine>
<engine>
<name>a320_startup_left_2</name>
<name>a320_startup_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition>
@ -67,7 +67,7 @@
</engine>
<engine>
<name>a320_startup_right_2</name>
<name>a320_startup_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition>
@ -129,6 +129,7 @@
</position>
</engine>
<engine>
<name>a320_cockpit_idle_1</name>
<mode>looped</mode>
@ -613,7 +614,7 @@
<z>0</z>
<inner-angle>225</inner-angle>
<outer-angle>135</outer-angle>
<outer-gain>0.01</outer-gain>
<outer-gain>0.60</outer-gain>
</orientation>
<reference-dist>30</reference-dist>
<position>
@ -643,7 +644,7 @@
<z>0</z>
<inner-angle>225</inner-angle>
<outer-angle>135</outer-angle>
<outer-gain>0.01</outer-gain>
<outer-gain>0.60</outer-gain>
</orientation>
<reference-dist>30</reference-dist>
<position>
@ -673,7 +674,7 @@
<z>0</z>
<inner-angle>45</inner-angle>
<outer-angle>315</outer-angle>
<outer-gain>0.01</outer-gain>
<outer-gain>0.60</outer-gain>
</orientation>
<reference-dist>60</reference-dist>
<position>
@ -703,7 +704,7 @@
<z>0</z>
<inner-angle>45</inner-angle>
<outer-angle>315</outer-angle>
<outer-gain>0.01</outer-gain>
<outer-gain>0.60</outer-gain>
</orientation>
<reference-dist>60</reference-dist>
<position>

8
Sounds/leapx-sound.xml
View file

@ -4,7 +4,7 @@
<fx>
<!-- cockpit -->
<engine>
<name>a320_startup_left</name>
<name>a320_starter_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition>
@ -25,7 +25,7 @@
</engine>
<engine>
<name>a320_startup_right</name>
<name>a320_starter_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition>
@ -46,7 +46,7 @@
</engine>
<engine>
<name>a320_startup_left_2</name>
<name>a320_startup_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition>
@ -67,7 +67,7 @@
</engine>
<engine>
<name>a320_startup_right_2</name>
<name>a320_startup_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition>

8
Sounds/v2500-sound.xml
View file

@ -4,7 +4,7 @@
<fx>
<!-- cockpit -->
<engine>
<name>a320_startup_left</name>
<name>a320_starter_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start1.wav</path>
<condition>
@ -25,7 +25,7 @@
</engine>
<engine>
<name>a320_startup_right</name>
<name>a320_starter_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start1.wav</path>
<condition>
@ -46,7 +46,7 @@
</engine>
<engine>
<name>a320_startup_left_2</name>
<name>a320_startup_left</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start2.wav</path>
<condition>
@ -67,7 +67,7 @@
</engine>
<engine>
<name>a320_startup_right_2</name>
<name>a320_startup_right</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start2.wav</path>
<condition>

16
Systems/sound-common.xml
View file

@ -95,12 +95,12 @@
<product>
<property>/sim/current-view/internal</property>
<table>
<product><property>/velocities/groundspeed-kt</property><value>1</value> </product>
<product><property>/velocities/airspeed-kt</property><value>1</value> </product>
<entry><ind> 0</ind><dep>0.0001</dep></entry>
<entry><ind> 10</ind><dep>0.0010</dep></entry>
<entry><ind>100</ind><dep>0.0100</dep></entry>
<entry><ind>250</ind><dep>0.1000</dep></entry>
<entry><ind>550</ind><dep>0.3000</dep></entry>
<entry><ind>200</ind><dep>0.1000</dep></entry>
<entry><ind>250</ind><dep>0.5000</dep></entry>
</table>
</product>
</expression>
@ -120,12 +120,12 @@
</condition>
<expression>
<table>
<property>/velocities/groundspeed-kt</property>
<property>/velocities/airspeed-kt</property>
<entry><ind> 0</ind><dep>0.0001</dep></entry>
<entry><ind> 10</ind><dep>0.0010</dep></entry>
<entry><ind>100</ind><dep>0.0100</dep></entry>
<entry><ind>250</ind><dep>0.1000</dep></entry>
<entry><ind>550</ind><dep>0.3000</dep></entry>
<entry><ind>200</ind><dep>0.1000</dep></entry>
<entry><ind>250</ind><dep>0.5000</dep></entry>
</table>
</expression>
</input>
@ -141,9 +141,9 @@
<product>
<property>/sim/sound/internal-custom</property>
<table>
<property>/velocities/groundspeed-kt</property>
<property>/velocities/airspeed-kt</property>
<entry><ind> 0</ind><dep>0.5</dep></entry>
<entry><ind>550</ind><dep>1.0</dep></entry>
<entry><ind>250</ind><dep>1.0</dep></entry>
</table>
</product>
</expression>