From 7d14c2747c788c1cf49eb599ddea0fd15d4b58fa Mon Sep 17 00:00:00 2001
From: Dave Heap <dgheap@gmail.com>
Date: Fri, 10 Apr 2020 15:59:49 +1000
Subject: [PATCH] LokPilot 5 and other 5 updates.

---
 xml/decoders/ESU_Essential_Sound_Unit.xml |   3 +
 xml/decoders/ESU_LokSound5.xml            |   6 +
 xml/decoders/esu/v4advancedPane.xml       | 135 +--------
 xml/decoders/esu/v4cv21.22.xml            | 320 +++++++++++-----------
 xml/decoders/esu/v4fnSetPane.xml          |  19 +-
 xml/decoders/esu/v4soundLevelsPane.xml    |  16 ++
 xml/decoders/esu/v4soundPane.xml          |   2 +-
 xml/decoders/esu/v4speedTablePane.xml     |   2 +-
 xml/decoders/esu/v4standardCVs.xml        |  10 +-
 xml/decoders/esu/v5soundCVs.xml           | 120 +++-----
 xml/decoders/esu/v5standardCVs.xml        | 177 +++++++++---
 11 files changed, 396 insertions(+), 414 deletions(-)

diff --git a/xml/decoders/ESU_Essential_Sound_Unit.xml b/xml/decoders/ESU_Essential_Sound_Unit.xml
index d8e38901654..bbca79faa61 100644
--- a/xml/decoders/ESU_Essential_Sound_Unit.xml
+++ b/xml/decoders/ESU_Essential_Sound_Unit.xml
@@ -15,7 +15,9 @@
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:noNamespaceSchemaLocation="http://jmri.org/xml/schema/decoder-4-15-2.xsd">
     <!-- ver1 made from the ESU_LokSoundV5 file -->
+    <!-- ver2 updates for new firmware and reorganise code shared with LokPilot 5  -->
     <version author="Dave Heap" version="1" lastUpdated="20190507"/>
+    <version author="Dave Heap" version="2" lastUpdated="20200410"/>
     <decoder>
         <family name="ESU Miscellaneous decoders" mfg="Electronic Solutions Ulm GmbH" lowVersionID="255" highVersionID="255">
             <model model="Essential Sound Unit" numOuts="4" productID="16777363">
@@ -138,6 +140,7 @@
     <!--   <xi:include href="http://jmri.org/xml/decoders/esu/v4testPane.xml"/> -->
     <xi:include href="http://jmri.org/xml/decoders/esu/v4basicSpeedControlPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4speedTablePane.xml"/>
+    <xi:include href="http://jmri.org/xml/decoders/esu/v5ConsistPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4advancedPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4lightsPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4soundPane.xml"/>
diff --git a/xml/decoders/ESU_LokSound5.xml b/xml/decoders/ESU_LokSound5.xml
index 4cf330730a6..0de420fdb23 100644
--- a/xml/decoders/ESU_LokSound5.xml
+++ b/xml/decoders/ESU_LokSound5.xml
@@ -15,7 +15,9 @@
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:noNamespaceSchemaLocation="http://jmri.org/xml/schema/decoder-4-15-2.xsd">
     <!-- ver1 made from the ESU_LokSoundV4_0 file -->
+    <!-- ver2 updates for new firmware and reorganise code shared with LokPilot 5  -->
     <version author="Dave Heap" version="1" lastUpdated="20190507"/>
+    <version author="Dave Heap" version="2" lastUpdated="20200410"/>
     <decoder>
         <family name="ESU LokSound 5" mfg="Electronic Solutions Ulm GmbH" lowVersionID="255" highVersionID="255">
             <model model="LokSound 5" numOuts="20" maxMotorCurrent="1.5A" extFnsESU="V5" productID="33554582">
@@ -42,6 +44,9 @@
             <model model="LokSound 5 XL" numOuts="20" maxMotorCurrent="5A" extFnsESU="V5" productID="33554591">
                 <size length="51.0" width="40.0" height="14.0" units="mm"/>
             </model>
+            <model model="LokSound 5 MKL" numOuts="20" maxMotorCurrent="5A" extFnsESU="V5" productID="33554598">
+                <size length="51.0" width="40.0" height="14.0" units="mm"/>
+            </model>
             <xi:include href="http://jmri.org/xml/decoders/esu/v5lsOutputLabels.xml"/>
             <functionlabels>
                 <functionlabel num="0" lockable="true">
@@ -95,6 +100,7 @@
     <!--   <xi:include href="http://jmri.org/xml/decoders/esu/v4testPane.xml"/> -->
     <xi:include href="http://jmri.org/xml/decoders/esu/v4basicSpeedControlPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4speedTablePane.xml"/>
+    <xi:include href="http://jmri.org/xml/decoders/esu/v5ConsistPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4advancedPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4lightsPane.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v4soundPane.xml"/>
diff --git a/xml/decoders/esu/v4advancedPane.xml b/xml/decoders/esu/v4advancedPane.xml
index 7ac4e9890c1..d538bf606a3 100644
--- a/xml/decoders/esu/v4advancedPane.xml
+++ b/xml/decoders/esu/v4advancedPane.xml
@@ -14,17 +14,11 @@
             <text xml:lang="de">Protokolle Aktivieren</text>
             <text xml:lang="ca">Protocols Habilitats</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 Advanced Protocols DCC" format="checkbox"/>
         <display item="ESU V4 Advanced Protocols Motorola®" format="checkbox"/>
         <display item="ESU V4 Advanced Protocols Selectrix®" format="checkbox"/>
         <display item="ESU V4 Advanced Protocols M4" format="checkbox"/>
         <display item="ESU V4 Advanced Protocols Additional Addresses" layout="above"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>Command Station Compatibility</text>
@@ -32,17 +26,11 @@
             <text xml:lang="de">Steuerungskompatibilität</text>
             <text xml:lang="ca">Compatibilitat amb la central</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 Compatibility LGB" format="checkbox"/>
         <display item="ESU V4 Compatibility Marklin Delta" format="checkbox"/>
         <display item="ESU V4 Compatibility ZIMO MF" format="checkbox"/>
         <display item="ESU V4 Compatibility SUSI" format="checkbox"/>
         <display item="Analog Control check 1" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>RailCom® Settings</text>
@@ -50,107 +38,53 @@
             <text xml:lang="de">RailCom®</text>
             <text xml:lang="ca">Configuració Railcom</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 RailCom Enable" format="checkbox"/>
         <display item="ESU V4 RailCom Auto" format="checkbox"/>
         <display item="ESU V4 RailCom Channel 1" format="checkbox"/>
         <display item="ESU V4 RailCom Channel 2" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
-            <text>Speed Step Mode</text>
-            <text xml:lang="it">Modalità Passaggio Velocità</text>
-            <text xml:lang="de">Fahrstufenmodus</text>
-            <text xml:lang="ca">Mode de Passos de Velocitat</text>
-        </label>
-        <label>
-            <text> </text>
-        </label>
-        <display item="ESU V4 Auto Speed Step" format="checkbox"/>
-        <label>
-            <text> </text>
+            <text>RailComPlus® &amp; M4 Master Decoder Synchronization</text>
+            <text xml:lang="it">RailComPlus® &amp; M4 Master Decoder Synchronization</text>
+            <text xml:lang="de">RailComPlus® &amp; M4 Master Decoder Synchronization</text>
+            <text xml:lang="ca">RailComPlus® &amp; M4 Master Decoder Synchronization</text>
         </label>
+        <row>
+            <column>
+                <display item="M4MfgId" layout="left">
+                </display>
+                <display item="M4SerNo" layout="left">
+                </display>
+            </column>
+        </row>
         <separator/>
         <label>
             <text>Memory Settings</text>
             <text xml:lang="de">Speichereinstellungen</text>
             <text xml:lang="ca">Propietats de memòria</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 Memory Settings Functions" format="checkbox"/>
         <display item="ESU V4 Memory Settings Speed" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
-        <separator/>
-        <label>
-            <text>Power Pack</text>
-        </label>
-        <label>
-            <text> </text>
-        </label>
         <row>
             <display item="ESU V4 Power Fail Bypass" layout="right" label=""/>
             <display item="ESU V4 Power Fail Bypass" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
