fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev

Browse source
This commit is contained in:
merspieler 2018-10-22 14:49:09 +02:00
commit da7146372a
9 changed files with 154 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
A320-main.xml
View file

@ -746,6 +746,13 @@
</services> </services>
<systems> <systems>
<electrical n="0">
<bus n="0">
<dc-ess>0</dc-ess>
<dc1>0</dc1>
<dc2>0</dc2>
</bus>
</electrical>
<failures n="0"> <failures n="0">
<aileron-left type="bool">0</aileron-left> <aileron-left type="bool">0</aileron-left>
<aileron-right type="bool">0</aileron-right> <aileron-right type="bool">0</aileron-right>

184
Models/Instruments/Radio/Radio1.xml
View file

@ -8,7 +8,7 @@
<PropertyList> <PropertyList>
<path>res/Radio1.ac</path> <path>res/Radio.ac</path>
<!-- On Switch --> <!-- On Switch -->
<animation> <animation>
@ -1027,48 +1027,10 @@
<property>controls/radio/rmp[0]/on</property> <property>controls/radio/rmp[0]/on</property>
<value>1</value> <value>1</value>
</equals> </equals>
<or> <equals>
<equals> <property>systems/radio/rmp[0]/sel-light</property>
<property>systems/radio/rmp[0]/sel_chan</property> <value>1</value>
<value type="string">vhf2</value> </equals>
</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> </and>
</or> </or>
</condition> </condition>
@ -1390,18 +1352,6 @@
<property>systems/electrical/bus/dc-ess</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </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> </and>
</condition> </condition>
</animation> </animation>
@ -1431,61 +1381,6 @@
</font-resolution> </font-resolution>
</text> </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--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
@ -1541,18 +1436,6 @@
<property>systems/electrical/bus/dc-ess</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </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> </and>
</condition> </condition>
</animation> </animation>
@ -1582,61 +1465,6 @@
</font-resolution> </font-resolution>
</text> </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--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
@ -1679,10 +1507,8 @@
<type>material</type> <type>material</type>
<object-name>rmp-active</object-name> <object-name>rmp-active</object-name>
<object-name>rmp-active-test</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</object-name>
<object-name>rmp-standby-test</object-name> <object-name>rmp-standby-test</object-name>
<object-name>rmp-standby-vhf3-data</object-name>
<diffuse> <diffuse>
<red>0.89</red> <red>0.89</red>
<green>0.37</green> <green>0.37</green>

284
Models/Instruments/Radio/Radio2.xml
View file

