fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
legoboyvdlp R 2020-09-11 16:30:46 +01:00
commit 67edd9a4b8
6 changed files with 65 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Nasal/Libraries/libraries.nas
View file

@ -448,7 +448,7 @@ controls.elevatorTrim = func(d) {
if (systems.HYD.Psi.green.getValue() >= 1500) {
slewProp("/controls/flight/elevator-trim", d * 0.0185); # Rate in JSB normalized (0.125 / 13.5)
} else {
slewProp("/controls/flight/elevator-trim", d * 0.0092) # Rate in JSB normalized (0.125 / 13.5)
slewProp("/controls/flight/elevator-trim", d * 0.0092) # Rate in JSB normalized (0.125 / 13.5)
}
}

40
Sounds/cfm56-sound.xml
View file

@ -544,9 +544,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -575,9 +574,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -606,9 +604,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -637,9 +634,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -668,9 +664,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>
@ -699,9 +694,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>
@ -730,9 +724,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<reference-dist>30</reference-dist>
<position>
@ -753,9 +746,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<reference-dist>30</reference-dist>
<position>

30
Sounds/leapx-sound.xml
View file

@ -458,9 +458,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -489,9 +488,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -520,9 +518,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -551,9 +548,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -582,9 +578,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>
@ -613,9 +608,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>

40
Sounds/v2500-sound.xml
View file

@ -361,9 +361,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -392,9 +391,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -423,9 +421,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -454,9 +451,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>-1</x>
@ -485,9 +481,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<reference-dist>30</reference-dist>
<position>
@ -508,9 +503,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<reference-dist>30</reference-dist>
<position>
@ -531,9 +525,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>
@ -562,9 +555,8 @@
</equals>
</condition>
<volume>
<property>/sim/sound/internal-custom</property>
<factor>-1</factor>
<offset>1</offset>
<property>/sim/sound/external-custom</property>
<factor>1</factor>
</volume>
<orientation>
<x>1</x>

48
Systems/a320-adr.xml
View file

@ -75,51 +75,19 @@
<fcs_function name="/systems/navigation/probes/tat-1/compute-tat">
<function>
<difference>
<product>
<sum>
<property>/environment/temperature-degc</property> <!-- SAT -->
<value>273.15</value>
</sum>
<sum>
<value>1</value>
<product>
<value>0.2</value> <!-- ratio of specific heats - 1 / 2 -->
<value>0.995</value> <!-- empirical recovery factor -->
<pow>
<property>velocities/mach</property> <!-- going to use the pure value of mach here and then calculate another value -->
<value>2</value>
</pow>
</product>
</sum>
</product>
<value>273.15</value>
</difference>
<product>
<value>0.995</value> <!-- empirical recovery factor -->
<property>propulsion/tat-c</property>
</product>
</function>
</fcs_function>
<fcs_function name="/systems/navigation/probes/tat-2/compute-tat">
<function>
<difference>
<product>
<sum>
<property>/environment/temperature-degc</property> <!-- SAT -->
<value>273.15</value>
</sum>
<sum>
<value>1</value>
<product>
<value>0.2</value> <!-- ratio of specific heats - 1 / 2 -->
<value>0.996</value> <!-- empirical recovery factor -->
<pow>
<property>velocities/mach</property> <!-- going to use the pure value of mach here and then calculate another value -->
<value>2</value>
</pow>
</product>
</sum>
</product>
<value>273.15</value>
</difference>
<product>
<value>0.996</value> <!-- empirical recovery factor -->
<property>propulsion/tat-c</property>
</product>
</function>
</fcs_function>

12
Systems/sound-common.xml
View file

@ -55,6 +55,18 @@
<output>/sim/sound/internal-custom</output>
</logic>
<logic>
<input>
<not>
<equals>
<property>/sim/sound/internal-custom</property>
<value>1</value>
</equals>
</not>
</input>
<output>/sim/sound/external-custom</output>
</logic>
<!-- Misc -->
<filter>
<type>gain</type>