-            <text>Preserve Direction</text>
-            <text xml:lang="de">Fahrtrichtung</text>
-            <text xml:lang="ca">Preserva el sentit</text>
-        </label>
-        <label>
-            <text> </text>
+            <text>Miscellaneous</text>
         </label>
+        <display item="ESU V4 Auto Speed Step" format="checkbox"/>
         <display item="ESU V4 Preserve Direction" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
-        <separator/>
-        <label>
-            <text>Starting Delay</text>
-            <text xml:lang="de">Verzögerter Start</text>
-            <text xml:lang="ca">Inici del retard</text>
-        </label>
-        <label>
-            <text> </text>
-        </label>
+        <display item="ESU V4 E-Stop on Speed Step 0" format="checkbox"/>
         <display item="ESU V4 Starting Delay" format="checkbox"/>
         <row>
             <display item="ESU V4 Starting Delay Time" layout="right" label=""/>
             <display item="ESU V4 Starting Delay Time" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
-        <!--         <group exclude="Essential Sound Unit,ESU LokSound 5"> -->
-        <separator/>
-        <label>
-            <text>Stop Behaviour</text>
-            <text xml:lang="de">Stop Verhalten</text>
-            <text xml:lang="ca">Comportament de parada</text>
-        </label>
-        <label>
-            <text> </text>
-        </label>
-        <display item="ESU V4 E-Stop on Seed Step 0" format="checkbox"/>
-        <!--         </group> -->
         <separator/>
         <label>
             <text>Decoder Lock</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 Decoder Lock Enable" format="checkbox"/>
         <display item="ESU V4 Decoder Lock CV15" format="checkbox"/>
         <display item="ESU V4 Decoder Lock CV16" format="checkbox"/>
@@ -178,17 +112,11 @@
             <display item="ESU V5 ABC Shuttle Train" layout="right" label=""/>
             <display item="ESU V5 ABC Shuttle Train" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>HLU Brake Sections</text>
             <text xml:lang="de">HLU Bremskonfiguration</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 HLU" format="checkbox"/>
         <row>
             <display item="ESU V5 HLU Speed Limit 1" layout="right" label=""/>
@@ -210,44 +138,26 @@
             <display item="ESU V5 HLU Speed Limit 5" layout="right" label=""/>
             <display item="ESU V5 HLU Speed Limit 5" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>DC Brake Sections</text>
             <text xml:lang="de">DC Bremskonfiguration</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 DC Brake Forward" format="checkbox"/>
         <display item="ESU V4 DC Brake Reverse" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>Selectrix® Brake Sections</text>
             <text xml:lang="de">Selectrix® Bremskonfiguration</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <display item="ESU V4 Selectrix Brake Forward" format="checkbox"/>
         <display item="ESU V4 Selectrix Brake Reverse" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>Constant Brake Distance</text>
             <text xml:lang="de">Konstanter Bremsweg</text>
             <text xml:lang="ca">Distància de frenada constant</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <row>
             <display item="ESU V4 Constant Brake Forward" layout="right" label=""/>
             <display item="ESU V4 Constant Brake Forward" layout="right" format="hslider"/>
@@ -261,32 +171,20 @@
             <display item="ESU V4 Constant Brake Time" layout="right" format="hslider"/>
         </row>
         <display item="ESU V4 Constant Brake" format="checkbox"/>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>Brake Section Settings</text>
             <text xml:lang="de">Bremsstrecken Einstellungen</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <row>
             <display item="ESU V5 Brake Mode Exit Delay" layout="right" label=""/>
             <display item="ESU V5 Brake Mode Exit Delay" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
         <separator/>
         <label>
             <text>Brake Functions</text>
             <text xml:lang="de">Bremsfunktion</text>
         </label>
-        <label>
-            <text> </text>
-        </label>
         <row>
             <display item="ESU V4 Brake Function 1 Deceleration" layout="right" label=""/>
             <display item="ESU V4 Brake Function 1 Deceleration" layout="right" format="hslider"/>
@@ -311,8 +209,5 @@
             <display item="ESU V4 Brake Function 3 max Speed" layout="right" label=""/>
             <display item="ESU V4 Brake Function 3 max Speed" layout="right" format="hslider"/>
         </row>
-        <label>
-            <text> </text>
-        </label>
     </column>
 </pane>
diff --git a/xml/decoders/esu/v4cv21.22.xml b/xml/decoders/esu/v4cv21.22.xml
index 2502fb47dcb..b0ba09ddbf8 100644
--- a/xml/decoders/esu/v4cv21.22.xml
+++ b/xml/decoders/esu/v4cv21.22.xml
@@ -12,164 +12,164 @@
 <!-- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  -->
 <!-- for more details.                                                      -->
 <variables 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">
