Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-18 16:21:51 -04:00
commit 9d7c53c1be
13 changed files with 6549 additions and 723 deletions

View file

@ -827,6 +827,11 @@
<volume type="double">0.6</volume> <volume type="double">0.6</volume>
</comm> </comm>
<ddrmi n="0">
<vor-adf-1 type="int">1</vor-adf-1>
<vor-adf-2 type="int">1</vor-adf-2>
</ddrmi>
<dme n="0"> <dme n="0">
<frequencies> <frequencies>
<selected-mhz type="double">111.15</selected-mhz> <selected-mhz type="double">111.15</selected-mhz>
@ -863,20 +868,6 @@
<volume type="double">0</volume> <volume type="double">0</volume>
</dme> </dme>
<efis n="0">
<input n="0">
<vor-adf-1 type="int">2</vor-adf-1>
<vor-adf-2 type="int">2</vor-adf-2>
</input>
</efis>
<efis n="1">
<input n="0">
<vor-adf-1 type="int">2</vor-adf-1>
<vor-adf-2 type="int">2</vor-adf-2>
</input>
</efis>
<nav n="0"> <nav n="0">
<frequencies> <frequencies>
<selected-mhz type="double">111.15</selected-mhz> <selected-mhz type="double">111.15</selected-mhz>

View file

