remove duplicate var, fix index cv

JMRI · Feb 21, 2019 · 58acc6a · 58acc6a
1 parent 694f795
commit 58acc6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/xml/decoders/Uhlenbrock_73xx5.xml b/xml/decoders/Uhlenbrock_73xx5.xml
@@ -12,7 +12,7 @@
 <!-- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  -->
 <!-- for more details.                                                      -->
 <decoder-config xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jmri.org/xml/schema/decoder.xsd">
-    <version author="Egbert Broerse" version="1" lastUpdated="20190215"/>
+    <version author="Egbert Broerse" version="1" lastUpdated="20190221"/>
     <!-- Version 1 - For new 2017-18 decoders. Copied and adapted from Uhlenbrock_76560.xml Uses common parts -->
     <!-- WARNING: output names fully linked to function mapping include file - do not change independently -->
     <decoder>
@@ -94,14 +94,8 @@
         <programming direct="yes" paged="yes" register="yes" ops="yes">
             <capability>
                 <name>Indexed CV access</name>
-                <parameter name="PI">1021</parameter> <!-- for audio on SUSI -->
-                <parameter name="SI">0</parameter> <!-- Not used, but need to be declared for cvFirst to be read -->
-                <parameter name="cvFirst">true</parameter>
-            </capability>
-            <capability>
-                <name>Indexed CV access 2</name>
                 <parameter name="PI">31</parameter> <!--for Banks -->
-                <parameter name="SI">0</parameter> <!-- Not used, but need to be declared for cvFirst to be read -->
+                <parameter name="SI">32</parameter> <!-- Not used, but need to be declared for cvFirst to be read -->
                 <parameter name="cvFirst">true</parameter>
             </capability>
         </programming>
@@ -1229,8 +1223,11 @@
             <!--extended function mapping on IntelliDrive2 and Piko 4.1, includes cv 31-32 bank switches-->
             <xi:include href="http://jmri.org/xml/decoders/uhlenbrock/cv257.512extendedmap.xml"/>
         </variables>
+        <!-- Indexed variables -->
+        <constant item="PICV" default="31" comment="CV used for Primary Index"/>
+        <constant item="SICV" default="32" comment="CV used for Secondary Index"/>
 
-        <xi:include href="http://jmri.org/xml/decoders/uhlenbrock/factReset4.xml"/><!-- Piko -->
+        <xi:include href="http://jmri.org/xml/decoders/uhlenbrock/factReset4.xml"/><
     </decoder>
     <!-- special panes -->
     <xi:include href="http://jmri.org/xml/decoders/uhlenbrock/PaneRailcom.xml"/>

diff --git a/xml/decoders/uhlenbrock/cv50.51config.xml b/xml/decoders/uhlenbrock/cv50.51config.xml
@@ -23,13 +23,6 @@
     </revision>
   </revhistory>
 
-  <!-- IntelliDrive2 Decoder Configuration CV 29 -->
-  <variable item="Use Motorola 2" CV="50" default="0" mask="XXXXXXXV">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
-    <label>Use Motorola 2nd Address</label>
-    <label xml:lang="de">Motorola 2. Adresse nutzen</label>
-  </variable>
-
   <!-- IntelliDrive2 Decoder Configuration CV 50-51 -->
   <variable item="Use Motorola 2" CV="50" default="0" mask="XXXXXXXV">
     <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>