-  <copyright xmlns="http://docbook.org/ns/docbook">
-    <year>2010</year>
-    <holder>JMRI</holder>
-  </copyright>
-  <authorgroup xmlns="http://docbook.org/ns/docbook">
-    <author>
-      <personname>
-        <firstname>Bob</firstname>
-        <surname>Jacobsen</surname>
-      </personname>
-    </author>
-  </authorgroup>
-  <revhistory xmlns="http://docbook.org/ns/docbook">
-    <revision>
-      <revnumber>7</revnumber>
-      <date>2017-07-22</date>
-      <authorinitials>RK</authorinitials>
-      <revremark>German translation and revision</revremark>
-    </revision>
-    <revision>
-      <revnumber>6</revnumber>
-      <date>2010-03-12</date>
-      <authorinitials>BJ</authorinitials>
-      <revremark>Initial release as separate file</revremark>
-    </revision>
-    <revision>
-      <revnumber>5</revnumber>
-      <date>2003-12-05</date>
-      <authorinitials>BJ</authorinitials>
-      <revremark>Revision in original 0NMRA.xml file</revremark>
-    </revision>
-  </revhistory>
-  <variable item="Consist Address Active For F1" CV="21" mask="XXXXXXXV">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F1</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F1</label>
-    <label xml:lang="fr">Adresse UM active pour F1</label>
-    <label xml:lang="de">Verbundadresse aktiv für F1</label>
-    <label xml:lang="ca">Adreça activa per F1 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F2" CV="21" mask="XXXXXXVX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F2</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F2</label>
-    <label xml:lang="fr">Adresse UM active pour F2</label>
-    <label xml:lang="de">Verbundadresse aktiv für F2</label>
-    <label xml:lang="ca">Adreça activa per F2 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F3" CV="21" mask="XXXXXVXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F3</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F3</label>
-    <label xml:lang="fr">Adresse UM active pour F3</label>
-    <label xml:lang="de">Verbundadresse aktiv für F3</label>
-    <label xml:lang="ca">Adreça activa per F3 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F4" CV="21" mask="XXXXVXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F4</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F4</label>
-    <label xml:lang="fr">Adresse UM active pour F4</label>
-    <label xml:lang="de">Verbundadresse aktiv für F4</label>
-    <label xml:lang="ca">Adreça activa per F4 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F5" CV="21" mask="XXXVXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F5</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F5</label>
-    <label xml:lang="fr">Adresse UM active pour F5</label>
-    <label xml:lang="de">Verbundadresse aktiv für F5</label>
-    <label xml:lang="ca">Adreça activa per F5 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F6" CV="21" mask="XXVXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F6</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F6</label>
-    <label xml:lang="fr">Adresse UM active pour F6</label>
-    <label xml:lang="de">Verbundadresse aktiv für F6</label>
-    <label xml:lang="ca">Adreça activa per F6 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F7" CV="21" mask="XVXXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F7</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F7</label>
-    <label xml:lang="fr">Adresse UM active pour F7</label>
-    <label xml:lang="de">Verbundadresse aktiv für F7</label>
-    <label xml:lang="ca">Adreça activa per F7 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F8" CV="21" mask="VXXXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F8</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F8</label>
-    <label xml:lang="fr">Adresse UM active pour F8</label>
-    <label xml:lang="de">Verbundadresse aktiv für F8</label>
-    <label xml:lang="ca">Adreça activa per F8 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F0" CV="22" mask="XXXXXXXV">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F0</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F0</label>
-    <label xml:lang="fr">Adresse UM active pour F0</label>
-    <label xml:lang="de">Verbundadresse aktiv für F0</label>
-    <label xml:lang="ca">Adreça activa per F1 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F9" CV="22" mask="XXXXXXVX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F9</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F9</label>
-    <label xml:lang="fr">Adresse UM active pour F9</label>
-    <label xml:lang="de">Verbundadresse aktiv für F9</label>
-    <label xml:lang="ca">Adreça activa per F9 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F10" CV="22" mask="XXXXXVXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F10</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F10</label>
-    <label xml:lang="fr">Adresse UM active pour F10</label>
-    <label xml:lang="de">Verbundadresse aktiv für F10</label>
-    <label xml:lang="ca">Adreça activa per F10 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F11" CV="22" mask="XXXXVXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F11</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F11</label>
-    <label xml:lang="fr">Adresse UM active pour F11</label>
-    <label xml:lang="de">Verbundadresse aktiv für F11</label>
-    <label xml:lang="ca">Adreça activa per F11 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F12" CV="22" mask="XXXVXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F12</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F12</label>
-    <label xml:lang="fr">Adresse UM active pour F12</label>
-    <label xml:lang="de">Verbundadresse aktiv für F12</label>
-    <label xml:lang="ca">Adreça activa per F12 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F13" CV="22" mask="XXVXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F13</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F13</label>
-    <label xml:lang="fr">Adresse UM active pour F13</label>
-    <label xml:lang="de">Verbundadresse aktiv für F13</label>
-    <label xml:lang="ca">Adreça activa per F13 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F14" CV="22" mask="XVXXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F14</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F14</label>
-    <label xml:lang="fr">Adresse UM active pour F14</label>
-    <label xml:lang="de">Verbundadresse aktiv für F14</label>
-    <label xml:lang="ca">Adreça activa per F14 en MT</label>
-  </variable>
-  <variable item="Consist Address Active For F15" CV="22" mask="VXXXXXXX">
-    <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
-    <label>Consist Address Active For F15</label>
-    <label xml:lang="it">Indirizzo Consist Attivo per F15</label>
-    <label xml:lang="fr">Adresse UM active pour F15</label>
-    <label xml:lang="de">Verbundadresse aktiv für F15</label>
-    <label xml:lang="ca">Adreça activa per F15 en MT</label>
-  </variable>
+    <copyright xmlns="http://docbook.org/ns/docbook">
+        <year>2010</year>
+        <holder>JMRI</holder>
+    </copyright>
+    <authorgroup xmlns="http://docbook.org/ns/docbook">
+        <author>
+            <personname>
+                <firstname>Bob</firstname>
+                <surname>Jacobsen</surname>
+            </personname>
+        </author>
+    </authorgroup>
+    <revhistory xmlns="http://docbook.org/ns/docbook">
+        <revision>
+            <revnumber>7</revnumber>
+            <date>2017-07-22</date>
+            <authorinitials>RK</authorinitials>
+            <revremark>German translation and revision</revremark>
+        </revision>
+        <revision>
+            <revnumber>6</revnumber>
+            <date>2010-03-12</date>
+            <authorinitials>BJ</authorinitials>
+            <revremark>Initial release as separate file</revremark>
+        </revision>
+        <revision>
+            <revnumber>5</revnumber>
+            <date>2003-12-05</date>
+            <authorinitials>BJ</authorinitials>
+            <revremark>Revision in original 0NMRA.xml file</revremark>
+        </revision>
+    </revhistory>
+    <variable item="Consist Address Active For F1" CV="21" mask="XXXXXXXV">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F1</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F1</label>
+        <label xml:lang="fr">Adresse UM active pour F1</label>
+        <label xml:lang="de">Verbundadresse aktiv für F1</label>
+        <label xml:lang="ca">Adreça activa per F1 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F2" CV="21" mask="XXXXXXVX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F2</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F2</label>
+        <label xml:lang="fr">Adresse UM active pour F2</label>
+        <label xml:lang="de">Verbundadresse aktiv für F2</label>
+        <label xml:lang="ca">Adreça activa per F2 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F3" CV="21" mask="XXXXXVXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F3</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F3</label>
+        <label xml:lang="fr">Adresse UM active pour F3</label>
+        <label xml:lang="de">Verbundadresse aktiv für F3</label>
+        <label xml:lang="ca">Adreça activa per F3 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F4" CV="21" mask="XXXXVXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F4</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F4</label>
+        <label xml:lang="fr">Adresse UM active pour F4</label>
+        <label xml:lang="de">Verbundadresse aktiv für F4</label>
+        <label xml:lang="ca">Adreça activa per F4 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F5" CV="21" mask="XXXVXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F5</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F5</label>
+        <label xml:lang="fr">Adresse UM active pour F5</label>
+        <label xml:lang="de">Verbundadresse aktiv für F5</label>
+        <label xml:lang="ca">Adreça activa per F5 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F6" CV="21" mask="XXVXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F6</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F6</label>
+        <label xml:lang="fr">Adresse UM active pour F6</label>
+        <label xml:lang="de">Verbundadresse aktiv für F6</label>
+        <label xml:lang="ca">Adreça activa per F6 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F7" CV="21" mask="XVXXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F7</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F7</label>
+        <label xml:lang="fr">Adresse UM active pour F7</label>
+        <label xml:lang="de">Verbundadresse aktiv für F7</label>
+        <label xml:lang="ca">Adreça activa per F7 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F8" CV="21" mask="VXXXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F8</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F8</label>
+        <label xml:lang="fr">Adresse UM active pour F8</label>
+        <label xml:lang="de">Verbundadresse aktiv für F8</label>
+        <label xml:lang="ca">Adreça activa per F8 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F0" CV="22" mask="XXXXXXXV">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F0</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F0</label>
+        <label xml:lang="fr">Adresse UM active pour F0</label>
+        <label xml:lang="de">Verbundadresse aktiv für F0</label>
+        <label xml:lang="ca">Adreça activa per F1 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F9" CV="22" mask="XXXXXXVX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F9</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F9</label>
+        <label xml:lang="fr">Adresse UM active pour F9</label>
+        <label xml:lang="de">Verbundadresse aktiv für F9</label>
+        <label xml:lang="ca">Adreça activa per F9 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F10" CV="22" mask="XXXXXVXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F10</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F10</label>
+        <label xml:lang="fr">Adresse UM active pour F10</label>
+        <label xml:lang="de">Verbundadresse aktiv für F10</label>
+        <label xml:lang="ca">Adreça activa per F10 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F11" CV="22" mask="XXXXVXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F11</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F11</label>
+        <label xml:lang="fr">Adresse UM active pour F11</label>
+        <label xml:lang="de">Verbundadresse aktiv für F11</label>
+        <label xml:lang="ca">Adreça activa per F11 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F12" CV="22" mask="XXXVXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F12</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F12</label>
+        <label xml:lang="fr">Adresse UM active pour F12</label>
+        <label xml:lang="de">Verbundadresse aktiv für F12</label>
+        <label xml:lang="ca">Adreça activa per F12 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F13" CV="22" mask="XXVXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F13</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F13</label>
+        <label xml:lang="fr">Adresse UM active pour F13</label>
+        <label xml:lang="de">Verbundadresse aktiv für F13</label>
+        <label xml:lang="ca">Adreça activa per F13 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F14" CV="22" mask="XVXXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F14</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F14</label>
+        <label xml:lang="fr">Adresse UM active pour F14</label>
+        <label xml:lang="de">Verbundadresse aktiv für F14</label>
+        <label xml:lang="ca">Adreça activa per F14 en MT</label>
+    </variable>
+    <variable item="Consist Address Active For F15" CV="22" mask="VXXXXXXX">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
+        <label>Consist Address Active For F15</label>
+        <label xml:lang="it">Indirizzo Consist Attivo per F15</label>
+        <label xml:lang="fr">Adresse UM active pour F15</label>
+        <label xml:lang="de">Verbundadresse aktiv für F15</label>
+        <label xml:lang="ca">Adreça activa per F15 en MT</label>
+    </variable>
 </variables>
