speed table basic as include in all

JMRI · Oct 17, 2018 · 8143b33 · 8143b33
1 parent 11d1dcb
commit 8143b33
Show file tree

Hide file tree

Showing 224 changed files with 246 additions and 1,025 deletions.
diff --git a/xml/decoders/0NMRA.xml b/xml/decoders/0NMRA.xml
@@ -109,13 +109,7 @@
       <!-- end of table that doesn't need translation -->
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="fr">Tableau de Vitesse</label>
-        <label xml:lang="it">Tabella Velocità</label>
-         <label xml:lang="ca">Taula de Velocitats</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
     </variables>

diff --git a/xml/decoders/ANE_LC201.xml b/xml/decoders/ANE_LC201.xml
@@ -584,10 +584,7 @@
         </enumVal>
         <label>F0F is 1/2 Sec Flashing</label>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
     </variables>
     <resets>
       <factReset label="Reset All CVs" CV="8" default="33">

diff --git a/xml/decoders/Arnold.xml b/xml/decoders/Arnold.xml
@@ -623,10 +623,7 @@
         <label>CV65(Range 0-255)</label>
       </variable>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="CV67(Range 0 - 255)" CV="67" default="9">
         <decVal max="255"/>
         <label>CV67(Range 0 - 255)</label>

diff --git a/xml/decoders/Atlas_342.xml b/xml/decoders/Atlas_342.xml
@@ -272,10 +272,7 @@
         <label>F8 controls output D</label>
       </variable>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="Decoder Software Version" CV="128" readOnly="yes" default="1">
         <decVal/>
         <label>Decoder Software Version</label>

diff --git a/xml/decoders/Atlas_345.xml b/xml/decoders/Atlas_345.xml
@@ -223,10 +223,7 @@
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
         <label>F8 controls output C</label>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="Decoder Software Version" CV="128" readOnly="yes" default="1">
         <decVal/>
         <label>Decoder Software Version</label>

diff --git a/xml/decoders/Atlas_DualMode.xml b/xml/decoders/Atlas_DualMode.xml
@@ -73,10 +73,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/cv29speedSteps.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/cv29analog.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/cv29table3-28.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- CV 105-106 -->
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <!-- Atlas-specific variables -->

diff --git a/xml/decoders/Atlas_Lenz_N.xml b/xml/decoders/Atlas_Lenz_N.xml
@@ -243,11 +243,7 @@
         <label xml:lang="it">F8 controlla Uscita D</label>
       </variable>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the fixed Function-Output mapping -->
       <constant item="FL(f) controls output 1" minOut="1" default="1"/>
       <constant item="FL(r) controls output 2" minOut="2" default="1"/>

diff --git a/xml/decoders/Atlas_NCE_N.xml b/xml/decoders/Atlas_NCE_N.xml
@@ -413,10 +413,7 @@
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
         <label>F12 controls output 9</label>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable CV="95" mask="XVVVVVVV" item="Forward Trim" tooltip="Adjustment amount used to equalize the speed in each direction">
         <decVal max="127"/>
         <label>Reverse Trim Adjustment</label>

diff --git a/xml/decoders/Bachmann_EZDCC_4fn.xml b/xml/decoders/Bachmann_EZDCC_4fn.xml
@@ -252,10 +252,7 @@
       </variable>
       <!-- User private ID CV's are not documented by Bachamann, but appear to work -->
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the fixed Function-Output mapping -->
       <constant item="FL(f) controls output 1" minOut="1" default="1"/>
       <constant item="FL(r) controls output 2" minOut="2" default="1"/>

diff --git a/xml/decoders/CT_Elektronik_DCX_old.xml b/xml/decoders/CT_Elektronik_DCX_old.xml
@@ -691,10 +691,7 @@
         <label>Output Reduction</label>
         <comment>Controls function output voltage</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable CV="105" item="User Id #1">
         <decVal/>
         <label>User Private ID #1</label>

