From 2e45b5424ef861bceb8374ed62b4f8993a574bc7 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 12 May 2013 13:32:29 +0100
Subject: [PATCH] Update TDR-94/CTL-92 for revised transponder.

Add knob animations and make the code selection cover the
entire code range.
---
 .../TDR-94/ctl92-transponder.xml              | 273 ++++++++----------
 1 file changed, 118 insertions(+), 155 deletions(-)

diff --git a/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml b/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
index 672ee6c7d..376dc10ce 100644
--- a/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
+++ b/Aircraft/Instruments-3d/TDR-94/ctl92-transponder.xml
@@ -22,7 +22,7 @@ Syd Adams
                     <value>1</value>
                 </greater-than>
                 <greater-than>
-                    <property>instrumentation/kt-70/inputs/func-knob</property>
+                    <property>instrumentation/kt-70/inputs/knob-mode</property>
                     <value>0</value>
                 </greater-than>
             </and>
@@ -30,16 +30,44 @@ Syd Adams
     </animation>
 
     <animation>
-        <type>rotate</type>
+        <type>select</type>
+        <object-name>C92mem.annun</object-name>
+        <condition>
+            <property>instrumentation/tdr-94/mem-selected</property>
+        </condition>
+    </animation>
+
+
+    <animation>
+        <type>knob</type>
         <object-name>CTL-92.pwr</object-name>
-        <property>instrumentation/kt-70/inputs/func-knob</property>
+        
+        <action>
+            <binding>
+                <command>property-cycle</command>
+                <property>instrumentation/kt-70/inputs/knob-mode</property>
+                <wrap>0</wrap> <!-- don't wrap at the ends -->
+                
+                <value>0</value>
+                <value>1</value>
+                <value>4</value> <!-- ON -->
+                <value>5</value> <!-- altitude -->
+                
+            </binding>
+        </action>
+        
+
+        <property>instrumentation/kt-70/inputs/knob-mode</property>
         <interpolation>
             <entry><ind>0</ind><dep>0.0</dep></entry><!--OFF-->
             <entry><ind>1</ind><dep>30.0</dep></entry><!--STBY-->
+        
+            <!-- these two should never happen any more -->
             <entry><ind>2</ind><dep>30.0</dep></entry><!--TEST-->
             <entry><ind>3</ind><dep>30.0</dep></entry><!--GRND-->
-				<entry><ind>4</ind><dep>60.0</dep></entry><!--ON-->
-				<entry><ind>5</ind><dep>90.0</dep></entry><!--ALT-->
+            
+			<entry><ind>4</ind><dep>60.0</dep></entry><!--ON-->
+			<entry><ind>5</ind><dep>90.0</dep></entry><!--ALT-->
         </interpolation>
         <center>
             <x-m>0.0</x-m>
@@ -56,9 +84,9 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.001</object-name>
-        <property>instrumentation/kt-70/outputs/id-code</property>
-        <factor>0.0001</factor>
-        <step>1000</step>
+        <property>instrumentation/kt-70/inputs/digit[3]</property>
+        <factor>0.1</factor>
+        <step>1</step>
         <axis>
             <x>0</x>
             <y>1</y>
@@ -69,9 +97,9 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.002</object-name>
-        <property>instrumentation/kt-70/outputs/id-code</property>
-        <factor>0.001</factor>
-        <step>100</step>
+        <property>instrumentation/kt-70/inputs/digit[2]</property>
+        <factor>0.1</factor>
+        <step>1</step>
         <axis>
             <x>0</x>
             <y>1</y>
@@ -82,9 +110,9 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.003</object-name>
-        <property>instrumentation/kt-70/outputs/id-code</property>
-        <factor>0.01</factor>
-        <step>10</step>
+        <property>instrumentation/kt-70/inputs/digit[1]</property>
+        <factor>0.1</factor>
+        <step>1</step>
         <axis>
             <x>0</x>
             <y>1</y>
@@ -95,7 +123,7 @@ Syd Adams
     <animation>
         <type>textranslate</type>
         <object-name>C92freq.004</object-name>
-        <property>instrumentation/kt-70/outputs/id-code</property>
+        <property>instrumentation/kt-70/inputs/digit[0]</property>
         <factor>0.1</factor>
         <step>1</step>
         <axis>
@@ -107,40 +135,6 @@ Syd Adams
 
 <!--    OSG hotspots    -->
 
-    <animation>
-        <type>pick</type>
-        <object-name>CTL-92.pwr</object-name>
-        <action>
-            <button>0</button>
-            <repeatable>false</repeatable>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/func-knob</property>
-            <step>1</step>
-            <min>0</min>
-            <max>5</max>
-            <wrap>0</wrap>
-        </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <object-name>CTL-92.pwr</object-name>
-        <action>
-            <button>1</button>
-            <repeatable>false</repeatable>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/func-knob</property>
-            <step>-1</step>
-            <min>0</min>
-            <max>5</max>
-            <wrap>0</wrap>
-        </binding>
-        </action>
-    </animation>
-
     <animation>
         <type>pick</type>
         <object-name>atc.ident</object-name>