diff --git a/xml/decoders/esu/v4fnSetPane.xml b/xml/decoders/esu/v4fnSetPane.xml
index 30ab423e620..6611ce7a3b0 100644
--- a/xml/decoders/esu/v4fnSetPane.xml
+++ b/xml/decoders/esu/v4fnSetPane.xml
@@ -97,22 +97,29 @@
             <text> </text>
         </label>
         <row>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 1" layout="above" label=""/>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 1" layout="above" format="hslider"/>
+            <display item="ESU Auto Uncoupling Speed" layout="above" label=""/>
+            <display item="ESU Auto Uncoupling Speed" layout="above" format="hslider"/>
         </row>
         <label>
             <text> </text>
         </label>
         <row>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 2" layout="above" label=""/>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 2" layout="above" format="hslider"/>
+            <display item="ESU Auto Uncoupling Push Time" layout="above" label=""/>
+            <display item="ESU Auto Uncoupling Push Time" layout="above" format="hslider"/>
         </row>
         <label>
             <text> </text>
         </label>
         <row>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 3" layout="above" label=""/>
-            <display item="ESU V4 Function Settings Auto Uncoupling Slider 3" layout="above" format="hslider"/>
+            <display item="ESU Auto Uncoupling Wait Time" layout="above" label=""/>
+            <display item="ESU Auto Uncoupling Wait Time" layout="above" format="hslider"/>
+        </row>
+        <label>
+            <text> </text>
+        </label>
+        <row>
+            <display item="ESU Auto Uncoupling Remove Time" layout="above" label=""/>
+            <display item="ESU Auto Uncoupling Remove Time" layout="above" format="hslider"/>
         </row>
     </column>
     <group exclude="ESU LokPilot Standard V1.0">
diff --git a/xml/decoders/esu/v4soundLevelsPane.xml b/xml/decoders/esu/v4soundLevelsPane.xml
index 5923d7a4ed1..21a5c9f63d8 100644
--- a/xml/decoders/esu/v4soundLevelsPane.xml
+++ b/xml/decoders/esu/v4soundLevelsPane.xml
@@ -99,6 +99,22 @@
                 </label>
             </griditem>
         </grid>
+        <group include="ESU LokSound 5,Essential Sound Unit">
+            <label>
+                <text> </text>
+            </label>
+            <row>
+                <label>
+                    <text>Slot Volumes above 128 need firmware version 5.1.96 or later ("Read full sheet" may be needed to check). Your version is</text>
+                </label>
+                <display item="Firmware Major Version" label=""/>
+                <display item="Firmware Minor Version" label=""/>
+                <display item="Firmware Build Number" label=""/>
+            </row>
+            <label>
+                <text> </text>
+            </label>
+        </group>
         <grid gridx="NEXT" gridy="CURRENT" ipadx="10" ipady="10">
             <!-- default settings for all grid items -->
             <griditem gridx="0" gridy="NEXT" weightx="1" anchor="LINE_END">
diff --git a/xml/decoders/esu/v4soundPane.xml b/xml/decoders/esu/v4soundPane.xml
index 527e2c5e869..a2c35f0b22f 100644
--- a/xml/decoders/esu/v4soundPane.xml
+++ b/xml/decoders/esu/v4soundPane.xml
@@ -121,7 +121,7 @@
             <text> </text>
         </label>
     </column>
-    <group exclude="ESU LokSound 5,Essential Sound Unit">
+    <group exclude="ESU LokSound 5,Essential Sound Unit,ESU LokPilot 5">
         <column>
             <separator/>
             <label>
diff --git a/xml/decoders/esu/v4speedTablePane.xml b/xml/decoders/esu/v4speedTablePane.xml
index a0da3668222..f75c9a05a34 100644
--- a/xml/decoders/esu/v4speedTablePane.xml
+++ b/xml/decoders/esu/v4speedTablePane.xml
@@ -65,7 +65,7 @@
                     </row>
                 </column>
             </griditem>
-            <group include="ESU LokSound V4.0,ESU LokSound Select,ESU LokPilot V4.0,ESU LokSound 5,Essential Sound Unit">
+            <group include="ESU LokSound V4.0,ESU LokSound Select,ESU LokPilot V4.0,ESU LokSound 5,ESU LokPilot 5,Essential Sound Unit">
                 <griditem weightx="0" anchor="LINE_START">
                     <display item="Vstart" tooltip="Sets the starting voltage at throttle speed step 1">
                         <tooltip xml:lang="it">Imposta Tensione Motore iniziale a Velocità 1</tooltip>
diff --git a/xml/decoders/esu/v4standardCVs.xml b/xml/decoders/esu/v4standardCVs.xml
index d3ca37dd432..f1a239831e2 100644
--- a/xml/decoders/esu/v4standardCVs.xml
+++ b/xml/decoders/esu/v4standardCVs.xml
@@ -541,7 +541,7 @@
         <label>Enable Output Driver on AUX3 and AUX4</label>
         <label xml:lang="ca">Activa Sortides en AUX3 i AUX4</label>
     </variable>
-    <variable CV="245" mask="XVXXXXXX" default="0" item="ESU V4 E-Stop on Seed Step 0">
+    <variable CV="245" mask="XVXXXXXX" default="0" item="ESU V4 E-Stop on Speed Step 0">
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
         <label>Stop immediately on speed step 0</label>
         <label xml:lang="de">Sofortiger Stop bei FS 0</label>
@@ -629,27 +629,27 @@
         <tooltip>Value multiplied by 0.25 = Time from Full Speed to Stop.</tooltip>
         <tooltip xml:lang="de">Wert multipliziert mit 0.25 = Zeit von Maximalgeschwindigkeit bis Stop</tooltip>
     </variable>
-    <variable CV="245" mask="XVXXXXXX" default="0" item="ESU V4 E-Stop on Seed Step 0" include="LokSound Micro V4.0,LokSound XL V4.0">
+    <variable CV="245" mask="XVXXXXXX" default="0" item="ESU V4 E-Stop on Speed Step 0" include="LokSound Micro V4.0,LokSound XL V4.0">
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
         <label>Stop immediately on speed step 0</label>
         <label xml:lang="de">Sofortiger Stop bei FS=0</label>
         <label xml:lang="ca">Para inmeditament en pas =</label>
     </variable>
     <!-- E nicht beschrieben -->
-    <variable CV="246" default="0" item="ESU V4 Function Settings Auto Uncoupling Slider 1" exclude="LokPilot Fx V4.0">
+    <variable CV="246" default="0" item="ESU Auto Uncoupling Speed" exclude="LokPilot Fx V4.0">
         <decVal/>
         <label>Auto Uncoupling Speed</label>
         <label xml:lang="de">Entkuppeln - Fahrtgeschwindigkeit</label>
         <label xml:lang="ca">Velociat de desenganxat automàtic</label>
     </variable>
-    <variable CV="247" default="0" tooltip="Unit is 0.016384 seconds" item="ESU V4 Function Settings Auto Uncoupling Slider 3" exclude="LokPilot Fx V4.0">
+    <variable CV="247" default="0" tooltip="Unit is 0.016384 seconds" item="ESU Auto Uncoupling Remove Time" exclude="LokPilot Fx V4.0">
         <decVal/>
         <label>Auto Uncoupling Remove Time</label>
         <label xml:lang="de">     Entkuppeln - Abrückzeit     </label>
         <tooltip xml:lang="de">die Einheit sind 0.016384 sec</tooltip>
         <label xml:lang="ca">Temps d'autodesacoblament d'un tren</label>
     </variable>
-    <variable CV="248" default="0" tooltip="Unit is 0.016384 seconds" item="ESU V4 Function Settings Auto Uncoupling Slider 2" exclude="LokPilot Fx V4.0">
+    <variable CV="248" default="0" tooltip="Unit is 0.016384 seconds" item="ESU Auto Uncoupling Push Time" exclude="LokPilot Fx V4.0">
         <decVal/>
         <label>Auto Uncoupling Push Time</label>
         <label xml:lang="de">    Entkuppeln - Andrückzeit     </label>
diff --git a/xml/decoders/esu/v5soundCVs.xml b/xml/decoders/esu/v5soundCVs.xml
index b4bf292f18f..64c5b3d6034 100644
--- a/xml/decoders/esu/v5soundCVs.xml
+++ b/xml/decoders/esu/v5soundCVs.xml
@@ -15,21 +15,6 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="http://jmri.org/xml/schema/decoder-4-15-2.xsd">
     <!-- Volumes -->