diff --git a/xml/decoders/CT_Elektronik_Sound_GE_70.xml b/xml/decoders/CT_Elektronik_Sound_GE_70.xml
@@ -816,10 +816,7 @@
         <label>Random-2: Sounds Cruising</label>
         <comment>Range 0-255</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="High Time Sounds after Accelleration; 0.5sec" CV="96" default="8" comment="Range 0-255">
         <decVal/>
         <label>High Time Sounds after Accelleration; 0.5sec</label>

diff --git a/xml/decoders/CT_Elektronik_Sound_SL.xml b/xml/decoders/CT_Elektronik_Sound_SL.xml
@@ -899,10 +899,7 @@
         <label>Track Voltage Reference</label>
         <comment>160=16v track volts</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable CV="105" default="0" item="User Id #1">
         <decVal/>
         <label>User Identification #1</label>

diff --git a/xml/decoders/CT_Elektronik_Sound_SL_51.xml b/xml/decoders/CT_Elektronik_Sound_SL_51.xml
@@ -734,10 +734,7 @@
         <label>Reference Voltage</label>
         <comment>160=16v track volts</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable CV="105" default="0" item="User Id #1">
         <decVal/>
         <label>User Identification #1</label>

diff --git a/xml/decoders/CT_Elektronik_Sound_SL_v100.xml b/xml/decoders/CT_Elektronik_Sound_SL_v100.xml
@@ -1877,10 +1877,7 @@
         <label>Track Voltage Reference</label>
         <comment>160=16v track volts, appears to be percentage in reality, 100=normal, values 1-255 are legal. Alters top speed better than CV5</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="ZIMO Course influence F-L" CV="96" tooltip="selected speed between F L (MX9 and/or HLU) from version 52, see CV59, 60">
         <decVal/>
         <label>ZIMO Course influence F-L</label>

diff --git a/xml/decoders/CT_Elektronik_Sound_SL_v40.xml b/xml/decoders/CT_Elektronik_Sound_SL_v40.xml
@@ -1801,10 +1801,7 @@
         <label>Track Voltage Reference</label>
         <comment>160=16v track volts, appears to be percentage in reality, 100=normal, values 1-255 are legal. Alters top speed better than CV5</comment>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="ZIMO Course influence F-L" CV="96" tooltip="selected speed between F L (MX9 and/or HLU) from version 52, see CV59, 60">
         <decVal/>
         <label>ZIMO Course influence F-L</label>

diff --git a/xml/decoders/DCC_Concepts_Loco.xml b/xml/decoders/DCC_Concepts_Loco.xml
@@ -498,10 +498,7 @@
         <decVal/>
         <label>Dimming Brightness</label>
       </variable>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- CV 105-106 -->
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <variable CV="112" default="1" item="Function F0F effect generated">

diff --git a/xml/decoders/DCC_Concepts_Zen.xml b/xml/decoders/DCC_Concepts_Zen.xml
@@ -785,10 +785,7 @@
           <tooltip>Range: 1-30</tooltip>
         </variable>
         <!-- Speed Table -->
-        <variable item="Speed Table" CV="67">
-          <speedTableVal/>
-          <label>Speed Table</label>
-        </variable>
+        <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
         <!-- CV 105-106 -->
         <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
         <!-- Light effects -->

diff --git a/xml/decoders/Digitrax_01x3.xml b/xml/decoders/Digitrax_01x3.xml
@@ -538,11 +538,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/decoderLockId16.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <!-- Warning message for DN143K2 for display on the Function map pane -->

diff --git a/xml/decoders/Digitrax_01x6.xml b/xml/decoders/Digitrax_01x6.xml
@@ -241,11 +241,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/decoderLockId16.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
     </variables>

diff --git a/xml/decoders/Digitrax_0SFX.xml b/xml/decoders/Digitrax_0SFX.xml
@@ -324,11 +324,7 @@
       <xi:include href="http://jmri.org/xml/decoders/digitrax/cv62.63LightingOptions.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <!-- Software information - Read-only -->