@ -120,16 +120,17 @@
</offsets> </offsets>
</model> </model>
<!-- VOR Instrument --> <!-- DDRMI Instrument -->
<!--model> <model>
<path>Aircraft/IDG-A32X/Models/Instruments/VOR/VOR.xml</path> <path>Aircraft/IDG-A32X/Models/Instruments/DDRMI/DDRMI.xml</path>
<offsets> <offsets>
<x-m>-0.51846</x-m> <x-m>-0.516286</x-m>
<y-m>-0.14098</y-m> <y-m>-0.142488</y-m>
<z-m>0.10572</z-m> <z-m>0.098057</z-m>
<pitch-deg>-16.534</pitch-deg> <heading-deg>90</heading-deg>
<roll-deg>73.5</roll-deg>
</offsets> </offsets>
</model--> </model>
<!-- Brakes Pressure Indicator --> <!-- Brakes Pressure Indicator -->
<model> <model>
@ -2907,14 +2908,7 @@
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis/input/vor-adf-1</property> <property>instrumentation/efis[0]/input/lh-vor-adf</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>2</value> <!-- ADF -->
</binding>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis/input/lh-vor-adf</property>
<value>0</value> <!-- OFF --> <value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR --> <value>1</value> <!-- VOR -->
<value>-1</value> <!-- ADF --> <value>-1</value> <!-- ADF -->
@ -2925,14 +2919,7 @@
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis/input/vor-adf-1</property> <property>instrumentation/efis[0]/input/lh-vor-adf</property>
<value>2</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis/input/lh-vor-adf</property>
<value>-1</value> <!-- ADF --> <value>-1</value> <!-- ADF -->
<value>1</value> <!-- VOR --> <value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF --> <value>0</value> <!-- OFF -->
@ -2942,7 +2929,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>vor-adf-1</object-name> <object-name>vor-adf-1</object-name>
<property>instrumentation/efis/input/lh-vor-adf</property> <property>instrumentation/efis[0]/input/lh-vor-adf</property>
<interpolation> <interpolation>
<entry><ind>-1</ind><dep>-25</dep></entry> <entry><ind>-1</ind><dep>-25</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry> <entry><ind> 0</ind><dep> 0</dep></entry>
@ -2959,13 +2946,6 @@
<action> <action>
<button>0</button> <button>0</button>
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis[1]/input/vor-adf-1</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>2</value> <!-- ADF -->
</binding>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis[1]/input/lh-vor-adf</property> <property>instrumentation/efis[1]/input/lh-vor-adf</property>
@ -2977,13 +2957,6 @@
<action> <action>
<button>1</button> <button>1</button>
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis[1]/input/vor-adf-1</property>
<value>2</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis[1]/input/lh-vor-adf</property> <property>instrumentation/efis[1]/input/lh-vor-adf</property>
@ -3015,14 +2988,7 @@
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis/input/vor-adf-2</property> <property>instrumentation/efis[0]/input/rh-vor-adf</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>2</value> <!-- ADF -->
</binding>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis/input/rh-vor-adf</property>
<value>0</value> <!-- OFF --> <value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR --> <value>1</value> <!-- VOR -->
<value>-1</value> <!-- ADF --> <value>-1</value> <!-- ADF -->
@ -3033,14 +2999,7 @@
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis/input/vor-adf-2</property> <property>instrumentation/efis[0]/input/rh-vor-adf</property>
<value>2</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis/input/rh-vor-adf</property>
<value>-1</value> <!-- ADF --> <value>-1</value> <!-- ADF -->
<value>1</value> <!-- VOR --> <value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF --> <value>0</value> <!-- OFF -->
@ -3050,7 +3009,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>vor-adf-2</object-name> <object-name>vor-adf-2</object-name>
<property>instrumentation/efis/input/rh-vor-adf</property> <property>instrumentation/efis[0]/input/rh-vor-adf</property>
<interpolation> <interpolation>
<entry><ind>-1</ind><dep>-25</dep></entry> <entry><ind>-1</ind><dep>-25</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry> <entry><ind> 0</ind><dep> 0</dep></entry>
@ -3067,13 +3026,6 @@
<action> <action>
<button>0</button> <button>0</button>
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis[1]/input/vor-adf-2</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>2</value> <!-- ADF -->
</binding>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis[1]/input/rh-vor-adf</property> <property>instrumentation/efis[1]/input/rh-vor-adf</property>
@ -3085,13 +3037,6 @@
<action> <action>
<button>1</button> <button>1</button>
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/efis[1]/input/vor-adf-2</property>
<value>2</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/efis[1]/input/rh-vor-adf</property> <property>instrumentation/efis[1]/input/rh-vor-adf</property>

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
############################################
# Copyright (c) Thorsten Herrmann (TH-555) #
############################################
-->
<PropertyList>
<path>res/DDRMI.ac</path>
<!-- Lighting -->
<animation>
<name>DDRMI inside illumination</name>
<type>material</type>
<object-name>ddrmi_inside</object-name>
<object-name>ddrmi_pointer_1_vor</object-name>
<object-name>ddrmi_pointer_1_adf</object-name>
<object-name>ddrmi_pointer_2_vor</object-name>
<object-name>ddrmi_pointer_2_adf</object-name>
<object-name>ddrmi_vor_adf_flag_1</object-name>
<object-name>ddrmi_vor_adf_flag_2</object-name>
<object-name>ddrmi_hdg</object-name>
<emission>
<red>0.50</red>
<green>0.35</green>
<blue>0.2</blue>
<factor-prop>controls/lighting/main-panel-norm</factor-prop>
</emission>
</animation>
<!-- heading and pointer -->
<animation>
<name>Heading rotate</name>
<type>rotate</type>
<object-name>ddrmi_hdg</object-name>
<property>instrumentation/ddrmi/heading</property>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
</animation>
<animation>
<name>VOR1 rotate</name>
<object-name>ddrmi_pointer_1</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/needle-1</property>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
</animation>
<animation>
<name>VOR2 rotate</name>
<object-name>ddrmi_pointer_2</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/needle-2</property>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
</animation>
<!-- Knobs -->
<animation>
<type>pick</type>
<object-name>ddrmi_vor_adf_select_1</object-name>
<action>
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/ddrmi/vor-adf-1</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>-1</value> <!-- ADF -->
</binding>
</action>
<action>
<button>1</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/ddrmi/vor-adf-1</property>
<value>-1</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
</action>
</animation>
<animation>
<name>Knob 1 rotate</name>
<object-name>ddrmi_vor_adf_select_1</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/vor-adf-1</property>
<interpolation>
<entry><ind>-1</ind><dep>90</dep></entry>
<entry><ind> 0</ind><dep>45</dep></entry>
<entry><ind> 1</ind><dep> 0</dep></entry>
</interpolation>
<axis>
<object-name>ddrmi_vor_adf_select_1.axis</object-name>
</axis>
</animation>
<animation>
<type>pick</type>
<object-name>ddrmi_vor_adf_select_2</object-name>
<action>
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/ddrmi/vor-adf-2</property>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- VOR -->
<value>-1</value> <!-- ADF -->
</binding>
</action>
<action>
<button>1</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<property>instrumentation/ddrmi/vor-adf-2</property>
<value>-1</value> <!-- ADF -->
<value>1</value> <!-- VOR -->
<value>0</value> <!-- OFF -->
</binding>
</action>
</animation>
<animation>
<name>Knob 2 rotate</name>
<object-name>ddrmi_vor_adf_select_2</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/vor-adf-2</property>
<interpolation>
<entry><ind>-1</ind><dep>-90</dep></entry>
<entry><ind> 0</ind><dep>-45</dep></entry>
<entry><ind> 1</ind><dep> 0</dep></entry>
</interpolation>
<axis>
<object-name>ddrmi_vor_adf_select_2.axis</object-name>
</axis>
</animation>
<!-- Flags -->
<animation>
<name>Flag 1 rotate</name>
<object-name>ddrmi_vor_adf_flag_1</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/flag-1</property>
<interpolation>
<entry><ind>0</ind><dep>45</dep></entry>
<entry><ind>1</ind><dep> 0</dep></entry>
</interpolation>
<axis>
<object-name>ddrmi_vor_adf_flag_1.axis</object-name>
</axis>
</animation>
<animation>
<name>Flag 2 rotate</name>
<object-name>ddrmi_vor_adf_flag_2</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/flag-2</property>
<interpolation>
<entry><ind>0</ind><dep>-45</dep></entry>
<entry><ind>1</ind><dep> 0</dep></entry>
</interpolation>
<axis>
<object-name>ddrmi_vor_adf_flag_2.axis</object-name>
</axis>
</animation>
</PropertyList>

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 KiB