-    <variable CV="57" default="143" item="Sound Steam Chuffs Step 1" tooltip="Set to zero for cam input">
-        <decVal/>
-        <label>Chuff spacing speed step 1</label>
-        <label xml:lang="it">Velocità distanza Chuff step 1</label>
-        <label xml:lang="de">Dampfstöße bei FS=1</label>
-        <label xml:lang="ca">Espaiat entre xufs pas 1</label>
-        <tooltip xml:lang="de">Setzen Sie den Wert auf 0 wenn ein externer Radsensor verwendet wird.</tooltip>
-    </variable>
-    <variable CV="58" default="43" item="Sound Steam Chuffs Decrease Rate">
-        <decVal/>
-        <label>Chuff spacing decrease rate</label>
-        <label xml:lang="it">Decremento distanza Chuff</label>
-        <label xml:lang="de">Anpassung bei höheren FS</label>
-        <label xml:lang="ca">Taxa decreiement xuf</label>
-    </variable>
     <variable CV="63" default="180" item="Sound Volume Master" comment="Range 0-192">
         <decVal max="192"/>
         <comment>Range 0-192</comment>
@@ -76,29 +61,6 @@
             <tooltip xml:lang="de">die Einheit ist 0.0041 s</tooltip>
         </variable>
     </variables>
-    <variable CV="141" default="20" tooltip="Unit is .0041 seconds" item="ESU V4 Function Settings Smoke Chuffs Slider 2">
-        <decVal/>
-        <label>Smoke Unit Minimum Steam Chuff Duration</label>
-        <label xml:lang="it">Durata Min.Chuff per Gener.Fumo</label>
-        <label xml:lang="de">Minimale Dauer</label>
-        <label xml:lang="ca">Unitat mínima de duració de xuf</label>
-        <tooltip xml:lang="de">die Einheit ist 0.0041 s</tooltip>
-    </variable>
-    <variable CV="142" default="122" tooltip="Unit is .0041 seconds" item="ESU V4 Function Settings Smoke Chuffs Slider 3">
-        <decVal/>
-        <label>Smoke Unit Maximum Steam Chuff Duration</label>
-        <label xml:lang="it">Durata Max.Chuff per Gener.Fumo</label>
-        <label xml:lang="de">Maximale Dauer</label>
-        <label xml:lang="ca">Unitat màxima de duració de xuf</label>
-        <tooltip xml:lang="de">die Einheit ist 0.0041 s</tooltip>
-    </variable>
-    <variable CV="143" default="102" item="ESU V4 Function Settings Smoke Chuffs Slider 1">
-        <decVal/>
-        <label>Smoke Unit Chuff Duration rel. to trig. dist.</label>
-        <label xml:lang="it">Durata Suono per Gener.Fumo in funz.dist.Trigger</label>
-        <label xml:lang="de">Dauer der Dampfstöße (relativ zu Trigger-Impulsen)</label>
-        <label xml:lang="ca">Unitat de xuf en relació a distància</label>
-    </variable>
     <variable CV="155" default="0" item="SoundCV1">
         <decVal/>
         <label>Sound CV1</label>
@@ -163,23 +125,9 @@
         <decVal/>
         <label>Sound CV16</label>
     </variable>
-    <variable CV="249" default="0" item="Sound Steam Chuffs Min Distance">
-        <decVal/>
-        <label>Chuff minimum spacing</label>
-        <label xml:lang="it">Durata Min.distanza Chuff</label>
-        <label xml:lang="de">Minimaler Abstand der Dampfstöße</label>
-        <label xml:lang="ca">Temps mínim entre xufs</label>
-    </variable>
-    <variable CV="250" default="0" item="Sound Steam Chuffs Secondary Trigger">
-        <decVal/>
-        <label>Chuff secondary trigger</label>
-        <label xml:lang="it">Trigger secondario Chuff</label>
-        <label xml:lang="de">Sekundärer Trigger</label>
-        <label xml:lang="ca">Disparador secundari</label>
-    </variable>
     <!-- Indexed variables -->
     <variable CV="16.1.259" default="128" item="Sound Volume 1">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 1 Volume</label>
         <label xml:lang="it">Volume Suono Slot 1</label>
         <label xml:lang="de">Soundslot 1 Lautstärke</label>
@@ -213,7 +161,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.267" default="128" item="Sound Volume 2">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 2 Volume</label>
         <label xml:lang="it">Volume Suono Slot 2</label>
         <label xml:lang="de">Soundslot 2 Lautstärke</label>
@@ -247,7 +195,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.275" default="128" item="Sound Volume 3">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 3 Volume</label>
         <label xml:lang="it">Volume Suono Slot 3</label>
         <label xml:lang="de">Soundslot 3 Lautstärke</label>
@@ -281,7 +229,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.283" default="128" item="Sound Volume 4">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 4 Volume</label>
         <label xml:lang="it">Volume Suono Slot 4</label>
         <label xml:lang="de">Soundslot 4 Lautstärke</label>
@@ -315,7 +263,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.291" default="128" item="Sound Volume 5">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 5 Volume</label>
         <label xml:lang="it">Volume Suono Slot 5</label>
         <label xml:lang="de">Soundslot 5 Lautstärke</label>
@@ -349,7 +297,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.299" default="128" item="Sound Volume 6">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 6 Volume</label>
         <label xml:lang="it">Volume Suono Slot 6</label>
         <label xml:lang="de">Soundslot 6 Lautstärke</label>
@@ -383,7 +331,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.307" default="128" item="Sound Volume 7">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 7 Volume</label>
         <label xml:lang="it">Volume Suono Slot 7</label>
         <label xml:lang="de">Soundslot 7 Lautstärke</label>
@@ -417,7 +365,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.1.315" default="128" item="Sound Volume 8">
-        <decVal max="128"/>
+        <decVal/>
         <label>Sound Slot 8 Volume</label>
         <label xml:lang="it">Volume Suono Slot 8</label>
         <label xml:lang="de">Soundslot 8 Lautstärke</label>
@@ -452,7 +400,7 @@
     </variable>
     <variables exclude="Essential Sound Unit">
         <variable CV="16.1.323" default="128" item="Sound Volume 9">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 9 Volume</label>
             <label xml:lang="it">Volume Suono Slot 9</label>
             <label xml:lang="de">Soundslot 9 Lautstärke</label>
@@ -486,7 +434,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.331" default="128" item="Sound Volume 10">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 10 Volume</label>
             <label xml:lang="it">Volume Suono Slot 10</label>
             <label xml:lang="de">Soundslot 10 Lautstärke</label>
@@ -520,7 +468,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.339" default="128" item="Sound Volume 11">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 11 Volume</label>
             <label xml:lang="it">Volume Suono Slot 11</label>
             <label xml:lang="de">Soundslot 11 Lautstärke</label>
@@ -554,7 +502,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.347" default="128" item="Sound Volume 12">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 12 Volume</label>
             <label xml:lang="it">Volume Suono Slot 12</label>
             <label xml:lang="de">Soundslot 12 Lautstärke</label>
@@ -588,7 +536,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.355" default="128" item="Sound Volume 13">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 13 Volume</label>
             <label xml:lang="it">Volume Suono Slot 13</label>
             <label xml:lang="de">Soundslot 13 Lautstärke</label>
@@ -622,7 +570,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.363" default="128" item="Sound Volume 14">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 14 Volume</label>
             <label xml:lang="it">Volume Suono Slot 14</label>
             <label xml:lang="de">Soundslot 14 Lautstärke</label>
@@ -656,7 +604,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.371" default="128" item="Sound Volume 15">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 15 Volume</label>
             <label xml:lang="it">Volume Suono Slot 15</label>
             <label xml:lang="de">Soundslot 15 Lautstärke</label>
@@ -690,7 +638,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.379" default="128" item="Sound Volume 16">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 16 Volume</label>
             <label xml:lang="it">Volume Suono Slot 16</label>
             <label xml:lang="de">Soundslot 16 Lautstärke</label>
