1
0
Fork 0

Merge /u/thbr/fgdata/ branch next into next

https://sourceforge.net/p/flightgear/fgdata/merge-requests/103/
This commit is contained in:
James Turner 2017-11-19 10:41:24 +00:00
commit 457251ed47
2 changed files with 51 additions and 36 deletions

View file

@ -123,12 +123,14 @@
<number>0</number> <number>0</number>
</tacan> </tacan>
<!-- option stuff - enabled for testing only -->
<!--
<mk-viii> <mk-viii>
<name>mk-viii</name> <name>mk-viii</name>
<number>0</number> <number>0</number>
</mk-viii> </mk-viii>
-->
<tcas>
<name>tcas</name>
<number>0</number>
</tcas>
</PropertyList> </PropertyList>

View file

@ -629,39 +629,52 @@
<nav n="1"> <nav n="1">
<volume type="double">0</volume> <volume type="double">0</volume>
</nav> </nav>
<!-- mk-viii is disabled (enable in instruments.xml for testing purposes) --> <!-- mk-viii is disabled: to enable for testing purposes, toggle the "serviceable" property -->
<mk-viii> <!-- mk-viii configuration, see: http://wiki.flightgear.org/index.php/GPWS --> <mk-viii> <!-- mk-viii configuration, see: http://wiki.flightgear.org/index.php/GPWS -->
<serviceable>true</serviceable> <!-- EGPWS_ENABLE --> <serviceable type="bool">false</serviceable> <!-- EGPWS_ENABLE -->
<configuration-module> <configuration-module>
<category-1> <!-- AIRCRAFT_MODE_TYPE_SELECT --> <category-1> <!-- AIRCRAFT_MODE_TYPE_SELECT -->
255 <!-- aircraft type T1, fast turbofan --> 255 <!-- aircraft type T1, fast turbofan -->
</category-1> </category-1>
<category-4> <!-- ALTITUDE_CALLOUTS --> <category-4> <!-- ALTITUDE_CALLOUTS -->
13 <!-- enable all altitude callouts --> 13 <!-- enable all altitude callouts -->
</category-4> </category-4>
<category-8> <!-- RADIO_ALTITUDE_INPUT_SELECT --> <category-8> <!-- RADIO_ALTITUDE_INPUT_SELECT -->
2 2
</category-8> </category-8>
<category-13> <!-- INPUT_OUTPUT_DISCRETE_TYPE_SELECT --> <category-13> <!-- INPUT_OUTPUT_DISCRETE_TYPE_SELECT -->
5 <!-- flashing warning lamp --> 5 <!-- flashing warning lamp -->
</category-13> </category-13>
</configuration-module> </configuration-module>
<voice> <voice>
<file-prefix type="string">Sounds/mk-viii/</file-prefix> <file-prefix type="string">Sounds/mk-viii/</file-prefix>
</voice> </voice>
<inputs> <!-- Module I/O --> <inputs> <!-- Module I/O -->
<arinc429> <arinc429>
<!-- provide fixed value for decision height --> <!-- provide fixed value for decision height -->
<decision-height-ncd> false </decision-height-ncd> <decision-height-ncd> false </decision-height-ncd>
<decision-height> 250 </decision-height> <decision-height> 250 </decision-height>
</arinc429> </arinc429>
</inputs> </inputs>
<speaker> <!-- Speaker Configuration --> <speaker> <!-- Speaker Configuration -->
<max-dist type="double"> 200.0 </max-dist> <!-- Max. distance where speaker is heard --> <max-dist type="double"> 200.0 </max-dist> <!-- Max. distance where speaker is heard -->
<reference-dist type="double"> 2 </reference-dist> <!-- Distance to pilot --> <reference-dist type="double"> 2 </reference-dist> <!-- Distance to pilot -->
<volume type="double"> 0.6 </volume> <!-- Volume at reference distance --> <volume type="double"> 0.6 </volume> <!-- Volume at reference distance -->
</speaker> </speaker>
</mk-viii> </mk-viii>
<!-- tcas is disabled: to enable for testing purposes, toggle the "serviceable" property -->
<tcas> <!-- http://wiki.flightgear.org/index.php/TCAS -->
<serviceable type="bool">false</serviceable>
<!-- TCAS ENABLE -->
<inputs>
<mode type="int">3</mode> <!-- 0=off, 1=standby, 2=TA-only, 3=auto(TA/RA) -->
</inputs>
<speaker> <!-- Speaker Configuration -->
<max-dist> 2 </max-dist> <!-- Max. distance where speaker is heard -->
<reference-dist> 1 </reference-dist> <!-- Distance to pilot -->
<volume> 1.0 </volume> <!-- Volume at reference distance -->
</speaker>
</tcas>
</instrumentation> </instrumentation>
<gear> <gear>