Merge branch 'master' into FMGC

This commit is contained in:
Joshua Davidson 2019-01-30 17:26:40 -05:00
commit f0b479606d
3 changed files with 57 additions and 17 deletions
Models/Instruments/Radio
revision.txt

View file

@ -1386,10 +1386,20 @@
<type>select</type>
<object-name>rmp-active-test</object-name>
<condition>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</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>
</and>
</condition>
</animation>
@ -1470,10 +1480,20 @@
<type>select</type>
<object-name>rmp-standby-test</object-name>
<condition>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</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>
</and>
</condition>
</animation>

View file

@ -1386,10 +1386,20 @@
<type>select</type>
<object-name>rmp-active-test</object-name>
<condition>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</animation>
@ -1470,10 +1480,20 @@
<type>select</type>
<object-name>rmp-standby-test</object-name>
<condition>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</animation>

View file

@ -1 +1 @@
4749
4750