@@ -724,7 +672,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.387" default="128" item="Sound Volume 17">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 17 Volume</label>
             <label xml:lang="it">Volume Suono Slot 17</label>
             <label xml:lang="de">Soundslot 17 Lautstärke</label>
@@ -758,7 +706,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.395" default="128" item="Sound Volume 18">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 18 Volume</label>
             <label xml:lang="it">Volume Suono Slot 18</label>
             <label xml:lang="de">Soundslot 18 Lautstärke</label>
@@ -792,7 +740,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.403" default="128" item="Sound Volume 19">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 19 Volume</label>
             <label xml:lang="it">Volume Suono Slot 19</label>
             <label xml:lang="de">Soundslot 19 Lautstärke</label>
@@ -826,7 +774,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.411" default="128" item="Sound Volume 20">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 20 Volume</label>
             <label xml:lang="it">Volume Suono Slot 20</label>
             <label xml:lang="de">Soundslot 20 Lautstärke</label>
@@ -860,7 +808,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.419" default="128" item="Sound Volume 21">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 21 Volume</label>
             <label xml:lang="it">Volume Suono Slot 21</label>
             <label xml:lang="de">Soundslot 21 Lautstärke</label>
@@ -894,7 +842,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.427" default="128" item="Sound Volume 22">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 22 Volume</label>
             <label xml:lang="it">Volume Suono Slot 22</label>
             <label xml:lang="de">Soundslot 22 Lautstärke</label>
@@ -928,7 +876,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.435" default="128" item="Sound Volume 23">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 23 Volume</label>
             <label xml:lang="it">Volume Suono Slot 23</label>
             <label xml:lang="de">Soundslot 23 Lautstärke</label>
@@ -962,7 +910,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.443" default="128" item="Sound Volume 24">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 24 Volume</label>
             <label xml:lang="it">Volume Suono Slot 24</label>
             <label xml:lang="de">Soundslot 24 Lautstärke</label>
@@ -996,7 +944,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.451" default="128" item="Sound Volume 25">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 25 Volume</label>
             <label xml:lang="it">Volume Suono Slot 25</label>
             <label xml:lang="de">Soundslot 25 Lautstärke</label>
@@ -1030,7 +978,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.459" default="128" item="Sound Volume 26">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 26 Volume</label>
             <label xml:lang="it">Volume Suono Slot 26</label>
             <label xml:lang="de">Soundslot 26 Lautstärke</label>
@@ -1064,7 +1012,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.467" default="128" item="Sound Volume 27">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 27 Volume</label>
             <label xml:lang="it">Volume Suono Slot 27</label>
             <label xml:lang="de">Soundslot 27 Lautstärke</label>
@@ -1098,7 +1046,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.475" default="128" item="Sound Volume 28">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 28 Volume</label>
             <label xml:lang="it">Volume Suono Slot 28</label>
             <label xml:lang="de">Soundslot 28 Lautstärke</label>
@@ -1132,7 +1080,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.483" default="128" item="Sound Volume 29">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 29 Volume</label>
             <label xml:lang="it">Volume Suono Slot 29</label>
             <label xml:lang="de">Soundslot 29 Lautstärke</label>
@@ -1166,7 +1114,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.491" default="128" item="Sound Volume 30">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 30 Volume</label>
             <label xml:lang="it">Volume Suono Slot 30</label>
             <label xml:lang="de">Soundslot 30 Lautstärke</label>
@@ -1200,7 +1148,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.499" default="128" item="Sound Volume 31">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 31 Volume</label>
             <label xml:lang="it">Volume Suono Slot 31</label>
             <label xml:lang="de">Soundslot 31 Lautstärke</label>
@@ -1234,7 +1182,7 @@
             <label xml:lang="ca">Configurqació de so</label>
         </variable>
         <variable CV="16.1.507" default="128" item="Sound Volume 32">
-            <decVal max="128"/>
+            <decVal/>
             <label>Sound Slot 32 Volume</label>
             <label xml:lang="it">Volume Suono Slot 32</label>
             <label xml:lang="de">Soundslot 32 Lautstärke</label>
@@ -1269,7 +1217,7 @@
         </variable>
     </variables>
     <variable CV="16.2.259" default="128" item="Sound Volume 33">
-        <decVal max="128"/>
+        <decVal/>
         <label>Brake Sound volume</label>
         <label xml:lang="it">Volume Freni</label>
         <label xml:lang="de">Bremsgeräusch Lautstärke</label>
@@ -1303,7 +1251,7 @@
         <label xml:lang="ca">Configurqació de so</label>
     </variable>
     <variable CV="16.2.267" default="128" item="Sound Volume 34">
-        <decVal max="128"/>
+        <decVal/>
         <label>Gear Shift Sound volume</label>
         <label xml:lang="it">Volume Cambio Marcia</label>
         <label xml:lang="de">Schaltgeräusch Lautstärke</label>
diff --git a/xml/decoders/esu/v5standardCVs.xml b/xml/decoders/esu/v5standardCVs.xml
index e7ceef839cc..beed2407724 100644
--- a/xml/decoders/esu/v5standardCVs.xml
+++ b/xml/decoders/esu/v5standardCVs.xml
@@ -72,7 +72,7 @@
         <label xml:lang="ca">Voltatge Alt</label>
         <tooltip xml:lang="de">Festlegung der Höchstgeschwindigkeit der Lok</tooltip>
     </variable>
-    <variable CV="6" default="88" item="Vmid" include="LokSound 5 DCC,LokSound 5 micro DCC,LokSound 5 micro DCC Direct,LokSound 5 L DCC">
+    <variable CV="6" default="88" item="Vmid" include="LokSound 5 DCC,LokSound 5 micro DCC,LokSound 5 micro DCC Direct,LokSound 5 L DCC,LokPilot 5 DCC,LokPilot 5 micro DCC,LokPilot 5 micro DCC Next18,LokPilot 5 L DCC,LokPilot 5 Fx micro DCC,LokPilot 5 MKL DCC">
         <decVal min="1"/>
         <label>Vmid</label>
         <label xml:lang="de">Mittengeschwindigkeit</label>
@@ -226,7 +226,7 @@
         <tooltip xml:lang="de">Setzen Sie diesen Wert auf Decoder-Typ: 1 = Motor, 2 = Sound, 3 = Funktion, etc.</tooltip>
     </variable>
     <xi:include href="http://jmri.org/xml/decoders/nmra/consistAddrDirection.xml"/>
-    <xi:include href="http://jmri.org/xml/decoders/esu/v4cv21.22.xml"/>
+    <xi:include href="http://jmri.org/xml/decoders/esu/v5ConsistCVs.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/nmra/consistAccelDecelSigned.xml"/>
     <variable CV="27" mask="XXXXXXXV" item="ESU V4 ABC Brake Right Rail Higher">
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
@@ -262,7 +262,7 @@
         <variable CV="27" mask="XXVXXXXX" item="ESU V4 Selectrix Brake Reverse" default="0">
             <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
             <label>Brake on reverse polarity of brake diode</label>
-        <label xml:lang="de">Bremsen wenn Polarität entgegengesetzt der Fahrtrichtung</label>
+            <label xml:lang="de">Bremsen wenn Polarität entgegengesetzt der Fahrtrichtung</label>
         </variable>
         <variable CV="27" mask="XVXXXXXX" item="ESU V4 Selectrix Brake Forward" default="0">
             <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
@@ -307,7 +307,7 @@
         <label xml:lang="de">RailCom® aktiv</label>
         <label xml:lang="ca">Railcom Actiu</label>
     </variable>
-    <variable CV="29" mask="XXXVXXXX" item="Speed Table Definition" include="LokSound 5 DCC,LokSound 5 micro DCC,LokSound 5 micro DCC Direct,LokSound 5 L DCC">
+    <variable CV="29" mask="XXXVXXXX" item="Speed Table Definition" include="LokSound 5 DCC,LokSound 5 micro DCC,LokSound 5 micro DCC Direct,LokSound 5 L DCC,LokPilot 5 DCC,LokPilot 5 micro DCC,LokPilot 5 micro DCC Next18,LokPilot 5 L DCC,LokPilot 5 Fx micro DCC,LokPilot 5 MKL DCC">
         <enumVal>
             <enumChoice choice="Use Vstart, Vmid, Vhigh">
                 <choice>Use Vstart, Vmid, Vhigh</choice>
