fly/A320-family
1
0
Fork 0
Code Activity

Fixed vhf3 data problem and copied to rmp2

Browse source 
Signed-off-by: merspieler <merspieler@airmail.cc>
This commit is contained in:
merspieler 2019-10-21 02:14:30 +00:00
parent a3227060c6
commit 2be8ed9b6e
2 changed files with 314 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -400,7 +400,7 @@
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value type="int">0</value>
<value>0</value>
</equals>
</not>
</and>
@ -427,7 +427,7 @@
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value type="int">0</value>
<value>0</value>
</equals>
</not>
</and>
@ -454,7 +454,7 @@
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value type="int">0</value>
<value>0</value>
</equals>
</not>
</and>
@ -663,6 +663,12 @@
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-assign</command>
@ -684,6 +690,12 @@
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-adjust</command>
@ -705,6 +717,12 @@
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[0]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-assign</command>

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

@ -241,6 +241,11 @@
<!-- Knob -->
<!-- TODO add bindings for VOR, LS and ADF -->
<!-- We use a little hack to get 8.33MHz spacing working:
First we assign our current STBY freq we want to adjust to the default instrument.
Then we change the channel there.
Finally we assign the value back to out own prop.
-->
<animation>
<type>pick</type>
<object-name>radio_rot1</object-name>
@ -266,14 +271,51 @@
</equals>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf1-standby</property>
<step>0.025</step>
<min>0.0</min>
<max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf1</value>
</equals>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf1-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
@ -293,14 +335,51 @@
</equals>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf2-standby</property>
<step>0.025</step>
<min>0.0</min>
<max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf2</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf2</value>
</equals>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf2-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
@ -326,14 +405,63 @@
</not>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<step>0.025</step>
<resolution>0.025</resolution>
<min>0.0</min>
<max>1.0</max>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
@ -409,14 +537,51 @@
</equals>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf1-standby</property>
<step>-0.025</step>
<min>0.0</min>
<max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>-1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf1</value>
</equals>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf1-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
@ -436,14 +601,51 @@
</equals>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf2-standby</property>
<step>-0.025</step>
<min>0.0</min>
<max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf2</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>-1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf2</value>
</equals>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf2-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
@ -469,14 +671,63 @@
</not>
</and>
</condition>
<command>property-adjust</command>
<command>property-assign</command>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<step>-0.025</step>
<min>0.0</min>
<max>1.0</max>
<resolution>0.025</resolution>
<wrap>true</wrap>
<mask>decimal</mask>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/comm[0]/frequencies/standby-channel</property>
<step>-1</step>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<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>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vhf3</value>
</equals>
<not>
<equals>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<value>0</value>
</equals>
</not>
</and>
</condition>
<command>property-assign</command>
<property>systems/radio/rmp[1]/vhf3-standby</property>
<property>instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>