@ -8,7 +8,7 @@
<PropertyList> <PropertyList>
<path>res/Radio1.ac</path> <path>res/Radio.ac</path>
<!-- On Switch --> <!-- On Switch -->
<animation> <animation>
@ -56,7 +56,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -83,7 +83,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -110,7 +110,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -137,7 +137,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -164,7 +164,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -190,7 +190,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -222,11 +222,11 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>rmp.transfer(2);</script> <script>rmp.transfer(1);</script>
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -253,7 +253,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -280,7 +280,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -307,7 +307,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -329,9 +329,9 @@
<command>property-adjust</command> <command>property-adjust</command>
<property>systems/radio/rmp[1]/vhf3-standby</property> <property>systems/radio/rmp[1]/vhf3-standby</property>
<step>0.025</step> <step>0.025</step>
<resolution>0.025</resolution>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap> <wrap>true</wrap>
<mask>decimal</mask> <mask>decimal</mask>
</binding> </binding>
@ -340,7 +340,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -365,7 +365,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -396,7 +396,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -423,7 +423,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -439,9 +439,9 @@
<command>property-adjust</command> <command>property-adjust</command>
<property>systems/radio/rmp[1]/vhf2-standby</property> <property>systems/radio/rmp[1]/vhf2-standby</property>
<step>-0.025</step> <step>-0.025</step>
<resolution>0.025</resolution>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap> <wrap>true</wrap>
<mask>decimal</mask> <mask>decimal</mask>
</binding> </binding>
@ -450,7 +450,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -472,9 +472,9 @@
<command>property-adjust</command> <command>property-adjust</command>
<property>systems/radio/rmp[1]/vhf3-standby</property> <property>systems/radio/rmp[1]/vhf3-standby</property>
<step>-0.025</step> <step>-0.025</step>
<resolution>0.025</resolution>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap> <wrap>true</wrap>
<mask>decimal</mask> <mask>decimal</mask>
</binding> </binding>
@ -483,7 +483,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -508,7 +508,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -543,7 +543,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -569,7 +569,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -595,7 +595,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -627,7 +627,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -653,7 +653,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -685,7 +685,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -711,7 +711,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -737,7 +737,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -769,7 +769,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -795,7 +795,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -867,7 +867,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -898,7 +898,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -928,7 +928,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -958,7 +958,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -987,7 +987,7 @@
<condition> <condition>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1020,55 +1020,17 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
<property>controls/radio/rmp[1]/on</property> <property>controls/radio/rmp[1]/on</property>
<value>1</value> <value>1</value>
</equals> </equals>
<or> <equals>
<equals> <property>systems/radio/rmp[1]/sel-light</property>
<property>systems/radio/rmp[0]/sel_chan</property> <value>1</value>
<value type="string">vhf2</value> </equals>
</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> </and>
</or> </or>
</condition> </condition>
@ -1086,7 +1048,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1113,7 +1075,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1140,7 +1102,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1167,7 +1129,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1194,7 +1156,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1221,7 +1183,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1248,7 +1210,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1275,7 +1237,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1302,7 +1264,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1329,7 +1291,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1356,7 +1318,7 @@
</equals> </equals>
<and> <and>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </greater-than-equals>
<equals> <equals>
@ -1387,21 +1349,9 @@
<value>1</value> <value>1</value>
</equals> </equals>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </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> </and>
</condition> </condition>
</animation> </animation>
@ -1431,61 +1381,6 @@
</font-resolution> </font-resolution>
</text> </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--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
@ -1538,21 +1433,9 @@
<value>1</value> <value>1</value>
</equals> </equals>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/dc2</property> <property>systems/electrical/bus/dc-ess</property>
<value>25</value> <value>25</value>
</greater-than-equals> </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> </and>
</condition> </condition>
</animation> </animation>
@ -1582,61 +1465,6 @@
</font-resolution> </font-resolution>
</text> </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--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
@ -1679,10 +1507,8 @@
<type>material</type> <type>material</type>
<object-name>rmp-active</object-name> <object-name>rmp-active</object-name>
<object-name>rmp-active-test</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</object-name>
<object-name>rmp-standby-test</object-name> <object-name>rmp-standby-test</object-name>
<object-name>rmp-standby-vhf3-data</object-name>
<diffuse> <diffuse>
<red>0.89</red> <red>0.89</red>
<green>0.37</green> <green>0.37</green>

0
Models/Instruments/Radio/res/Radio1.ac → Models/Instruments/Radio/res/Radio.ac
View file

2
Nasal/libraries.nas
View file

@ -32,6 +32,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
########## ##########
# Lights # # Lights #
########## ##########
var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2); 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 beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon");
var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2); var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2);
@ -208,6 +209,7 @@ var systemsLoop = maketimer(0.1, func {
libraries.BUTTONS.update(); libraries.BUTTONS.update();
fadec.FADEC.loop(); fadec.FADEC.loop();
ecam.ECAM_controller.loop(); ecam.ECAM_controller.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)) { 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); setprop("/controls/switches/cart", 0);

103
Nasal/rmp.nas
View file

