fly/fgdata
1
0
Fork 0
Code Activity

Issue 1649: Fix for Transponder TDR-94.

Browse source 
The transponder instrument MUST be named "transponder" in the instrumentation
file to work with multiplayer and the radio dialog.

Thanks to lens(at)bitwisetech.com for the report and patch.
This commit is contained in:
Anders Gidenstam 2015-02-21 20:56:16 +01:00
parent ca9ad6e230
commit e3d38a6228
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
View file

@ -22,7 +22,7 @@ Syd Adams
<value>1</value> <value>1</value>
</greater-than> </greater-than>
<greater-than> <greater-than>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
<value>0</value> <value>0</value>
</greater-than> </greater-than>
</and> </and>
@ -45,7 +45,7 @@ Syd Adams
<action> <action>
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
<wrap>0</wrap> <!-- don't wrap at the ends --> <wrap>0</wrap> <!-- don't wrap at the ends -->
<value>0</value> <value>0</value>
@ -57,7 +57,7 @@ Syd Adams
</action> </action>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>0.0</dep></entry><!--OFF--> <entry><ind>0</ind><dep>0.0</dep></entry><!--OFF-->
<entry><ind>1</ind><dep>30.0</dep></entry><!--STBY--> <entry><ind>1</ind><dep>30.0</dep></entry><!--STBY-->
@ -84,7 +84,7 @@ Syd Adams
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>C92freq.001</object-name> <object-name>C92freq.001</object-name>
<property>instrumentation/kt-70/inputs/digit[3]</property> <property>instrumentation/transponder/inputs/digit[3]</property>
<factor>0.1</factor> <factor>0.1</factor>
<step>1</step> <step>1</step>
<axis> <axis>
@ -97,7 +97,7 @@ Syd Adams
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>C92freq.002</object-name> <object-name>C92freq.002</object-name>
<property>instrumentation/kt-70/inputs/digit[2]</property> <property>instrumentation/transponder/inputs/digit[2]</property>
<factor>0.1</factor> <factor>0.1</factor>
<step>1</step> <step>1</step>
<axis> <axis>
@ -110,7 +110,7 @@ Syd Adams
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>C92freq.003</object-name> <object-name>C92freq.003</object-name>
<property>instrumentation/kt-70/inputs/digit[1]</property> <property>instrumentation/transponder/inputs/digit[1]</property>
<factor>0.1</factor> <factor>0.1</factor>
<step>1</step> <step>1</step>
<axis> <axis>
@ -123,7 +123,7 @@ Syd Adams
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>C92freq.004</object-name> <object-name>C92freq.004</object-name>
<property>instrumentation/kt-70/inputs/digit[0]</property> <property>instrumentation/transponder/inputs/digit[0]</property>
<factor>0.1</factor> <factor>0.1</factor>
<step>1</step> <step>1</step>
<axis> <axis>
@ -143,20 +143,20 @@ Syd Adams
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-toggle</command> <command>property-toggle</command>
<property>instrumentation/kt-70/inputs/ident-btn</property> <property>instrumentation/transponder/inputs/ident-btn</property>
</binding> </binding>
</action> </action>
</animation> </animation>
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>act.pre</object-name> <object-name>atc.pre</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>instrumentation/kt-70/id-code</property> <property>instrumentation/transponder/id-code</property>
<value>1200</value> <value>1200</value>
</binding> </binding>
</action> </action>
@ -164,7 +164,7 @@ Syd Adams
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>act.toggle</object-name> <object-name>CTL-92.toggle</object-name>
<action> <action>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
@ -183,11 +183,11 @@ Syd Adams
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>instrumentation/tdr-94/saved-mode</property> <property>instrumentation/tdr-94/saved-mode</property>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
<value>2</value> <!-- test mode --> <value>2</value> <!-- test mode -->
</binding> </binding>
@ -195,7 +195,7 @@ Syd Adams
<!-- restore previous mode on button release --> <!-- restore previous mode on button release -->
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>instrumentation/kt-70/inputs/knob-mode</property> <property>instrumentation/transponder/inputs/knob-mode</property>
<property>instrumentation/tdr-94/saved-mode</property> <property>instrumentation/tdr-94/saved-mode</property>
</binding> </binding>
</mod-up> </mod-up>
@ -209,8 +209,8 @@ Syd Adams
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script><![CDATA[ <script><![CDATA[
var loDigit = getprop('instrumentation/kt-70/inputs/digit[2]'); var loDigit = getprop('instrumentation/transponder/inputs/digit[2]') or 2;
var hiDigit = getprop('instrumentation/kt-70/inputs/digit[3]'); var hiDigit = getprop('instrumentation/transponder/inputs/digit[3]') or 1;
var offset = int(cmdarg().getNode('offset').getValue()); var offset = int(cmdarg().getNode('offset').getValue());
var incr = (offset > 0); var incr = (offset > 0);
@ -220,8 +220,8 @@ Syd Adams
} }
loDigit = math.mod(loDigit + offset, 8); loDigit = math.mod(loDigit + offset, 8);
setprop('instrumentation/kt-70/inputs/digit[2]', loDigit); setprop('instrumentation/transponder/inputs/digit[2]', loDigit);
setprop('instrumentation/kt-70/inputs/digit[3]', hiDigit); setprop('instrumentation/transponder/inputs/digit[3]', hiDigit);
]]></script> ]]></script>
</binding> </binding>
</action> </action>
@ -234,8 +234,8 @@ Syd Adams
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script><![CDATA[ <script><![CDATA[
var loDigit = getprop('instrumentation/kt-70/inputs/digit[0]'); var loDigit = getprop('instrumentation/transponder/inputs/digit[0]') or 0;
var hiDigit = getprop('instrumentation/kt-70/inputs/digit[1]'); var hiDigit = getprop('instrumentation/transponder/inputs/digit[1]') or 0;
var offset = int(cmdarg().getNode('offset').getValue()); var offset = int(cmdarg().getNode('offset').getValue());
var incr = (offset > 0); var incr = (offset > 0);
@ -245,12 +245,12 @@ Syd Adams
} }
loDigit = math.mod(loDigit + offset, 8); loDigit = math.mod(loDigit + offset, 8);
setprop('instrumentation/kt-70/inputs/digit[0]', loDigit); setprop('instrumentation/transponder/inputs/digit[0]', loDigit);
setprop('instrumentation/kt-70/inputs/digit[1]', hiDigit); setprop('instrumentation/transponder/inputs/digit[1]', hiDigit);
]]></script> ]]></script>
</binding> </binding>
</action> </action>
</animation> </animation>
</PropertyList> </PropertyList>

2
Aircraft/Instruments-3d/TDR-94/ctl92.ac
View file

@ -1459,7 +1459,7 @@ refs 3
31 0.657934963703 0.408358514309 31 0.657934963703 0.408358514309
kids 0 kids 0
OBJECT poly OBJECT poly
name "act.pre" name "atc.pre"
data 10 data 10
Circle.004 Circle.004
texture "ctl-92.png" texture "ctl-92.png"