View file

@ -1,163 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<PropertyList>
<path>res/vor2.ac</path>
<!-- ANIMATIONS -->
<!-- Lighting -->
<animation>
<name>Standby VOR display illumination</name>
<type>material</type>
<object-name>Face</object-name>
<object-name>InsideFrame</object-name>
<object-name>Needle1ADF</object-name>
<object-name>Needle1VOR</object-name>
<object-name>Needle2ADF</object-name>
<object-name>Needle2VOR</object-name>
<emission>
<red>0.4</red>
<green>0.35</green>
<blue>0.21</blue>
<factor-prop>controls/lighting/instruments-norm</factor-prop>
</emission>
</animation>
<!-- Face and needles -->
<animation>
<name>Heading rotate</name>
<type>rotate</type>
<object-name>Face</object-name>
<object-name>Needle1VOR</object-name>
<object-name>Needle2VOR</object-name>
<property>orientation/heading-magnetic-deg</property>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
<animation>
<name>VOR1 select</name>
<type>select</type>
<object-name>Needle1VOR</object-name>
<condition>
<equals>
<property>instrumentation/efis/input/vor-adf-1</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<name>VOR1 rotate</name>
<type>rotate</type>
<object-name>Needle1VOR</object-name>
<property>instrumentation/nav[0]/heading-deg</property>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
<animation>
<name>ADF1 select</name>
<type>select</type>
<object-name>Needle1ADF</object-name>
<condition>
<equals>
<property>instrumentation/efis/input/vor-adf-2</property>
<value>2</value>
</equals>
</condition>
</animation>
<animation>
<name>ADF1 rotate</name>
<type>rotate</type>
<object-name>Needle1ADF</object-name>
<property>instrumentation/adf[0]/indicated-bearing-deg</property>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
<animation>
<name>VOR2 select</name>
<type>select</type>
<object-name>Needle2VOR</object-name>
<condition>
<equals>
<property>instrumentation/efis/input/vor-adf-2</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<name>VOR2 rotate</name>
<type>rotate</type>
<object-name>Needle2VOR</object-name>
<property>instrumentation/nav[1]/heading-deg</property>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
<animation>
<name>ADF2 select</name>
<type>select</type>
<object-name>Needle2ADF</object-name>
<condition>
<equals>
<property>instrumentation/efis/input/vor-adf-2</property>
<value>2</value>
</equals>
</condition>
</animation>
<animation>
<name>ADF2 rotate</name>
<type>rotate</type>
<object-name>Needle2ADF</object-name>
<property>instrumentation/adf[1]/indicated-bearing-deg</property>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
</PropertyList>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

View file