@ -7,29 +7,31 @@
# GLOBAL TODO add stuff for HF1, HF2, VOR, LS and ADF # 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_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz");
var act_vhf2 = props.globals.getNode("/instrumentation/comm[1]/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_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 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", "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", 118.7, "DOUBLE"); 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", 123.12, "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", 121.5, "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 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", "123.125", "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", 118.7, "DOUBLE"); 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", 123.12, "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", 121.5, "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 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.125", "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", 118.7, "DOUBLE"); 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", 123.12, "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", 121.5, "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_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"); 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_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 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() { var init = func() {
for(var i = 0; i < 3; i += 1) { for(var i = 0; i < 3; i += 1) {
setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510); setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510);
@ -51,10 +61,48 @@ var init = func() {
pwr_sw_rmp1.setBoolValue(0); pwr_sw_rmp1.setBoolValue(0);
pwr_sw_rmp2.setBoolValue(0); pwr_sw_rmp2.setBoolValue(0);
pwr_sw_rmp3.setBoolValue(0); pwr_sw_rmp3.setBoolValue(0);
}
var rmp_update = maketimer(0.2, func { var rmpUpdate = func() {
rmp_refresh.update(); 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) { var update_active_vhf = func(vhf) {
@ -85,15 +133,23 @@ var update_active_vhf = func(vhf) {
act_display_rmp2.setValue(act); act_display_rmp2.setValue(act);
} }
} }
} else { } else if (vhf == 3) {
if (sel1 == "vhf3" or sel2 == "vhf3") { if (sel1 == "vhf3" or sel2 == "vhf3") {
var act = sprintf("%3.3f", act_vhf3.getValue()); var act = sprintf("%3.3f", act_vhf3.getValue());
if (sel1 == "vhf3") { if (sel1 == "vhf3") {
act_display_rmp1.setValue(act); if (act == 0) {
act_display_rmp1.setValue("data");
} else {
act_display_rmp1.setValue(act);
}
} }
if (sel2 == "vhf3") { if (sel2 == "vhf3") {
act_display_rmp2.setValue(act); if (act == 0) {
act_display_rmp2.setValue("data");
} else {
act_display_rmp2.setValue(act);
}
} }
} }
} }
@ -132,7 +188,7 @@ var update_chan_sel = func(rmp_no) {
var chan = chan_rmp1.getValue(); var chan = chan_rmp1.getValue();
if (chan == "vhf1") { if (chan == "vhf1") {
update_stby_vhf(rmp_no, 1); update_stby_vhf(rmp_no, 1);
} else if (chan == "vhf1") { } else if (chan == "vhf2") {
update_stby_vhf(rmp_no, 2); update_stby_vhf(rmp_no, 2);
} else { } else {
update_stby_vhf(rmp_no, 3); update_stby_vhf(rmp_no, 3);
@ -160,7 +216,6 @@ var update_chan_sel = func(rmp_no) {
} }
var transfer = func(rmp_no) { var transfer = func(rmp_no) {
rmp_no = rmp_no - 1; rmp_no = rmp_no - 1;
var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan"); var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan");

4
Systems/fmgc-drivers.xml
View file

@ -456,11 +456,11 @@
<property>/autopilot/route-manager/wp[0]/true-bearing-deg</property> <property>/autopilot/route-manager/wp[0]/true-bearing-deg</property>
<product> <product>
<property>/it-autoflight/internal/drift-angle-deg</property> <property>/it-autoflight/internal/drift-angle-deg</property>
<value>-1</value> <value>-1.0</value>
</product> </product>
<product> <product>
<property>/orientation/heading-deg</property> <property>/orientation/heading-deg</property>
<value>-1</value> <value>-1.0</value>
</product> </product>
</sum> </sum>
</expression> </expression>

6
Systems/fmgc-roll-yaw.xml
View file

@ -57,7 +57,7 @@
<Ki>-0.000001</Ki> <Ki>-0.000001</Ki>
<min> <min>
<property>/it-autoflight/internal/bank-limit</property> <property>/it-autoflight/internal/bank-limit</property>
<scale>-1</scale> <scale>-1.0</scale>
</min> </min>
<max>/it-autoflight/internal/bank-limit</max> <max>/it-autoflight/internal/bank-limit</max>
</config> </config>
@ -102,7 +102,7 @@
<Ki>-0.0001</Ki> <Ki>-0.0001</Ki>
<min> <min>
<property>/it-autoflight/internal/bank-limit</property> <property>/it-autoflight/internal/bank-limit</property>
<scale>-1</scale> <scale>-1.0</scale>
</min> </min>
<max>/it-autoflight/internal/bank-limit</max> <max>/it-autoflight/internal/bank-limit</max>
</config> </config>
@ -139,7 +139,7 @@
<output>/it-autoflight/internal/target-roll-deg</output> <output>/it-autoflight/internal/target-roll-deg</output>
<min> <min>
<property>/it-autoflight/internal/bank-limit</property> <property>/it-autoflight/internal/bank-limit</property>
<scale>-1</scale> <scale>-1.0</scale>
</min> </min>
<max>/it-autoflight/internal/bank-limit</max> <max>/it-autoflight/internal/bank-limit</max>
</filter> </filter>

2
revision.txt
View file

@ -1 +1 @@
4681 4683