@@ -492,6 +492,28 @@
             <label xml:lang="ca">Reteall enrere</label>
         </variable>
     </variables>
+    <variable CV="57" default="143" item="Sound Steam Chuffs Step 1" tooltip="Set to zero for cam input">
+        <decVal/>
+        <label>Chuff spacing speed step 1</label>
+        <label xml:lang="it">Velocità distanza Chuff step 1</label>
+        <label xml:lang="de">Dampfstöße bei FS=1</label>
+        <label xml:lang="ca">Espaiat entre xufs pas 1</label>
+        <tooltip xml:lang="de">Setzen Sie den Wert auf 0 wenn ein externer Radsensor verwendet wird.</tooltip>
+    </variable>
+    <variable CV="58" default="43" item="Sound Steam Chuffs Decrease Rate">
+        <decVal/>
+        <label>Chuff spacing decrease rate</label>
+        <label xml:lang="it">Decremento distanza Chuff</label>
+        <label xml:lang="de">Anpassung bei höheren FS</label>
+        <label xml:lang="ca">Taxa decreiement xuf</label>
+    </variable>
+    <variable CV="100" default="0" item="Motor Option 3">
+        <decVal/>
+        <label>Motor Current Limiter</label>
+        <label xml:lang="de">Motor Current Limiter</label>
+        <tooltip>Limits the maximum curent allowed to be drawn by the motor. 0 is limiter disabled, 1 is 0.39%, 255 is 100%.</tooltip>
+        <tooltip xml:lang="de">Limits the maximum curent allowed to be drawn by the motor. 0 is limiter disabled, 1 is 0.39%, 255 is 100%.</tooltip>
+    </variable>
     <variable CV="101" default="64" item="ESU V5 Shunt Trim">
         <decVal max="128"/>
         <label>Shunting Mode Trim</label>
@@ -631,6 +653,20 @@
         <tooltip>At speed step 255. Unit is 0.1 milliseconds.</tooltip>
         <tooltip xml:lang="de">Länge der Meßlücke in 0,1 Millisekunden bei Fahrstufe 255</tooltip>
     </variable>
+    <variable CV="122" mask="XXXXXXXV" default="1" item="ESU V4 Memory Settings Functions">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
+        <label>Remember Current Function States</label>
+        <label xml:lang="fr">Sauvegarde fonction</label>
+        <label xml:lang="de">Speicherung der Funktionstastenstellung</label>
+        <label xml:lang="ca">Desa l'estat de les funcions</label>
+    </variable>
+    <variable CV="122" mask="XXXXXXVX" default="1" item="ESU V4 Memory Settings Speed">
+        <xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
+        <label>Remember Current Speed</label>
+        <label xml:lang="fr">Sauvegarde vitesse actuelle</label>
+        <label xml:lang="de">Speicherung der Geschwindigkeit</label>
+        <label xml:lang="ca">Recorda velocitats Actuals</label>
+    </variable>
     <variable CV="123" default="100" item="ESU V4 ABC Reduced Speed">
         <decVal/>
         <label>ABC mode reduced speed</label>
@@ -667,7 +703,7 @@
         <label xml:lang="de">Motorschutz bei Blockierung</label>
         <label xml:lang="ca">Protecciò d'escalfametn del motor</label>
     </variable>
-    <variable CV="124" mask="XVXXXXXX" default="0" item="Motor Option 3">
+    <variable CV="124" mask="XVXXXXXX" default="0" item="Motor Option 4">
         <xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
         <label>Automatic Parking Brake</label>
         <label xml:lang="de">Parkbremse</label>
@@ -728,33 +764,58 @@
         <label xml:lang="de">ABC-Modus „Empfindlichkeit”</label>
         <label xml:lang="ca">Límit de detecció de voltatge sistema ABC</label>
     </variable>
-    <!-- A nicht beschrieben -->
-    <variable CV="138" default="128" item="ESU V4 Function Settings Smoke Unit Slider 2" exclude="Essential Sound Unit">
-        <decVal/>
-        <label>Fan Speed Trim</label>
-        <label xml:lang="de">           Lüftergeschwindigkeit          </label>
-        <label xml:lang="ca">Ajust de temperatura del ventilador</label>
-    </variable>
-    <variable CV="139" default="128" item="ESU V4 Function Settings Smoke Unit Slider 3" exclude="Essential Sound Unit">
+    <variable CV="141" default="20" tooltip="Unit is .0041 seconds" item="ESU V4 Function Settings Smoke Chuffs Slider 2">
         <decVal/>
-        <label>Temperature Trim</label>
-        <label xml:lang="de">            Temperaturregelung            </label>
-        <label xml:lang="ca">Ajust de temperatura</label>
+        <label>Smoke Unit Minimum Steam Chuff Duration</label>
+        <label xml:lang="it">Durata Min.Chuff per Gener.Fumo</label>
+        <label xml:lang="de">Minimale Dauer</label>
+        <label xml:lang="ca">Unitat mínima de duració de xuf</label>
+        <tooltip xml:lang="de">die Einheit ist 0.0041 s</tooltip>
     </variable>
-    <variable CV="140" default="120" tooltip="Unit is 5 seconds" item="ESU V4 Function Settings Smoke Unit Slider 1" exclude="Essential Sound Unit">
+    <variable CV="142" default="122" tooltip="Unit is .0041 seconds" item="ESU V4 Function Settings Smoke Chuffs Slider 3">
         <decVal/>
-        <label>Smoke Unit Automatic Power Off Time</label>
-        <label xml:lang="de"> automatische Abschaltung Rauchentwickler </label>
-        <tooltip xml:lang="de">die Einheit sind 5 sec</tooltip>
-        <label xml:lang="ca">TEmps apagat del fumigen</label>
+        <label>Smoke Unit Maximum Steam Chuff Duration</label>
+        <label xml:lang="it">Durata Max.Chuff per Gener.Fumo</label>
+        <label xml:lang="de">Maximale Dauer</label>
+        <label xml:lang="ca">Unitat màxima de duració de xuf</label>
+        <tooltip xml:lang="de">die Einheit ist 0.0041 s</tooltip>
     </variable>
-    <variable CV="144" default="150" tooltip="Unit is degrees Celsius" item="ESU V4 Function Settings Smoke Unit Slider 4" exclude="Essential Sound Unit">
+    <variable CV="143" default="102" item="ESU V4 Function Settings Smoke Chuffs Slider 1">
         <decVal/>
-        <label>Preheating Temperature for Secondary Smoke Unit</label>
-        <label xml:lang="de">Vorwärmtemperatur für Sekundärraucheinheit</label>
-        <label xml:lang="ca">Temperatra de preescalfat de segon fumigen</label>
-        <tooltip xml:lang="de">die Einheit ist Grad Celsius</tooltip>
+        <label>Smoke Unit Chuff Duration rel. to trig. dist.</label>
+        <label xml:lang="it">Durata Suono per Gener.Fumo in funz.dist.Trigger</label>
+        <label xml:lang="de">Dauer der Dampfstöße (relativ zu Trigger-Impulsen)</label>
+        <label xml:lang="ca">Unitat de xuf en relació a distància</label>
     </variable>
+    <!-- A nicht beschrieben -->
+    <variables exclude="ESU LokPilot 5,Essential Sound Unit">
+        <variable CV="138" default="128" item="ESU V4 Function Settings Smoke Unit Slider 2">
+            <decVal/>
+            <label>Fan Speed Trim</label>
+            <label xml:lang="de">           Lüftergeschwindigkeit          </label>
+            <label xml:lang="ca">Ajust de temperatura del ventilador</label>
+        </variable>
+        <variable CV="139" default="128" item="ESU V4 Function Settings Smoke Unit Slider 3">
+            <decVal/>
+            <label>Temperature Trim</label>
+            <label xml:lang="de">            Temperaturregelung            </label>
+            <label xml:lang="ca">Ajust de temperatura</label>
+        </variable>
+        <variable CV="140" default="120" tooltip="Unit is 5 seconds" item="ESU V4 Function Settings Smoke Unit Slider 1">
+            <decVal/>
+            <label>Smoke Unit Automatic Power Off Time</label>
+            <label xml:lang="de"> automatische Abschaltung Rauchentwickler </label>
+            <tooltip xml:lang="de">die Einheit sind 5 sec</tooltip>
+            <label xml:lang="ca">TEmps apagat del fumigen</label>
+        </variable>
+        <variable CV="144" default="150" tooltip="Unit is degrees Celsius" item="ESU V4 Function Settings Smoke Unit Slider 4">
+            <decVal/>
+            <label>Preheating Temperature for Secondary Smoke Unit</label>
+            <label xml:lang="de">Vorwärmtemperatur für Sekundärraucheinheit</label>
+            <label xml:lang="ca">Temperatra de preescalfat de segon fumigen</label>
+            <tooltip xml:lang="de">die Einheit ist Grad Celsius</tooltip>
+        </variable>
+    </variables>
     <variable CV="149" default="0" item="ESU V5 ABC Shuttle Train">
         <decVal/>
         <label>ABC Shuttle Train</label>
