fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into new-flightplan

Browse source
This commit is contained in:
Jonathan Redpath 2022-02-15 12:37:36 +00:00
commit 7fe513d974
16 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

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

4
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -5606,7 +5606,7 @@
</greater-than-equals> </greater-than-equals>
</condition> </condition>
<command>property-toggle</command> <command>property-toggle</command>
<property>controls/switches/pneumatics/cabin-fans</property> <property>controls/pneumatics/switches/cabin-fans</property>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -5621,7 +5621,7 @@
<condition> <condition>
<or> <or>
<equals> <equals>
<property>controls/switches/pneumatics/cabin-fans</property> <property>controls/pneumatics/switches/cabin-fans</property>
<value>0</value> <value>0</value>
</equals> </equals>
<equals> <equals>

1
Nasal/Libraries/buttons.nas
View file

@ -31,7 +31,6 @@ var variousReset = func() {
setprop("/controls/CVR/tone", 0); setprop("/controls/CVR/tone", 0);
setprop("/controls/CVR/gndctl", 0); setprop("/controls/CVR/gndctl", 0);
setprop("/controls/CVR/erase", 0); setprop("/controls/CVR/erase", 0);
setprop("/controls/switches/pneumatics/cabin-fans", 1);
setprop("/controls/switches/emerCallLtO", 0); # ON light, flashes white for 10s setprop("/controls/switches/emerCallLtO", 0); # ON light, flashes white for 10s
setprop("/controls/switches/emerCallLtC", 0); # CALL light, flashes amber for 10s setprop("/controls/switches/emerCallLtC", 0); # CALL light, flashes amber for 10s
setprop("/controls/switches/emerCall", 0); setprop("/controls/switches/emerCall", 0);

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

@ -30,7 +30,7 @@
</condition> </condition>
<volume> <volume>
<property>/engines/engine[2]/n1</property> <property>/engines/engine[2]/n1</property>
<factor>0.005</factor> <factor>0.004</factor>
</volume> </volume>
<pitch> <pitch>
<property>/engines/engine[2]/n1</property> <property>/engines/engine[2]/n1</property>
@ -42,7 +42,7 @@
<hyd-yellow> <hyd-yellow>
<name>yellowHydPump</name> <name>yellowHydPump</name>
<mode>looped</mode> <mode>looped</mode>
<path>Aircraft/A320-family/Sounds/yellowHydPump.wav</path> <path>Aircraft/A320-family/Sounds/Hydraulic/yellowHydPump.wav</path>
<condition> <condition>
<property>/systems/hydraulic/sources/yellow-elec/pump-operate</property> <property>/systems/hydraulic/sources/yellow-elec/pump-operate</property>
</condition> </condition>
@ -55,7 +55,7 @@
<hyd> <hyd>
<name>PTU</name> <name>PTU</name>
<mode>once</mode> <mode>once</mode>
<path>airbus_ptu_on.wav</path> <path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu_on.wav</path>
<condition> <condition>
<or> <or>
<property>/systems/hydraulic/sources/ptu/yellow-green</property> <property>/systems/hydraulic/sources/ptu/yellow-green</property>
@ -73,7 +73,7 @@
<hyd> <hyd>
<name>PTU-loop</name> <name>PTU-loop</name>
<mode>looped</mode> <mode>looped</mode>
<path>airbus_ptu.wav</path> <path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu.wav</path>
<condition> <condition>
<equals> <equals>
<property>/systems/hydraulic/sources/ptu/ptu-loop-sound</property> <property>/systems/hydraulic/sources/ptu/ptu-loop-sound</property>
@ -127,7 +127,7 @@
<announcement> <announcement>
<name>EmerCall</name> <name>EmerCall</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/tripleBelt.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/tripleBelt.wav</path>
<condition> <condition>
<equals> <equals>
<property>/controls/switches/emerCall</property> <property>/controls/switches/emerCall</property>
@ -146,7 +146,7 @@
<name>V1</name> <name>V1</name>
<mode>once</mode> <mode>once</mode>
<type>avionics</type> <type>avionics</type>
<path>Aircraft/A320-family/Sounds/V1.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/V1.wav</path>
<condition> <condition>
<and> <and>
<equals> <equals>
@ -1497,7 +1497,7 @@
<sb> <sb>
<mode>once</mode> <mode>once</mode>
<name>sb</name> <name>sb</name>
<path>cabin-chime.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
<condition> <condition>
<and> <and>
<greater-than> <greater-than>
@ -1515,7 +1515,7 @@
<ns> <ns>
<mode>once</mode> <mode>once</mode>
<name>ns</name> <name>ns</name>
<path>cabin-chime.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
<condition> <condition>
<and> <and>
<greater-than> <greater-than>
@ -1659,6 +1659,7 @@
<property>/surface-positions/flap-pos-norm</property> <property>/surface-positions/flap-pos-norm</property>
<volume> <volume>
<property>sim/sound/wingview</property> <property>sim/sound/wingview</property>
<factor>2</factor>
</volume> </volume>
</switch> </switch>
@ -1801,7 +1802,7 @@
<relay> <relay>
<name>Avionics</name> <name>Avionics</name>
<mode>looped</mode> <mode>looped</mode>
<path>Aircraft/A320-family/Sounds/320efis.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/320efis.wav</path>
<condition> <condition>
<and> <and>
<property>/sim/current-view/internal</property> <property>/sim/current-view/internal</property>
@ -1818,7 +1819,7 @@
</and> </and>
</condition> </condition>
<volume> <volume>
<factor>0.6</factor> <factor>0.5</factor>
</volume> </volume>
</relay> </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> <fx>
<!-- cockpit --> <!-- cockpit -->
<engine> <engine>
<name>a320_startup_left</name> <name>a320_starter_left</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path> <path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition> <condition>
@ -25,7 +25,7 @@
</engine> </engine>
<engine> <engine>
<name>a320_startup_right</name> <name>a320_starter_right</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path> <path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
<condition> <condition>
@ -46,7 +46,7 @@
</engine> </engine>
<engine> <engine>
<name>a320_startup_left_2</name> <name>a320_startup_left</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path> <path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition> <condition>
@ -67,7 +67,7 @@
</engine> </engine>
<engine> <engine>
<name>a320_startup_right_2</name> <name>a320_startup_right</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path> <path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
<condition> <condition>
@ -129,6 +129,7 @@
</position> </position>
</engine> </engine>
<engine> <engine>
<name>a320_cockpit_idle_1</name> <name>a320_cockpit_idle_1</name>
<mode>looped</mode> <mode>looped</mode>
@ -613,7 +614,7 @@
<z>0</z> <z>0</z>
<inner-angle>225</inner-angle> <inner-angle>225</inner-angle>
<outer-angle>135</outer-angle> <outer-angle>135</outer-angle>
<outer-gain>0.01</outer-gain> <outer-gain>0.60</outer-gain>
</orientation> </orientation>
<reference-dist>30</reference-dist> <reference-dist>30</reference-dist>
<position> <position>
@ -643,7 +644,7 @@
<z>0</z> <z>0</z>
<inner-angle>225</inner-angle> <inner-angle>225</inner-angle>
<outer-angle>135</outer-angle> <outer-angle>135</outer-angle>
<outer-gain>0.01</outer-gain> <outer-gain>0.60</outer-gain>
</orientation> </orientation>
<reference-dist>30</reference-dist> <reference-dist>30</reference-dist>
<position> <position>
@ -673,7 +674,7 @@
<z>0</z> <z>0</z>
<inner-angle>45</inner-angle> <inner-angle>45</inner-angle>
<outer-angle>315</outer-angle> <outer-angle>315</outer-angle>
<outer-gain>0.01</outer-gain> <outer-gain>0.60</outer-gain>
</orientation> </orientation>
<reference-dist>60</reference-dist> <reference-dist>60</reference-dist>
<position> <position>
@ -703,7 +704,7 @@
<z>0</z> <z>0</z>
<inner-angle>45</inner-angle> <inner-angle>45</inner-angle>
<outer-angle>315</outer-angle> <outer-angle>315</outer-angle>
<outer-gain>0.01</outer-gain> <outer-gain>0.60</outer-gain>
</orientation> </orientation>
<reference-dist>60</reference-dist> <reference-dist>60</reference-dist>
<position> <position>

8
Sounds/leapx-sound.xml
View file

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

8
Sounds/v2500-sound.xml
View file

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

2
Systems/a320-aircond.xml
View file

@ -769,7 +769,7 @@
<switch name="/systems/air-conditioning/recirc/cabin-fans"> <switch name="/systems/air-conditioning/recirc/cabin-fans">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/controls/switches/pneumatics/cabin-fans eq 1 /controls/pneumatics/switches/cabin-fans eq 1
/systems/failures/pneumatics/cabin-fans eq 0 /systems/failures/pneumatics/cabin-fans eq 0
</test> </test>
</switch> </switch>

16
Systems/sound-common.xml
View file

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