@ -1,288 +0,0 @@
AC3Db
MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
kids 6
OBJECT poly
name "Face"
loc -0.00377606 -0.000360075 -0.000318891
data 10
Circle.005
texture "vor.png"
crease 30.000000
numvert 21
0.00412091 0.0187418 -0.0180628
0.00410561 0.0235229 -0.0114837
0.00407855 0.0260363 -0.00374789
0.00404206 0.0260363 0.00438567
0.00400088 0.023524 0.0121215
0.00395734 0.018743 0.0187017
0.00391616 0.0121627 0.0234828
0.00388321 0.00442686 0.0259963
0.00385849 -0.0037067 0.0259963
0.00384791 -0.0114425 0.0234828
0.00384908 -0.0180228 0.0187017
0.00386556 -0.0228039 0.0121215
0.00389262 -0.0253173 0.00438567
0.00392793 -0.0253173 -0.00374789
0.00397028 -0.0228039 -0.0114837
0.00401383 -0.0180228 -0.018064
0.00405383 -0.0114425 -0.0228439
0.00408796 -0.00370788 -0.0253574
0.0041115 0.00442686 -0.0253574
0.00412326 0.0121615 -0.0228439
0.00398559 0.00036008 0.000318894
numsurf 20
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
0 0.438687 0.874232
1 0.399509 0.920707
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
1 0.399509 0.920707
2 0.347886 0.952802
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
2 0.347886 0.952802
3 0.288873 0.967373
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
3 0.288873 0.967373
4 0.228246 0.962995
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
4 0.228246 0.962995
5 0.171939 0.940096
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
5 0.171939 0.940096
6 0.125464 0.900918
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
6 0.125464 0.900918
7 0.0933709 0.849296
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
7 0.0933709 0.849296
8 0.0788002 0.790282
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
8 0.0788002 0.790282
9 0.0831788 0.729654
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
9 0.0831788 0.729654
10 0.106078 0.673346
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
10 0.106078 0.673346
11 0.145256 0.626871
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
11 0.145256 0.626871
12 0.196878 0.594777
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
12 0.196878 0.594777
13 0.255891 0.580205
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
13 0.255891 0.580205
14 0.316518 0.584583
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
14 0.316518 0.584583
15 0.372825 0.607482
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
15 0.372825 0.607482
16 0.4193 0.64666
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
16 0.4193 0.64666
17 0.451394 0.698283
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
17 0.451394 0.698283
18 0.465964 0.757296
SURF 0x0
mat 0
refs 3
20 0.272382 0.773789
18 0.465964 0.757296
19 0.461586 0.817924
SURF 0x0
mat 0
refs 3
19 0.461586 0.817924
0 0.438687 0.874232
20 0.272382 0.773789
kids 0
OBJECT poly
name "InsideFrame"
loc 0.317713 -0.00080076 -0.000320395
data 10
Circle.001
texture "vor.png"
crease 30.000000
numvert 8
-0.315987 0.0426377 0.0285367
-0.315987 0.0426377 0.0285367
-0.315987 -0.0126211 0.0285367
-0.316096 0.0426377 -0.0285772
-0.316119 -0.0127248 -0.0285772
-0.316128 -0.0299827 -0.00925837
-0.316119 -0.0299047 0.00962107
-0.316096 0.0426377 -0.0285772
numsurf 1
SURF 0x0
mat 0
refs 28
3 0.450473 0.517578
7 0.450473 0.517578
0 0.0468211 0.517578
1 0.0468211 0.517578
2 0.0468211 0.132656
6 0.180507 0.0122622
5 0.313937 0.0117188
4 0.450473 0.131934
3 0.450473 0.517578
7 0.450473 0.517578
0 0.0468211 0.517578
1 0.0468211 0.517578
2 0.0468211 0.132656
6 0.180507 0.0122622
5 0.313937 0.0117188
4 0.450473 0.131934
3 0.450473 0.517578
7 0.450473 0.517578
0 0.0468211 0.517578
1 0.0468211 0.517578
2 0.0468211 0.132656
6 0.180507 0.0122622
5 0.313937 0.0117188
4 0.450473 0.131934
3 0.450473 0.517578
7 0.450473 0.517578
0 0.0468211 0.517578
1 0.0468211 0.517578
kids 0
OBJECT poly
name "Needle1ADF"
loc -0.00377606 -0.000360075 -0.000318891
data 5
Plane
texture "vor.png"
crease 30.000000
numvert 4
0.00463514 -0.0219825 -0.00585893
0.00463514 -0.0219931 0.00583893
0.00433507 0.0218801 0.00587777
0.00433507 0.0218907 -0.00582011
numsurf 1
SURF 0x0
mat 0
refs 4
0 0.677251 0.0843226
3 0.677251 0.381459
2 0.598029 0.381459
1 0.598029 0.0843226
kids 0
OBJECT poly
name "Needle1VOR"
loc -0.00377606 -0.000360075 -0.000318891
data 9
Plane.002
texture "vor.png"
crease 30.000000
numvert 4
0.00463514 -0.0219825 -0.00585893
0.00463514 -0.0219931 0.00583893
0.00433507 0.0218801 0.00587777
0.00433507 0.0218907 -0.00582011
numsurf 1
SURF 0x0
mat 0
refs 4
0 0.677251 0.0843226
3 0.677251 0.381459
2 0.598029 0.381459
1 0.598029 0.0843226
kids 0
OBJECT poly
name "Needle2ADF"
loc -0.00377606 -0.000360075 -0.000318891
data 9
Plane.003
texture "vor.png"
crease 30.000000
numvert 4
0.00442215 -0.0220001 -0.0058354
0.00442215 -0.0219966 0.00586247
0.00412091 0.0218766 0.00585423
0.00412091 0.0218719 -0.00584364
numsurf 1
SURF 0x0
mat 0
refs 4
0 0.809572 0.0863363
3 0.809572 0.385523
2 0.731864 0.385523
1 0.731864 0.0863364
kids 0
OBJECT poly
name "Needle2VOR"
loc -0.00377606 -0.000360075 -0.000318891
data 9
Plane.001
texture "vor.png"
crease 30.000000
numvert 4
0.00442215 -0.0220001 -0.0058354
0.00442215 -0.0219966 0.00586247
0.00412091 0.0218766 0.00585423
0.00412091 0.0218719 -0.00584364
numsurf 1
SURF 0x0
mat 0
refs 4
0 0.809572 0.0863363
3 0.809572 0.385523
2 0.731864 0.385523
1 0.731864 0.0863364
kids 0

