Skip to content

Commit

Permalink
LokPilot 5 and other 5 updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dheap
dheap committed Apr 10, 2020
1 parent 6369161 commit 7d14c27
Show file tree
Hide file tree
Showing 11 changed files with 396 additions and 414 deletions.
3 changes: 3 additions & 0 deletions xml/decoders/ESU_Essential_Sound_Unit.xml
View file
Expand Up @@ -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">
Expand Down Expand Up @@ -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"/>
Expand Down
6 changes: 6 additions & 0 deletions xml/decoders/ESU_LokSound5.xml
View file
Expand Up @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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"/>
Expand Down
135 changes: 15 additions & 120 deletions xml/decoders/esu/v4advancedPane.xml
View file
Expand Up @@ -14,143 +14,77 @@
<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>
<text xml:lang="it">Centrali Compatibili</text>
<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>
<text xml:lang="it">RailCom®</text>
<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"/>
Expand Down Expand Up @@ -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=""/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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>

0 comments on commit 7d14c27

Please sign in to comment.