@@ -156,138 +150,107 @@ Syd Adams
 
     <animation>
         <type>pick</type>
-        <object-name>CTL92.knob</object-name>
+        <object-name>act.pre</object-name>
         <action>
             <button>0</button>
-            <repeatable>true</repeatable>
-            <interval-sec>0.2</interval-sec>
+            <repeatable>false</repeatable>
             <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit1</property>
-            <step>1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
+            <command>property-assign</command>
+            <property>instrumentation/kt-70/id-code</property>
+            <value>1200</value>
         </binding>
         </action>
     </animation>
-
+    
     <animation>
         <type>pick</type>
-        <object-name>CTL92.knob</object-name>
+        <object-name>act.toggle</object-name>
         <action>
-            <button>1</button>
-            <repeatable>true</repeatable>
-            <interval-sec>0.2</interval-sec>
+            <repeatable>false</repeatable>
             <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit1</property>
-            <step>-1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
+                <command>property-toggle</command>
+                <property>instrumentation/tdr-94/mem-selected</property>
+            </binding>
         </action>
     </animation>
-
+    
     <animation>
         <type>pick</type>
-        <object-name>CTL92.knob</object-name>
-        <action>
-            <button>3</button>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit1</property>
-            <step>1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <object-name>CTL92.knob</object-name>
-        <action>
-            <button>4</button>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit1</property>
-            <step>-1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <object-name>CTL92.knob1</object-name>
+        <object-name>atc.test</object-name>
         <action>
             <button>0</button>
-            <repeatable>true</repeatable>
-            <interval-sec>0.2</interval-sec>
+            <repeatable>false</repeatable>
             <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit2</property>
-            <step>1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
+                <command>property-assign</command>
+                <property>instrumentation/tdr-94/saved-mode</property>
+                <property>instrumentation/kt-70/inputs/knob-mode</property>
+            </binding>
+            <binding>
+                <command>property-assign</command>
+                <property>instrumentation/kt-70/inputs/knob-mode</property>
+                <value>2</value> <!-- test mode -->
+            </binding>
+            
+            <mod-up>
+                <!-- restore previous mode on button release -->
+                <binding>
+                    <command>property-assign</command>
+                    <property>instrumentation/kt-70/inputs/knob-mode</property>
+                    <property>instrumentation/tdr-94/saved-mode</property>
+                </binding>
+            </mod-up>
+        </action>
+    </animation>
+    
+    <animation>
+        <type>knob</type>
+        <object-name>CTL92.knob</object-name>
+        <action>
+           <binding>
+               <command>nasal</command>
+               <script><![CDATA[
+                   var loDigit = getprop('instrumentation/kt-70/inputs/digit[2]');
+                   var hiDigit = getprop('instrumentation/kt-70/inputs/digit[3]');
+                   
+                   var offset = int(cmdarg().getNode('offset').getValue());
+                   var incr = (offset > 0);
+
+                   if ((incr and loDigit == 7) or (!incr and loDigit == 0)) {
+                     hiDigit = math.mod(hiDigit + offset, 8);
+                   }
+                   
+                   loDigit = math.mod(loDigit + offset, 8);
+                   setprop('instrumentation/kt-70/inputs/digit[2]', loDigit);
+                   setprop('instrumentation/kt-70/inputs/digit[3]', hiDigit);
+               ]]></script>
+            </binding>
         </action>
     </animation>
 
     <animation>
-        <type>pick</type>
+        <type>knob</type>
         <object-name>CTL92.knob1</object-name>
         <action>
-            <button>1</button>
-            <repeatable>true</repeatable>
-            <interval-sec>0.2</interval-sec>
             <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit2</property>
-            <step>-1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
+                <command>nasal</command>
+                <script><![CDATA[
+                    var loDigit = getprop('instrumentation/kt-70/inputs/digit[0]');
+                    var hiDigit = getprop('instrumentation/kt-70/inputs/digit[1]');
+                   
+                    var offset = int(cmdarg().getNode('offset').getValue());
+                    var incr = (offset > 0);
+
+                    if ((incr and loDigit == 7) or (!incr and loDigit == 0)) {
+                      hiDigit = math.mod(hiDigit + offset, 8);
+                    }
+                   
+                    loDigit = math.mod(loDigit + offset, 8);
+                    setprop('instrumentation/kt-70/inputs/digit[0]', loDigit);
+                    setprop('instrumentation/kt-70/inputs/digit[1]', hiDigit);
+                ]]></script>
+            </binding>
         </action>
     </animation>
 
-    <animation>
-        <type>pick</type>
-        <object-name>CTL92.knob1</object-name>
-        <action>
-            <button>3</button>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit2</property>
-            <step>1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <object-name>CTL92.knob1</object-name>
-        <action>
-            <button>4</button>
-            <binding>
-            <command>property-adjust</command>
-            <property>instrumentation/kt-70/inputs/digit2</property>
-            <step>-1</step>
-            <min>0</min>
-            <max>8</max>
-            <wrap>1</wrap>
-        </binding>
-        </action>
-    </animation>
 
 </PropertyList>
\ No newline at end of file