View file

@ -1739,20 +1739,24 @@
<channel name="Flaps"> <channel name="Flaps">
<kinematic name="rubbish/flap-pos-deg"> <pure_gain name="fcs/flap-pos-gain">
<input>/controls/flight/flaps</input> <input>/controls/flight/flaps</input>
<traverse> <gain>30.0</gain>
<setting> </pure_gain>
<position>0</position>
<time>0</time> <switch name="fcs/flap-pos-rate">
</setting> <default value="0.0"/>
<setting> <test logic="OR" value="0.85714285">
<position>35</position> /systems/hydraulic/green-psi ge 1500
<time>30</time> /systems/hydraulic/yellow-psi ge 1500
</setting> </test>
</traverse> </switch>
<actuator name="rubbish/flap-pos-deg">
<input>fcs/flap-pos-gain</input>
<rate_limit>fcs/flap-pos-rate</rate_limit>
<output>fcs/flap-pos-deg</output> <output>fcs/flap-pos-deg</output>
</kinematic> </actuator>
<aerosurface_scale name="rubbish/flap-pos-norm"> <aerosurface_scale name="rubbish/flap-pos-norm">
<input>fcs/flap-pos-deg</input> <input>fcs/flap-pos-deg</input>
@ -1771,20 +1775,25 @@
<channel name="Slats"> <channel name="Slats">
<kinematic name="rubbish/slat-pos-deg"> <pure_gain name="fcs/slat-pos-gain">
<input>/controls/flight/slats</input> <input>/controls/flight/slats</input>
<traverse> <gain>27.0</gain>
<setting> </pure_gain>
<position>0</position>
<time>0</time> <switch name="fcs/slat-pos-rate">
</setting> <default value="0.0"/>
<setting> <test logic="OR" value="0.74074074">
<position>27</position> /systems/hydraulic/blue-psi ge 1500
<time>20</time> /systems/hydraulic/green-psi ge 1500
</setting> /systems/hydraulic/yellow-psi ge 1500
</traverse> </test>
</switch>
<actuator name="rubbish/slat-pos-deg">
<input>fcs/slat-pos-gain</input>
<rate_limit>fcs/slat-pos-rate</rate_limit>
<output>fcs/slat-pos-deg</output> <output>fcs/slat-pos-deg</output>
</kinematic> </actuator>
<aerosurface_scale name="rubbish/slat-pos-norm"> <aerosurface_scale name="rubbish/slat-pos-norm">
<input>fcs/slat-pos-deg</input> <input>fcs/slat-pos-deg</input>