diff --git a/xml/decoders/Digitrax_0SFX_Series6.xml b/xml/decoders/Digitrax_0SFX_Series6.xml
@@ -343,11 +343,7 @@
       <xi:include href="http://jmri.org/xml/decoders/digitrax/cv64LogicLevel21MTC.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <!-- Software information - Read-only -->

diff --git a/xml/decoders/Digitrax_1SFX.xml b/xml/decoders/Digitrax_1SFX.xml
@@ -276,11 +276,7 @@
       <xi:include href="http://jmri.org/xml/decoders/digitrax/cv62.63LightingOptions.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
       <variable CV="105" item="User Id #1" default="252" include="6009">

diff --git a/xml/decoders/Digitrax_1x2.xml b/xml/decoders/Digitrax_1x2.xml
@@ -617,11 +617,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the fixed Function-Output mapping -->
       <constant item="FL(f) controls output 1" minOut="1" default="1"/>
       <constant item="FL(r) controls output 2" minOut="2" default="1"/>

diff --git a/xml/decoders/Digitrax_Basic.xml b/xml/decoders/Digitrax_Basic.xml
@@ -521,11 +521,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the fixed Function-Output mapping -->
       <constant item="FL(f) controls output 1" minOut="1" default="1"/>
       <constant item="FL(r) controls output 2" minOut="2" default="1"/>

diff --git a/xml/decoders/Digitrax_CS.xml b/xml/decoders/Digitrax_CS.xml
@@ -268,11 +268,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the fixed Function-Output mapping -->
       <constant item="FL(f) controls output 1" minOut="1" default="1"/>
       <constant item="FL(r) controls output 2" minOut="2" default="1"/>

diff --git a/xml/decoders/Digitrax_Economy.xml b/xml/decoders/Digitrax_Economy.xml
@@ -163,11 +163,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <!-- Define the Function-Output mapping based on NMRA definitions -->
       <variable item="FL(f) controls output 1" CV="33" mask="XXXXXXXV" minOut="1" default="1">
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>

diff --git a/xml/decoders/Digitrax_Economy_Series6.xml b/xml/decoders/Digitrax_Economy_Series6.xml
@@ -72,11 +72,7 @@
       <xi:include href="http://jmri.org/xml/decoders/nmra/decoderLockId16.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella Velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
     </variables>

diff --git a/xml/decoders/Digitrax_STD.xml b/xml/decoders/Digitrax_STD.xml
@@ -73,21 +73,17 @@
         <label xml:lang="it">Stato Funzione Modo - FL(indietro)</label>
       </variable>
       <!-- CV=19 -->
-     <xi:include href="http://jmri.org/xml/decoders/nmra/consistAddrDirection.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/consistAddrDirection.xml"/>
       <!-- CV=29 -->
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29speedSteps.xml"/>
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29analog.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29speedSteps.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29analog.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/cv29table3-28.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="Directional Headlights" CV="61" mask="XXXXXXXV">
         <enumVal>
           <enumChoice choice="Normal headlight operation">

diff --git a/xml/decoders/Digitrax_xearly.xml b/xml/decoders/Digitrax_xearly.xml
@@ -73,19 +73,15 @@
         <label xml:lang="it">Stato Funzione in Analogico - FL(indietro)</label>
       </variable>
       <!-- CV=29 -->
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29speedSteps.xml"/>
-     <xi:include href="http://jmri.org/xml/decoders/nmra/cv29analog.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29speedSteps.xml"/>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv29analog.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/cv29table3-28.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
       <xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
-      <variable item="Speed Table" CV="67">
-        <speedTableVal/>
-        <label>Speed Table</label>
-        <label xml:lang="it">Tabella velocità</label>
-      </variable>
+      <xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
       <variable item="Directional Headlights" CV="61" mask="XXXXXXXV">
         <enumVal>
           <enumChoice choice="Normal headlight operation">