Merge branch 'master' into dome-light
This commit is contained in:
Jonathan Redpath
commit
b1589fff02
12 changed files with 503 additions and 981 deletions
|
|
@ -717,6 +717,13 @@
|
|||
</services>
|
||||
|
||||
<systems>
|
||||
<electrical n="0">
|
||||
<bus n="0">
|
||||
<dc-ess>0</dc-ess>
|
||||
<dc1>0</dc1>
|
||||
<dc2>0</dc2>
|
||||
</bus>
|
||||
</electrical>
|
||||
<failures n="0">
|
||||
<aileron-left type="bool">0</aileron-left>
|
||||
<aileron-right type="bool">0</aileron-right>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<path>res/Radio1.ac</path>
|
||||
<path>res/Radio.ac</path>
|
||||
|
||||
<!-- On Switch -->
|
||||
<animation>
|
||||
|
|
@ -1027,48 +1027,10 @@
|
|||
<property>controls/radio/rmp[0]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<or>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf2</value>
|
||||
<property>systems/radio/rmp[0]/sel-light</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">hf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">hf2</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">hf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">hf2</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[2]/sel_chan</property>
|
||||
<value type="string">vhf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[2]/sel_chan</property>
|
||||
<value type="string">vhf2</value>
|
||||
</equals>
|
||||
</or>
|
||||
</and>
|
||||
</or>
|
||||
</condition>
|
||||
|
|
@ -1390,18 +1352,6 @@
|
|||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<not>
|
||||
<and>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
|
@ -1431,61 +1381,6 @@
|
|||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- VHF3 Data Mode-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
<object-name>rmp-active-vhf3-data</object-name>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>controls/switches/annun-test</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>controls/radio/rmp[0]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
||||
<text>
|
||||
<name>rmp-active-vhf3-data</name>
|
||||
<offsets>
|
||||
<x-m>-0.23205</x-m>
|
||||
<y-m>-0.21625</y-m>
|
||||
<z-m>-0.12582</z-m>
|
||||
<heading-deg>90</heading-deg>
|
||||
</offsets>
|
||||
<alignment>center-center</alignment>
|
||||
<axis-alignment>xy-plane</axis-alignment>
|
||||
<type type="string">text-value</type>
|
||||
<format type="string">data</format>
|
||||
<property>autopilot/servicable</property>
|
||||
<truncate type="bool">false</truncate>
|
||||
<font type="string">led.txf</font>
|
||||
<draw-text type="bool">true</draw-text>
|
||||
<draw-alignment type="bool">false</draw-alignment>
|
||||
<draw-boundingbox type="bool">false</draw-boundingbox>
|
||||
<character-size>0.008</character-size>
|
||||
<font-resolution>
|
||||
<width type="int">32</width>
|
||||
<height type="int">32</height>
|
||||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- Test Illumination-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
|
|
@ -1541,18 +1436,6 @@
|
|||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<not>
|
||||
<and>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/vhf3-standby</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
|
@ -1582,61 +1465,6 @@
|
|||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- VHF3 Data Mode-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
<object-name>rmp-standby-vhf3-data</object-name>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>controls/switches/annun-test</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>controls/radio/rmp[0]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/vhf3-standby</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
||||
<text>
|
||||
<name>rmp-standby-vhf3-data</name>
|
||||
<offsets>
|
||||
<x-m>-0.23205</x-m>
|
||||
<y-m>-0.14896</y-m>
|
||||
<z-m>-0.12582</z-m>
|
||||
<heading-deg>90</heading-deg>
|
||||
</offsets>
|
||||
<alignment>center-center</alignment>
|
||||
<axis-alignment>xy-plane</axis-alignment>
|
||||
<type type="string">text-value</type>
|
||||
<format type="string">data</format>
|
||||
<property>autopilot/servicable</property>
|
||||
<truncate type="bool">false</truncate>
|
||||
<font type="string">led.txf</font>
|
||||
<draw-text type="bool">true</draw-text>
|
||||
<draw-alignment type="bool">false</draw-alignment>
|
||||
<draw-boundingbox type="bool">false</draw-boundingbox>
|
||||
<character-size>0.008</character-size>
|
||||
<font-resolution>
|
||||
<width type="int">32</width>
|
||||
<height type="int">32</height>
|
||||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- Test Illumination-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
|
|
@ -1679,10 +1507,8 @@
|
|||
<type>material</type>
|
||||
<object-name>rmp-active</object-name>
|
||||
<object-name>rmp-active-test</object-name>
|
||||
<object-name>rmp-active-vhf3-data</object-name>
|
||||
<object-name>rmp-standby</object-name>
|
||||
<object-name>rmp-standby-test</object-name>
|
||||
<object-name>rmp-standby-vhf3-data</object-name>
|
||||
<diffuse>
|
||||
<red>0.89</red>
|
||||
<green>0.37</green>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<path>res/Radio1.ac</path>
|
||||
<path>res/Radio.ac</path>
|
||||
|
||||
<!-- On Switch -->
|
||||
<animation>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -190,7 +190,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -222,11 +222,11 @@
|
|||
<repeatable>true</repeatable>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>rmp.transfer(2);</script>
|
||||
<script>rmp.transfer(1);</script>
|
||||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -253,7 +253,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -307,7 +307,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -329,9 +329,9 @@
|
|||
<command>property-adjust</command>
|
||||
<property>systems/radio/rmp[1]/vhf3-standby</property>
|
||||
<step>0.025</step>
|
||||
<resolution>0.025</resolution>
|
||||
<min>0.0</min>
|
||||
<max>1.0</max>
|
||||
<resolution>0.025</resolution>
|
||||
<wrap>true</wrap>
|
||||
<mask>decimal</mask>
|
||||
</binding>
|
||||
|
|
@ -340,7 +340,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -365,7 +365,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -396,7 +396,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -423,7 +423,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -439,9 +439,9 @@
|
|||
<command>property-adjust</command>
|
||||
<property>systems/radio/rmp[1]/vhf2-standby</property>
|
||||
<step>-0.025</step>
|
||||
<resolution>0.025</resolution>
|
||||
<min>0.0</min>
|
||||
<max>1.0</max>
|
||||
<resolution>0.025</resolution>
|
||||
<wrap>true</wrap>
|
||||
<mask>decimal</mask>
|
||||
</binding>
|
||||
|
|
@ -450,7 +450,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -472,9 +472,9 @@
|
|||
<command>property-adjust</command>
|
||||
<property>systems/radio/rmp[1]/vhf3-standby</property>
|
||||
<step>-0.025</step>
|
||||
<resolution>0.025</resolution>
|
||||
<min>0.0</min>
|
||||
<max>1.0</max>
|
||||
<resolution>0.025</resolution>
|
||||
<wrap>true</wrap>
|
||||
<mask>decimal</mask>
|
||||
</binding>
|
||||
|
|
@ -483,7 +483,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -508,7 +508,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -543,7 +543,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -569,7 +569,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -595,7 +595,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -627,7 +627,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -653,7 +653,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -685,7 +685,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -711,7 +711,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -737,7 +737,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -769,7 +769,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -795,7 +795,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -867,7 +867,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -898,7 +898,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -928,7 +928,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -958,7 +958,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -987,7 +987,7 @@
|
|||
<condition>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1020,55 +1020,17 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
<property>controls/radio/rmp[1]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<or>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf2</value>
|
||||
<property>systems/radio/rmp[1]/sel-light</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">hf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[0]/sel_chan</property>
|
||||
<value type="string">hf2</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">hf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">hf2</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[2]/sel_chan</property>
|
||||
<value type="string">vhf1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[2]/sel_chan</property>
|
||||
<value type="string">vhf2</value>
|
||||
</equals>
|
||||
</or>
|
||||
</and>
|
||||
</or>
|
||||
</condition>
|
||||
|
|
@ -1086,7 +1048,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1113,7 +1075,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1140,7 +1102,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1167,7 +1129,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1194,7 +1156,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1221,7 +1183,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1248,7 +1210,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1275,7 +1237,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1302,7 +1264,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1329,7 +1291,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1356,7 +1318,7 @@
|
|||
</equals>
|
||||
<and>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
|
|
@ -1387,21 +1349,9 @@
|
|||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<not>
|
||||
<and>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
|
@ -1431,61 +1381,6 @@
|
|||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- VHF3 Data Mode-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
<object-name>rmp-active-vhf3-data</object-name>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>controls/switches/annun-test</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>controls/radio/rmp[1]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
||||
<text>
|
||||
<name>rmp-active-vhf3-data</name>
|
||||
<offsets>
|
||||
<x-m>-0.23205</x-m>
|
||||
<y-m>-0.21625</y-m>
|
||||
<z-m>-0.12582</z-m>
|
||||
<heading-deg>90</heading-deg>
|
||||
</offsets>
|
||||
<alignment>center-center</alignment>
|
||||
<axis-alignment>xy-plane</axis-alignment>
|
||||
<type type="string">text-value</type>
|
||||
<format type="string">data</format>
|
||||
<property>autopilot/servicable</property>
|
||||
<truncate type="bool">false</truncate>
|
||||
<font type="string">led.txf</font>
|
||||
<draw-text type="bool">true</draw-text>
|
||||
<draw-alignment type="bool">false</draw-alignment>
|
||||
<draw-boundingbox type="bool">false</draw-boundingbox>
|
||||
<character-size>0.008</character-size>
|
||||
<font-resolution>
|
||||
<width type="int">32</width>
|
||||
<height type="int">32</height>
|
||||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- Test Illumination-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
|
|
@ -1538,21 +1433,9 @@
|
|||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<not>
|
||||
<and>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/vhf3-standby</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
|
@ -1582,61 +1465,6 @@
|
|||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- VHF3 Data Mode-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
<object-name>rmp-standby-vhf3-data</object-name>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>controls/switches/annun-test</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>controls/radio/rmp[1]/on</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc2</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/sel_chan</property>
|
||||
<value type="string">vhf3</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>systems/radio/rmp[1]/vhf3-standby</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
</animation>
|
||||
|
||||
<text>
|
||||
<name>rmp-standby-vhf3-data</name>
|
||||
<offsets>
|
||||
<x-m>-0.23205</x-m>
|
||||
<y-m>-0.14896</y-m>
|
||||
<z-m>-0.12582</z-m>
|
||||
<heading-deg>90</heading-deg>
|
||||
</offsets>
|
||||
<alignment>center-center</alignment>
|
||||
<axis-alignment>xy-plane</axis-alignment>
|
||||
<type type="string">text-value</type>
|
||||
<format type="string">data</format>
|
||||
<property>autopilot/servicable</property>
|
||||
<truncate type="bool">false</truncate>
|
||||
<font type="string">led.txf</font>
|
||||
<draw-text type="bool">true</draw-text>
|
||||
<draw-alignment type="bool">false</draw-alignment>
|
||||
<draw-boundingbox type="bool">false</draw-boundingbox>
|
||||
<character-size>0.008</character-size>
|
||||
<font-resolution>
|
||||
<width type="int">32</width>
|
||||
<height type="int">32</height>
|
||||
</font-resolution>
|
||||
</text>
|
||||
|
||||
<!-- Test Illumination-->
|
||||
<animation>
|
||||
<type>select</type>
|
||||
|
|
@ -1679,10 +1507,8 @@
|
|||
<type>material</type>
|
||||
<object-name>rmp-active</object-name>
|
||||
<object-name>rmp-active-test</object-name>
|
||||
<object-name>rmp-active-vhf3-data</object-name>
|
||||
<object-name>rmp-standby</object-name>
|
||||
<object-name>rmp-standby-test</object-name>
|
||||
<object-name>rmp-standby-vhf3-data</object-name>
|
||||
<diffuse>
|
||||
<red>0.89</red>
|
||||
<green>0.37</green>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
|
|||
##########
|
||||
# Lights #
|
||||
##########
|
||||
|
||||
var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2);
|
||||
var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon");
|
||||
var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2);
|
||||
|
|
@ -209,6 +210,7 @@ var systemsLoop = maketimer(0.1, func {
|
|||
libraries.ECAM.loop();
|
||||
libraries.BUTTONS.update();
|
||||
fadec.FADEC.loop();
|
||||
rmp.rmpUpdate();
|
||||
|
||||
if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/switches/cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) {
|
||||
setprop("/controls/switches/cart", 0);
|
||||
|
|
|
|||
|
|
@ -7,29 +7,31 @@
|
|||
|
||||
# GLOBAL TODO add stuff for HF1, HF2, VOR, LS and ADF
|
||||
|
||||
var rmp_update = nil;
|
||||
var chan_rmp1_v = "vhr1";
|
||||
var chan_rmp2_v = "vhr2";
|
||||
var chan_rmp3_v = "vhr3";
|
||||
|
||||
var act_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz");
|
||||
var act_vhf2 = props.globals.getNode("/instrumentation/comm[1]/frequencies/selected-mhz");
|
||||
var act_vhf3 = props.globals.getNode("/instrumentation/comm[2]/frequencies/selected-mhz");
|
||||
|
||||
var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "123.900", "STRING");
|
||||
var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "118.700", "STRING");
|
||||
var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 118.7, "DOUBLE");
|
||||
var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 123.12, "DOUBLE");
|
||||
var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 121.5, "DOUBLE");
|
||||
var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "118.700", "STRING");
|
||||
var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "121.400", "STRING");
|
||||
var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 121.4, "DOUBLE");
|
||||
var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 122.6, "DOUBLE");
|
||||
var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 123.2, "DOUBLE");
|
||||
|
||||
var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "127.900", "STRING");
|
||||
var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "123.125", "STRING");
|
||||
var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 118.7, "DOUBLE");
|
||||
var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 123.12, "DOUBLE");
|
||||
var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 121.5, "DOUBLE");
|
||||
var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "119.400", "STRING");
|
||||
var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "122.600", "STRING");
|
||||
var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 121.4, "DOUBLE");
|
||||
var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 122.6, "DOUBLE");
|
||||
var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 123.2, "DOUBLE");
|
||||
|
||||
var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "127.900", "STRING");
|
||||
var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.125", "STRING");
|
||||
var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 118.7, "DOUBLE");
|
||||
var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 123.12, "DOUBLE");
|
||||
var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 121.5, "DOUBLE");
|
||||
var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "data", "STRING");
|
||||
var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.200", "STRING");
|
||||
var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 121.4, "DOUBLE");
|
||||
var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 122.6, "DOUBLE");
|
||||
var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 123.2, "DOUBLE");
|
||||
|
||||
var chan_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel_chan", "vhf1", "STRING");
|
||||
var chan_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel_chan", "vhf2", "STRING");
|
||||
|
|
@ -39,6 +41,14 @@ var pwr_sw_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/on", 0, "BOOL")
|
|||
var pwr_sw_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/on", 0, "BOOL");
|
||||
var pwr_sw_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/on", 0, "BOOL");
|
||||
|
||||
var sel_light_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel-light", 0, "BOOL");
|
||||
var sel_light_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel-light", 0, "BOOL");
|
||||
var sel_light_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/sel-light", 0, "BOOL");
|
||||
|
||||
var am_mode_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/am-active", 0, "BOOL");
|
||||
var am_mode_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/am-active", 0, "BOOL");
|
||||
var am_mode_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/am-active", 0, "BOOL");
|
||||
|
||||
var init = func() {
|
||||
for(var i = 0; i < 3; i += 1) {
|
||||
setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510);
|
||||
|
|
@ -51,10 +61,48 @@ var init = func() {
|
|||
pwr_sw_rmp1.setBoolValue(0);
|
||||
pwr_sw_rmp2.setBoolValue(0);
|
||||
pwr_sw_rmp3.setBoolValue(0);
|
||||
}
|
||||
|
||||
var rmp_update = maketimer(0.2, func {
|
||||
rmp_refresh.update();
|
||||
});
|
||||
var rmpUpdate = func() {
|
||||
chan_rmp1_v = chan_rmp1.getValue();
|
||||
chan_rmp2_v = chan_rmp2.getValue();
|
||||
chan_rmp3_v = chan_rmp3.getValue();
|
||||
|
||||
# SEL lights
|
||||
if (chan_rmp1_v == "vhf2" or chan_rmp1_v == "vhf3" or chan_rmp1_v == "hf1" or chan_rmp1_v == "hf2" or chan_rmp2_v == "vhf1" or chan_rmp2_v == "vhf3" or chan_rmp2_v == "hf1" or chan_rmp2_v == "hf2" or chan_rmp3_v == "vhf1" or chan_rmp3_v == "vhf2") {
|
||||
if (sel_light_rmp1.getBoolValue() != 1) {
|
||||
sel_light_rmp1.setBoolValue(1);
|
||||
}
|
||||
if (sel_light_rmp2.getBoolValue() != 1) {
|
||||
sel_light_rmp2.setBoolValue(1);
|
||||
}
|
||||
if (sel_light_rmp3.getBoolValue() != 1) {
|
||||
sel_light_rmp3.setBoolValue(1);
|
||||
}
|
||||
} else {
|
||||
if (sel_light_rmp1.getBoolValue() != 0) {
|
||||
sel_light_rmp1.setBoolValue(0);
|
||||
}
|
||||
if (sel_light_rmp2.getBoolValue() != 0) {
|
||||
sel_light_rmp2.setBoolValue(0);
|
||||
}
|
||||
if (sel_light_rmp3.getBoolValue() != 0) {
|
||||
sel_light_rmp3.setBoolValue(0);
|
||||
}
|
||||
}
|
||||
|
||||
# Disable AM mode if not in HF
|
||||
if (chan_rmp1_v != "hf1" and chan_rmp1_v != "hf2" and am_mode_rmp1.getBoolValue() == 1) {
|
||||
am_mode_rmp1.setBoolValue(0);
|
||||
}
|
||||
|
||||
if (chan_rmp2_v != "hf1" and chan_rmp2_v != "hf2" and am_mode_rmp2.getBoolValue() == 1) {
|
||||
am_mode_rmp2.setBoolValue(0);
|
||||
}
|
||||
|
||||
if (chan_rmp3_v != "hf1" and chan_rmp3_v != "hf2" and am_mode_rmp3.getBoolValue() == 1) {
|
||||
am_mode_rmp3.setBoolValue(0);
|
||||
}
|
||||
}
|
||||
|
||||
var update_active_vhf = func(vhf) {
|
||||
|
|
@ -85,18 +133,26 @@ var update_active_vhf = func(vhf) {
|
|||
act_display_rmp2.setValue(act);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else if (vhf == 3) {
|
||||
if (sel1 == "vhf3" or sel2 == "vhf3") {
|
||||
var act = sprintf("%3.3f", act_vhf3.getValue());
|
||||
|
||||
if (sel1 == "vhf3") {
|
||||
if (act == 0) {
|
||||
act_display_rmp1.setValue("data");
|
||||
} else {
|
||||
act_display_rmp1.setValue(act);
|
||||
}
|
||||
}
|
||||
if (sel2 == "vhf3") {
|
||||
if (act == 0) {
|
||||
act_display_rmp2.setValue("data");
|
||||
} else {
|
||||
act_display_rmp2.setValue(act);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var update_stby_vhf = func(rmp_no, vhf) {
|
||||
|
|
@ -132,7 +188,7 @@ var update_chan_sel = func(rmp_no) {
|
|||
var chan = chan_rmp1.getValue();
|
||||
if (chan == "vhf1") {
|
||||
update_stby_vhf(rmp_no, 1);
|
||||
} else if (chan == "vhf1") {
|
||||
} else if (chan == "vhf2") {
|
||||
update_stby_vhf(rmp_no, 2);
|
||||
} else {
|
||||
update_stby_vhf(rmp_no, 3);
|
||||
|
|
@ -160,7 +216,6 @@ var update_chan_sel = func(rmp_no) {
|
|||
}
|
||||
|
||||
var transfer = func(rmp_no) {
|
||||
|
||||
rmp_no = rmp_no - 1;
|
||||
var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan");
|
||||
|
||||
|
|
|
|||
|
|
@ -1737,7 +1737,8 @@
|
|||
|
||||
</channel>
|
||||
|
||||
<channel name="Flaps">
|
||||
<channel name="SFCC">
|
||||
|
||||
<switch name="fcs/sfcc/unit1-avail">
|
||||
<default value="0"/>
|
||||
<test logic="OR" value="1">
|
||||
|
|
@ -1752,6 +1753,10 @@
|
|||
</test>
|
||||
</switch>
|
||||
|
||||
</channel>
|
||||
|
||||
<channel name="Flaps">
|
||||
|
||||
<pure_gain name="fcs/flap-pos-gain">
|
||||
<input>/controls/flight/flaps</input>
|
||||
<gain>35.0</gain>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Predictors -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<predict-simple>
|
||||
<name>IAS 5 SECOND PREDICTOR</name>
|
||||
|
|
@ -68,15 +66,12 @@
|
|||
<filter-gain>0.0</filter-gain>
|
||||
</predict-simple>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Autopilot Helpers/Calculators -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<filter>
|
||||
<name>AUTOLAND FD FPM</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<expression>
|
||||
<table>
|
||||
|
|
@ -94,7 +89,6 @@
|
|||
<name>AUTOLAND FPM</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<expression>
|
||||
<table>
|
||||
|
|
@ -116,7 +110,6 @@
|
|||
<name>FMGC MNG SPD</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<expression>
|
||||
<product>
|
||||
|
|
@ -138,7 +131,6 @@
|
|||
<name>FMGC MNG MACH</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<expression>
|
||||
<product>
|
||||
|
|
@ -164,7 +156,6 @@
|
|||
<name>FMGC Target IAS PFD</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<update-interval-secs type="double">0.1</update-interval-secs>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
@ -197,6 +188,7 @@
|
|||
<filter>
|
||||
<name>KTS INPUT FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
|
|
@ -218,32 +210,6 @@
|
|||
<property>/it-autoflight/settings/togaspd</property>
|
||||
</input>
|
||||
<output>/it-autoflight/internal/flch-kts</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<or>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>7</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>100</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
|
|
@ -257,6 +223,10 @@
|
|||
<value>7</value>
|
||||
</equals>
|
||||
</or>
|
||||
<equals>
|
||||
<property>/it-autoflight/input/kts-mach</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>0</value>
|
||||
|
|
@ -269,44 +239,34 @@
|
|||
</condition>
|
||||
<value>5</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>100</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>MACH INPUT FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/input/spd-mach</property>
|
||||
</input>
|
||||
<input>/it-autoflight/input/spd-mach</input>
|
||||
<output>/it-autoflight/internal/flch-mach</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<or>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>1</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>4</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>7</value>
|
||||
</equals>
|
||||
</or>
|
||||
<equals>
|
||||
<property>/it-autoflight/input/kts-mach</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>0</value>
|
||||
|
|
@ -319,6 +279,7 @@
|
|||
</condition>
|
||||
<value>0.05</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>1</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
|
|
@ -333,8 +294,16 @@
|
|||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<update-interval-secs type="double">0.5</update-interval-secs>
|
||||
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
|
||||
<input>
|
||||
<expression>
|
||||
<floor>
|
||||
<sum>
|
||||
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
|
||||
<value>0.5</value>
|
||||
</sum>
|
||||
</floor>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/it-autoflight/input/spd-kts</output>
|
||||
</filter>
|
||||
|
||||
|
|
@ -350,8 +319,22 @@
|
|||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<update-interval-secs type="double">0.5</update-interval-secs>
|
||||
<input>/instrumentation/airspeed-indicator/indicated-mach</input>
|
||||
<input>
|
||||
<expression>
|
||||
<div>
|
||||
<floor>
|
||||
<sum>
|
||||
<product>
|
||||
<property>/instrumentation/airspeed-indicator/indicated-mach</property>
|
||||
<value>1000</value>
|
||||
</product>
|
||||
<value>0.5</value>
|
||||
</sum>
|
||||
</floor>
|
||||
<value>1000</value>
|
||||
</div>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/it-autoflight/input/spd-mach</output>
|
||||
</filter>
|
||||
|
||||
|
|
@ -365,9 +348,7 @@
|
|||
</condition>
|
||||
<property>/orientation/heading-deg</property>
|
||||
</input>
|
||||
<input>
|
||||
<property>/orientation/heading-magnetic-deg</property>
|
||||
</input>
|
||||
<input>/orientation/heading-magnetic-deg</input>
|
||||
<reference>0</reference>
|
||||
<output>/it-autoflight/internal/heading-deg</output>
|
||||
<output>/instrumentation/pfd/heading-deg</output>
|
||||
|
|
@ -475,30 +456,16 @@
|
|||
<property>/autopilot/route-manager/wp[0]/true-bearing-deg</property>
|
||||
<product>
|
||||
<property>/it-autoflight/internal/drift-angle-deg</property>
|
||||
<value>-1</value>
|
||||
<value>-1.0</value>
|
||||
</product>
|
||||
<product>
|
||||
<property>/orientation/heading-deg</property>
|
||||
<value>-1</value>
|
||||
<value>-1.0</value>
|
||||
</product>
|
||||
</sum>
|
||||
</expression>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>0</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</input>
|
||||
<input>0</input>
|
||||
<output>/it-autoflight/internal/heading-error-deg</output>
|
||||
<period>
|
||||
<min>-180</min>
|
||||
|
|
@ -522,7 +489,10 @@
|
|||
<input>
|
||||
<expression>
|
||||
<floor>
|
||||
<sum>
|
||||
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||
<value>0.5</value>
|
||||
</sum>
|
||||
</floor>
|
||||
</expression>
|
||||
</input>
|
||||
|
|
@ -532,31 +502,18 @@
|
|||
<filter>
|
||||
<name>VERT SPEED FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/input/vs</property>
|
||||
</input>
|
||||
<input>/it-autoflight/input/vs</input>
|
||||
<output>/it-autoflight/internal/vs</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<or>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>2000</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>0</value>
|
||||
|
|
@ -569,6 +526,7 @@
|
|||
</condition>
|
||||
<value>300</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>2000</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
|
|
@ -831,48 +789,12 @@
|
|||
<output>/it-autoflight/internal/fpa</output>
|
||||
</filter>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Flight Director -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<filter>
|
||||
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
||||
<debug>false</debug>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
||||
</input>
|
||||
<output>/it-autoflight/internal/target-roll-fd</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>15</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>FD: ROLL</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>5</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<expression>
|
||||
<dif>
|
||||
<property>/it-autoflight/internal/target-roll-fd</property>
|
||||
<property>/orientation/roll-deg</property>
|
||||
</dif>
|
||||
</expression>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<or>
|
||||
|
|
@ -886,9 +808,37 @@
|
|||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</input>
|
||||
<input>/it-autoflight/internal/target-roll-deg</input>
|
||||
<output>/it-autoflight/internal/target-roll-fd</output>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/fd1</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/fd1</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<value>50</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>15</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>FD: ROLL</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<expression>
|
||||
<dif>
|
||||
<value>0</value>
|
||||
<property>/it-autoflight/internal/target-roll-fd</property>
|
||||
<property>/orientation/roll-deg</property>
|
||||
</dif>
|
||||
</expression>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Vertical Modes -->
|
||||
<!-- =============================================================== -->
|
||||
<!-- Pitch Axis -->
|
||||
|
||||
<filter>
|
||||
<name>ALTITUDE CAPTURE/HOLD</name>
|
||||
|
|
@ -27,15 +25,6 @@
|
|||
</sum>
|
||||
</expression>
|
||||
</input>
|
||||
<reference>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>8</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/alt</property>
|
||||
</reference>
|
||||
<reference>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
@ -45,15 +34,10 @@
|
|||
</condition>
|
||||
<property>/it-autoflight/internal/mng-alt</property>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-fpm</property>
|
||||
</output>
|
||||
<min>
|
||||
<property>/it-autoflight/internal/min-vs</property>
|
||||
</min>
|
||||
<max>
|
||||
<property>/it-autoflight/internal/max-vs</property>
|
||||
</max>
|
||||
<reference>/it-autoflight/internal/alt</reference>
|
||||
<output>/it-autoflight/internal/target-fpm</output>
|
||||
<min>/it-autoflight/internal/min-vs</min>
|
||||
<max>/it-autoflight/internal/max-vs</max>
|
||||
</filter>
|
||||
|
||||
<pid-controller>
|
||||
|
|
@ -87,15 +71,9 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/fpa</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/it-autoflight/input/fpa</property>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-fpm-d</property>
|
||||
</output>
|
||||
<input>/it-autoflight/internal/fpa</input>
|
||||
<reference>/it-autoflight/input/fpa</reference>
|
||||
<output>/it-autoflight/internal/target-fpm-d</output>
|
||||
<config>
|
||||
<Kp>
|
||||
<expression>
|
||||
|
|
@ -106,9 +84,6 @@
|
|||
</table>
|
||||
</expression>
|
||||
</Kp>
|
||||
<beta>1.0</beta>
|
||||
<alpha>0.1</alpha>
|
||||
<gamma>0.0</gamma>
|
||||
<Ti>2.0</Ti>
|
||||
<Td>0.002</Td>
|
||||
<u_min>
|
||||
|
|
@ -215,9 +190,7 @@
|
|||
<property>/it-autoflight/internal/flch-mach</property>
|
||||
<scale>1000.0</scale>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-fpm-b</property>
|
||||
</output>
|
||||
<output>/it-autoflight/internal/target-fpm-b</output>
|
||||
<config>
|
||||
<Kp>
|
||||
<condition>
|
||||
|
|
@ -237,9 +210,6 @@
|
|||
</condition>
|
||||
<value>-60</value>
|
||||
</Kp>
|
||||
<beta>1.0</beta>
|
||||
<alpha>0.1</alpha>
|
||||
<gamma>0.0</gamma>
|
||||
<Ti>2.5</Ti>
|
||||
<Td>0.001</Td>
|
||||
<u_min>
|
||||
|
|
@ -505,9 +475,7 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||
</input>
|
||||
<input>/it-autoflight/internal/vert-speed-fpm</input>
|
||||
<reference>
|
||||
<condition>
|
||||
<or>
|
||||
|
|
@ -590,9 +558,7 @@
|
|||
</condition>
|
||||
<property>/it-autoflight/internal/nav1-rate-of-climb-fpm</property>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
||||
</output>
|
||||
<output>/it-autoflight/internal/target-pitch-deg</output>
|
||||
<config>
|
||||
<Kp>
|
||||
<condition>
|
||||
|
|
@ -717,15 +683,9 @@
|
|||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<gain>0.15</gain>
|
||||
<input>
|
||||
<property>/orientation/pitch-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/fdm/jsbsim/fbw/fmgc/pitch-cmd</property> <!-- Inputs to the FBW Pitch Rate -->
|
||||
</output>
|
||||
<input>/orientation/pitch-deg</input>
|
||||
<reference>/it-autoflight/internal/target-pitch-deg</reference>
|
||||
<output>/fdm/jsbsim/fbw/fmgc/pitch-cmd</output> <!-- Inputs to the FBW Pitch -->
|
||||
<min>-0.3</min>
|
||||
<max>0.3</max>
|
||||
</filter>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Lateral Modes -->
|
||||
<!-- =============================================================== -->
|
||||
<!-- Roll Axis -->
|
||||
|
||||
<pi-simple-controller>
|
||||
<name>ROLL CONTROLLER: HDG/LNAV</name>
|
||||
|
|
@ -51,25 +49,17 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/heading-error-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<value>0</value>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
||||
</output>
|
||||
<input>/it-autoflight/internal/heading-error-deg</input>
|
||||
<reference>0</reference>
|
||||
<output>/it-autoflight/internal/target-roll-deg</output>
|
||||
<config>
|
||||
<Kp>-1.8</Kp>
|
||||
<Ki>-0.000001</Ki>
|
||||
<min>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
<scale>-1</scale>
|
||||
<scale>-1.0</scale>
|
||||
</min>
|
||||
<max>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
</max>
|
||||
<max>/it-autoflight/internal/bank-limit</max>
|
||||
</config>
|
||||
</pi-simple-controller>
|
||||
|
||||
|
|
@ -104,40 +94,17 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/settings/use-backcourse</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/nav-heading-error-deg</property>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/settings/use-backcourse</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/nav-bc-heading-error-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<value>0.0</value>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
||||
</output>
|
||||
<input>/it-autoflight/internal/nav-heading-error-deg</input>
|
||||
<reference>0</reference>
|
||||
<output>/it-autoflight/internal/target-roll-deg</output>
|
||||
<config>
|
||||
<Kp>-2.8</Kp>
|
||||
<Ki>-0.0001</Ki>
|
||||
<min>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
<scale>-1</scale>
|
||||
<scale>-1.0</scale>
|
||||
</min>
|
||||
<max>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
</max>
|
||||
<max>/it-autoflight/internal/bank-limit</max>
|
||||
</config>
|
||||
</pi-simple-controller>
|
||||
|
||||
|
|
@ -172,50 +139,16 @@
|
|||
<output>/it-autoflight/internal/target-roll-deg</output>
|
||||
<min>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
<scale>-1</scale>
|
||||
<scale>-1.0</scale>
|
||||
</min>
|
||||
<max>
|
||||
<property>/it-autoflight/internal/bank-limit</property>
|
||||
</max>
|
||||
<max>/it-autoflight/internal/bank-limit</max>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
||||
<debug>false</debug>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
||||
</input>
|
||||
<output>/it-autoflight/internal/target-roll</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>6</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>System Command: Roll Rate</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<gain>-0.1</gain>
|
||||
<input>
|
||||
<property>/orientation/roll-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>5</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/target-roll</property>
|
||||
</reference>
|
||||
<reference>
|
||||
<condition>
|
||||
<or>
|
||||
<equals>
|
||||
|
|
@ -229,17 +162,63 @@
|
|||
</or>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/fdm/jsbsim/fbw/fmgc/roll-cmd</property> <!-- Inputs to the FBW Roll Rate -->
|
||||
</output>
|
||||
</input>
|
||||
<input>/it-autoflight/internal/target-roll-deg</input>
|
||||
<output>/it-autoflight/internal/target-roll</output>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/ap1</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/ap2</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/fd1</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/fd2</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<value>50</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/ap1</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/ap2</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<value>15</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>6</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>System Command: Roll Rate</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<gain>-0.1</gain>
|
||||
<input>/orientation/roll-deg</input>
|
||||
<reference>/it-autoflight/internal/target-roll</reference>
|
||||
<output>/fdm/jsbsim/fbw/fmgc/roll-cmd</output> <!-- Inputs to the FBW Roll -->
|
||||
<min>-0.32</min>
|
||||
<max>0.32</max>
|
||||
</filter>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Yaw Control -->
|
||||
<!-- =============================================================== -->
|
||||
<!-- Yaw Axis -->
|
||||
|
||||
<pi-simple-controller>
|
||||
<name>RUDDER VORLOC TRK</name>
|
||||
|
|
@ -252,12 +231,8 @@
|
|||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/nav-heading-error-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<value>0</value>
|
||||
</reference>
|
||||
<input>/it-autoflight/internal/nav-heading-error-deg</input>
|
||||
<reference>0</reference>
|
||||
<output>/it-autoflight/internal/rudder-cmd</output>
|
||||
<config>
|
||||
<Kp>
|
||||
|
|
@ -275,21 +250,7 @@
|
|||
</condition>
|
||||
<value>-0.05</value>
|
||||
</Kp>
|
||||
<Kp>
|
||||
<condition>
|
||||
<or>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>-0.02</value>
|
||||
</Kp>
|
||||
<Kp>-0.02</Kp>
|
||||
<Ki>0</Ki>
|
||||
</config>
|
||||
<min>-0.15</min>
|
||||
|
|
@ -299,28 +260,32 @@
|
|||
<filter>
|
||||
<name>IT-CONTROLLER: RUDDER CMD</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/ap1</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/ap2</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/rudder-cmd</property>
|
||||
</input>
|
||||
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output>
|
||||
<type>noise-spike</type>
|
||||
<input>0</input>
|
||||
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
|
||||
<max-rate-of-change>0.6</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,53 +8,30 @@
|
|||
|
||||
<PropertyList>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Thrust Modes -->
|
||||
<!-- =============================================================== -->
|
||||
<!-- Thrust Axis -->
|
||||
|
||||
<filter>
|
||||
<name>KTS INPUT FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/input/spd-kts</property>
|
||||
</input>
|
||||
<input>/it-autoflight/input/spd-kts</input>
|
||||
<output>/it-autoflight/internal/kts</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<or>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/thr-mode</property>
|
||||
<value>0</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>200</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/thr-mode</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<value>1</value>
|
||||
<property>/it-autoflight/input/kts-mach</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
|
|
@ -68,50 +45,30 @@
|
|||
</condition>
|
||||
<value>10</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>200</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>MACH INPUT FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<feedback-if-disabled>true</feedback-if-disabled>
|
||||
<initialize-to>output</initialize-to>
|
||||
<input>
|
||||
<property>/it-autoflight/input/spd-mach</property>
|
||||
</input>
|
||||
<input>/it-autoflight/input/spd-mach</input>
|
||||
<output>/it-autoflight/internal/mach</output>
|
||||
<type>noise-spike</type>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<or>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/thr-mode</property>
|
||||
<value>0</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[1]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/gear/gear[2]/wow</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</or>
|
||||
</condition>
|
||||
<value>2</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/thr-mode</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/athr</property>
|
||||
<property>/it-autoflight/input/kts-mach</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<equals>
|
||||
|
|
@ -126,6 +83,7 @@
|
|||
</condition>
|
||||
<value>0.1</value>
|
||||
</max-rate-of-change>
|
||||
<max-rate-of-change>2</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
|
|
@ -250,28 +208,15 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/it-autoflight/internal/kts</property>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/controls/engines/throttle-cmd-pid</property>
|
||||
</output>
|
||||
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
|
||||
<reference>/it-autoflight/internal/kts</reference>
|
||||
<output>/controls/engines/throttle-cmd-pid</output>
|
||||
<config>
|
||||
<Kp>0.055</Kp>
|
||||
<beta>1.0</beta>
|
||||
<alpha>0.1</alpha>
|
||||
<gamma>0.0</gamma>
|
||||
<Ti>9.0</Ti>
|
||||
<Td>0.00001</Td>
|
||||
<u_min>
|
||||
<property>/controls/engines/idle-limit</property>
|
||||
</u_min>
|
||||
<u_max>
|
||||
<property>/controls/engines/throttle-pid-max</property>
|
||||
</u_max>
|
||||
<u_min>/controls/engines/idle-limit</u_min>
|
||||
<u_max>/controls/engines/throttle-pid-max</u_max>
|
||||
</config>
|
||||
</pid-controller>
|
||||
|
||||
|
|
@ -390,22 +335,13 @@
|
|||
<property>/it-autoflight/internal/mach</property>
|
||||
<scale>1000.0</scale>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/controls/engines/throttle-cmd-pid</property>
|
||||
</output>
|
||||
<output>/controls/engines/throttle-cmd-pid</output>
|
||||
<config>
|
||||
<Kp>0.055</Kp>
|
||||
<beta>1.0</beta>
|
||||
<alpha>0.1</alpha>
|
||||
<gamma>0.0</gamma>
|
||||
<Ti>9.0</Ti>
|
||||
<Td>0.00001</Td>
|
||||
<u_min>
|
||||
<property>/controls/engines/idle-limit</property>
|
||||
</u_min>
|
||||
<u_max>
|
||||
<property>/controls/engines/throttle-pid-max</property>
|
||||
</u_max>
|
||||
<u_min>/controls/engines/idle-limit</u_min>
|
||||
<u_max>/controls/engines/throttle-pid-max</u_max>
|
||||
</config>
|
||||
</pid-controller>
|
||||
|
||||
|
|
@ -512,12 +448,8 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<value>0.0</value>
|
||||
</input>
|
||||
<output>
|
||||
<property>/controls/engines/throttle-cmd-pid</property>
|
||||
</output>
|
||||
<input>0.0</input>
|
||||
<output>/controls/engines/throttle-cmd-pid</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
|
|
@ -623,12 +555,8 @@
|
|||
</and>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<value>1.0</value>
|
||||
</input>
|
||||
<output>
|
||||
<property>/controls/engines/throttle-cmd-pid</property>
|
||||
</output>
|
||||
<input>1.0</input>
|
||||
<output>/controls/engines/throttle-cmd-pid</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
|
|
@ -725,12 +653,10 @@
|
|||
</not-equals>
|
||||
</and>
|
||||
</condition>
|
||||
<value>1</value>
|
||||
<value>1.0</value>
|
||||
</input>
|
||||
<input>0</input>
|
||||
<output>
|
||||
<property>/controls/engines/throttle-cmd-pid</property>
|
||||
</output>
|
||||
<input>0.0</input>
|
||||
<output>/controls/engines/throttle-cmd-pid</output>
|
||||
</filter>
|
||||
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4679
|
||||
4683
|
||||
Reference in a new issue