View file

@ -889,5 +889,309 @@
<max>1.0</max> <max>1.0</max>
</config> </config>
</pi-simple-controller> </pi-simple-controller>
<filter>
<name>DDRMI: Heading</name>
<type>gain</type>
<gain>1.0</gain>
<enable>
<condition>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</enable>
<input>/orientation/heading-magnetic-deg</input>
<output>/instrumentation/ddrmi/heading</output>
</filter>
<filter>
<name>DDRMI: VOR 1 Error</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<property>/instrumentation/nav[2]/heading-deg</property>
<offset>
<property>/orientation/heading-deg</property>
<scale>-1.0</scale>
</offset>
</input>
<output>/instrumentation/ddrmi/vor-1-error</output>
<period>
<min>-180</min>
<max>180</max>
</period>
</filter>
<filter>
<name>DDRMI: Needle 1</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
<value>1</value>
</equals>
<equals>
<property>/instrumentation/nav[2]/in-range</property>
<value>1</value>
</equals>
</and>
</condition>
<property>/instrumentation/ddrmi/vor-1-error</property>
<scale>-1.0</scale>
</input>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
<value>-1</value>
</equals>
<equals>
<property>/instrumentation/adf[0]/in-range</property>
<value>1</value>
</equals>
</and>
</condition>
<property>/instrumentation/adf[0]/indicated-bearing-deg</property>
<scale>-1.0</scale>
</input>
<input>-90</input>
<output>/instrumentation/ddrmi/needle-1</output>
</filter>
<filter>
<name>DDRMI: VOR 2 Error</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<property>/instrumentation/nav[3]/heading-deg</property>
<offset>
<property>/orientation/heading-deg</property>
<scale>-1.0</scale>
</offset>
</input>
<output>/instrumentation/ddrmi/vor-2-error</output>
<period>
<min>-180</min>
<max>180</max>
</period>
</filter>
<filter>
<name>DDRMI: Needle 2</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
<value>1</value>
</equals>
<equals>
<property>/instrumentation/nav[3]/in-range</property>
<value>1</value>
</equals>
</and>
</condition>
<property>/instrumentation/ddrmi/vor-2-error</property>
<scale>-1.0</scale>
</input>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
<value>-1</value>
</equals>
<equals>
<property>/instrumentation/adf[1]/in-range</property>
<value>1</value>
</equals>
</and>
</condition>
<property>/instrumentation/adf[1]/indicated-bearing-deg</property>
<scale>-1.0</scale>
</input>
<input>-90</input>
<output>/instrumentation/ddrmi/needle-2</output>
</filter>
<filter>
<name>DDRMI: FLAG 1</name>
<debug>false</debug>
<type>exponential</type>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<or>
<and>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
<value>1</value>
</equals>
<equals>
<property>/instrumentation/nav[2]/in-range</property>
<value>1</value>
</equals>
</and>
<and>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
<value>-1</value>
</equals>
<equals>
<property>/instrumentation/adf[0]/in-range</property>
<value>1</value>
</equals>
</and>
</or>
</and>
</condition>
<value>0</value>
</input>
<input>1</input>
<output>/instrumentation/ddrmi/flag-1</output>
<filter-time>0.64</filter-time>
</filter>
<filter>
<name>DDRMI: FLAG 2</name>
<debug>false</debug>
<type>exponential</type>
<input>
<condition>
<and>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
<or>
<and>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
<value>1</value>
</equals>
<equals>
<property>/instrumentation/nav[3]/in-range</property>
<value>1</value>
</equals>
</and>
<and>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
<value>-1</value>
</equals>
<equals>
<property>/instrumentation/adf[1]/in-range</property>
<value>1</value>
</equals>
</and>
</or>
</and>
</condition>
<value>0</value>
</input>
<input>1</input>
<output>/instrumentation/ddrmi/flag-2</output>
<filter-time>0.64</filter-time>
</filter>
</PropertyList> </PropertyList>

View file

@ -1 +1 @@
4674 4677