@@ -831,20 +892,64 @@
         <tooltip>Highest speed step that can be reached when Brake Function 3 is active.</tooltip>
     </variable>
     <variables exclude="Essential Sound Unit">
-        <variable CV="246" default="0" item="ESU V4 Function Settings Auto Uncoupling Slider 1" exclude="LokPilot Fx V4.0">
+        <variable CV="191" default="0" item="M4MfgId">
+            <decVal/>
+            <label>M4 Manufacturer ID</label>
+            <tooltip>The M4 manufacturer's ID number</tooltip>
+            <tooltip xml:lang="ca">M4 Número de fabricant</tooltip>
+            <tooltip xml:lang="cs">M4 ID číslo výrobce</tooltip>
+            <tooltip xml:lang="de">M4 Hersteller ID</tooltip>
+            <tooltip xml:lang="fr">M4 ID constructeur</tooltip>
+            <tooltip xml:lang="it">M4 ID Costruttore</tooltip>
+            <tooltip xml:lang="nl">M4 ID decoderfabrikant</tooltip>
+        </variable>
+        <variable CV="192:4" item="M4SerNo">
+            <splitHexVal case="upper"/>
+            <label>M4 Decoder Serial Number</label>
+            <label xml:lang="de">M4 Seriennummer</label>
+            <tooltip>The M4 Decoder Serial number</tooltip>
+            <tooltip xml:lang="ca">M4 Número de versió del descodificador</tooltip>
+            <tooltip xml:lang="cs">M4 Číslo verze dekodéru</tooltip>
+            <tooltip xml:lang="de">M4 Dekoderversion</tooltip>
+            <tooltip xml:lang="fr">M4 Version de décodeur</tooltip>
+            <tooltip xml:lang="it">M4 Numero versione del Decoder</tooltip>
+            <tooltip xml:lang="nl">M4 Decoderversienummer</tooltip>
+        </variable>
+        <variable CV="249" default="0" item="Sound Steam Chuffs Min Distance">
+            <decVal/>
+            <label>Chuff minimum spacing</label>
+            <label xml:lang="it">Durata Min.distanza Chuff</label>
+            <label xml:lang="de">Minimaler Abstand der Dampfstöße</label>
+            <label xml:lang="ca">Temps mínim entre xufs</label>
+        </variable>
+        <variable CV="250" default="0" item="Sound Steam Chuffs Secondary Trigger">
+            <decVal/>
+            <label>Chuff secondary trigger</label>
+            <label xml:lang="it">Trigger secondario Chuff</label>
+            <label xml:lang="de">Sekundärer Trigger</label>
+            <label xml:lang="ca">Disparador secundari</label>
+        </variable>
+        <variable CV="245" default="0" tooltip="Unit is 16 milliseconds" item="ESU Auto Uncoupling Wait Time" exclude="LokPilot Fx V4.0">
+            <decVal/>
+            <label>Auto Uncoupling Wait Time</label>
+            <label xml:lang="de">Auto Uncoupling Wait Time</label>
+            <tooltip xml:lang="de">die Einheit sind 0.016384 sec</tooltip>
+            <label xml:lang="ca">Auto Uncoupling Wait Time</label>
+        </variable>
+        <variable CV="246" default="0" item="ESU Auto Uncoupling Speed" exclude="LokPilot Fx V4.0">
             <decVal/>
             <label>Auto Uncoupling Speed</label>
             <label xml:lang="de">Entkuppeln - Fahrtgeschwindigkeit</label>
             <label xml:lang="ca">Velociat de desenganxat automàtic</label>
         </variable>
-        <variable CV="247" default="0" tooltip="Unit is 16 milliseconds" item="ESU V4 Function Settings Auto Uncoupling Slider 3" exclude="LokPilot Fx V4.0">
+        <variable CV="247" default="0" tooltip="Unit is 16 milliseconds" item="ESU Auto Uncoupling Remove Time" exclude="LokPilot Fx V4.0">
             <decVal/>
             <label>Auto Uncoupling Remove Time</label>
             <label xml:lang="de">     Entkuppeln - Abrückzeit     </label>
             <tooltip xml:lang="de">die Einheit sind 0.016384 sec</tooltip>
             <label xml:lang="ca">Temps d'autodesacoblament d'un tren</label>
         </variable>
-        <variable CV="248" default="0" tooltip="Unit is 16 milliseconds" item="ESU V4 Function Settings Auto Uncoupling Slider 2" exclude="LokPilot Fx V4.0">
+        <variable CV="248" default="0" tooltip="Unit is 16 milliseconds" item="ESU Auto Uncoupling Push Time" exclude="LokPilot Fx V4.0">
             <decVal/>
             <label>Auto Uncoupling Push Time</label>
             <label xml:lang="de">    Entkuppeln - Andrückzeit     </label>
@@ -852,7 +957,7 @@
             <label xml:lang="ca">Temps d'empenyer enn desenganxat automàtic</label>
         </variable>
     </variables>
-    <variable CV="252" include="ESU LokPilot V4.0" default="0" tooltip="Unit is 0.06535 seconds" item="ESU V4 Starting Delay Time">
+    <variable CV="252" include="ESU LokPilot 5" default="0" tooltip="Unit is 0.06535 seconds" item="ESU V4 Starting Delay Time">
         <decVal/>
         <label>&lt;html&gt;Prime Mover Startup Delay&lt;br&gt;if Virtual Drive Sound Enabled&lt;/html&gt;</label>
     </variable>
@@ -880,17 +985,17 @@
     <constant item="PICV" default="31" comment="CV used for Primary Index"/>
     <constant item="SICV" default="32" comment="CV used for Secondary Index"/>
     <!-- Firmware Version -->
-    <variable CV="0.255.285" readOnly="yes" item="Firmware Build Number">
-        <splitVal highCV="0.255.286"/>
+    <variable CV="0.255.285:2" readOnly="no" item="Firmware Build Number">
+        <splitVal/>
         <label>Firmware Build Number</label>
         <label xml:lang="de">Firmware Build Nummer</label>
         <label xml:lang="ca">Número de firmware</label>
     </variable>
-    <variable CV="0.255.287" readOnly="yes" item="Firmware Minor Version">
+    <variable CV="0.255.287" readOnly="no" item="Firmware Minor Version">
         <decVal/>
         <label>Firmware Minor Version</label>
     </variable>
-    <variable CV="0.255.288" readOnly="yes" item="Firmware Major Version">
+    <variable CV="0.255.288" readOnly="no" item="Firmware Major Version">
         <decVal/>
         <label>Firmware Major Version</label>
     </variable>
@@ -898,7 +1003,9 @@
     <variables exclude="Essential Sound Unit">
         <xi:include href="http://jmri.org/xml/decoders/esu/v4projectInfoCVs.xml"/>
     </variables>
-    <xi:include href="http://jmri.org/xml/decoders/esu/v5soundCVs.xml"/>
+    <variables exclude="ESU LokPilot 5">
+        <xi:include href="http://jmri.org/xml/decoders/esu/v5soundCVs.xml"/>
+    </variables>
     <xi:include href="http://jmri.org/xml/decoders/esu/v5fnOutCVs.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/v5randFuncCVs.xml"/>
     <xi:include href="http://jmri.org/xml/decoders/esu/susiMapCVs.xml"/>