Skip to content

Commit

Permalink
Add models
Browse files Browse the repository at this point in the history
Genesis SD70ACe
RTR SD40
  • Loading branch information
mmosher5501 committed Sep 4, 2019
1 parent 43457fb commit 4d83d36
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 102 deletions.
88 changes: 56 additions & 32 deletions xml/decoders/SoundTraxx_Eco_Diesel_OEM_Athearn.xml
Expand Up @@ -79,6 +79,12 @@
<authorinitials>MM</authorinitials>
<revremark>Move outputs to family level</revremark>
</revision>
<revision>
<revnumber>8</revnumber>
<date>2019-09-04</date>
<authorinitials>MM</authorinitials>
<revremark>Add new SD40 models</revremark>
</revision>
</revhistory>
<!-- Decoder Model information follows -->
<decoder>
Expand All @@ -97,7 +103,11 @@
</model>
<model model="ECO-RTR SD38 w/strobe 2" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="851" comment="Model E0101.002B">
</model>
<model model="ECO-RTR SD40 w/gyra" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="863" comment="Model E????.???">
<model model="ECO-RTR SD40" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="862" comment="Model E0102.001">
</model>
<model model="ECO-RTR SD40 w/ditch" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="975" comment="Model E0102.011">
</model>
<model model="ECO-RTR SD40 w/gyra" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="863" comment="Model E0102.005">
</model>
<model model="ECO-RTR SD40-2 w/DB" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="789" comment="Model E0102.002B">
</model>
Expand Down Expand Up @@ -165,54 +175,67 @@
<!-- Configuration Variable (CV) information follows -->
<variables>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/OEMAthearnCV.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
<variable item="Locomotive Direction" CV="29" mask="XXXXXXXV" default="0" >
<defaultItem default="1" include="975"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-NormRev.xml"/>
<label>Locomotive Direction</label>
<label xml:lang="cs">Směr lokomotivy</label>
<label xml:lang="de">Fahrtrichtung Standard</label>
<label xml:lang="fr">Sens normal de marche</label>
<label xml:lang="it">Direzione Normale di Marcia</label>
<tooltip>Sets the relative direction of the loco when told to move forward</tooltip>
<tooltip xml:lang="cs">Nastaví relativní směr lokomotivy když je vydán příkaz pohyb vpřed.</tooltip>
<tooltip xml:lang="fr">Règle le sens relatif de mouvement de la loco lorsque la marche avant est commandée</tooltip>
<tooltip xml:lang="de">Legt die relative Fahrtrichtung der Lokomotive fest wenn Fahrbefehl "Vorwärts" erteilt wird.</tooltip>
<tooltip xml:lang="it">Stabilisce la direzione di marcia relativa quando la loco è in marcia avanti</tooltip>
</variable>
<variable item="Headlight F0(f) Light Type" CV="49" mask="VXXXXXXX" default="0" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
<defaultItem default="1" include="863,864,"/>
<defaultItem default="1" include="862,863,864,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
<label>Headlight F0(f) Light Type</label>
</variable>
<variable item="Backup Light F0(r) Light Type" CV="50" mask="VXXXXXXX" default="0" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
<defaultItem default="1" include="863,864"/>
<defaultItem default="1" include="862,863,864,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
<label>Backup Light F0(r) Light Type</label>
</variable>
<variable item="FX5 Effect Selection" CV="51" mask="XXXVVVVV" default="0" minOut="3" tooltip="Determines the effect generated from the FX3 light output">
<defaultItem default="3" include="863,864"/>
<defaultItem default="5" include="780,789,846,851"/>
<defaultItem default="9" include="825"/>
<defaultItem default="9" include="825,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumEffect.xml"/>
<label>FX3 Effect Selection</label>
</variable>
<variable item="FX5 Grade Crossing Logic" CV="51" mask="XVXXXXXX" default="0" minOut="3" tooltip="Causes the lighting effect to become active only when the horn has been sounded">
<defaultItem default="1" include="825"/>
<defaultItem default="1" include="825,975"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
<label>FX3 Grade Crossing Logic</label>
</variable>
<variable item="FX5 Light Type" CV="51" mask="VXXXXXXX" default="0" minOut="3" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
<defaultItem default="1" include="863,864"/>
<defaultItem default="1" include="862,863,864,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
<label>FX3 Light Type</label>
</variable>
<variable item="FX6 Effect Selection" CV="52" mask="XXXVVVVV" default="0" minOut="4" tooltip="Determines the effect generated from the FX4 light output">
<defaultItem default="3" include="846,863"/>
<defaultItem default="7" include="789"/>
<defaultItem default="8" include="864"/>
<defaultItem default="9" include="825"/>
<defaultItem default="9" include="825,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumEffect.xml"/>
<label>FX4 Effect Selection</label>
</variable>
<variable item="FX6 Phase Selection" CV="52" mask="XXVXXXXX" default="0" minOut="4" tooltip="Alters the timing of the effect so that it's 180 degrees out of phase with the other effects">
<defaultItem default="1" include="825"/>
<defaultItem default="1" include="825,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumPhase.xml"/>
<label>FX4 Phase Selection</label>
</variable>
<variable item="FX6 Grade Crossing Logic" CV="52" mask="XVXXXXXX" default="0" minOut="4" tooltip="Causes the lighting effect to become active only when the horn has been sounded">
<defaultItem default="1" include="825"/>
<defaultItem default="1" include="825,975"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
<label>FX4 Grade Crossing Logic</label>
</variable>
<variable item="FX6 Light Type" CV="52" mask="VXXXXXXX" default="0" minOut="4" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
<defaultItem default="1" include="863,864"/>
<defaultItem default="1" include="862,863,864,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
<label>FX4 Light Type</label>
</variable>
Expand All @@ -225,11 +248,12 @@
<label>Backup Light F0(r) Forward Directional Control</label>
</variable>
<variable item="FX5 Forward Directional Control" CV="57" mask="XXXXXVXX" default="1" minOut="3" tooltip="Check to enable FX3 function output in Forward direction">
<defaultItem default="0" include="975"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
<label>FX3 Forward Directional Control</label>
</variable>
<variable item="FX6 Forward Directional Control" CV="57" mask="XXXXVXXX" default="1" minOut="4" tooltip="Check to enable FX4 function output in Forward direction">
<defaultItem default="0" include="863"/>
<defaultItem default="0" include="862,863,975"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
<label>FX4 Forward Directional Control</label>
</variable>
Expand All @@ -242,7 +266,7 @@
<label>Backup Light F0(r) Reverse Directional Control</label>
</variable>
<variable item="FX5 Reverse Directional Control" CV="58" mask="XXXXXVXX" default="1" minOut="3" tooltip="Check to enable FX3 function output in Reverse direction">
<defaultItem default="0" include="781,825,863,864"/>
<defaultItem default="0" include="781,825,862,863,864"/>
<xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
<label>FX3 Reverse Directional Control</label>
</variable>
Expand All @@ -252,7 +276,7 @@
<label>FX4 Reverse Directional Control</label>
</variable>
<variable item="Hyperlight Flash Rate (0-15)" CV="59" mask="XXXXVVVV" default="7" tooltip="Sets the overall flash rate of the Hyperlight effects, 0 is fast, 15 is slow">
<defaultItem default="5" include="789,863,864"/>
<defaultItem default="5" include="789,862,863,864,975"/>
<decVal max="15"/>
<label>Hyperlight Flash Rate (0-15)</label>
</variable>
Expand All @@ -269,7 +293,7 @@
<label>Brightness 2 Level (0-255)</label>
</variable>
<variable CV="63" item="Dimmer" default="153" tooltip="Adjust the brightness level of the on/off dimmable headlight effect">
<defaultItem default="130" include="863,864"/>
<defaultItem default="130" include="862,863,864,975"/>
<decVal/>
<label>Dimmer Level (0-255)</label>
</variable>
Expand All @@ -287,7 +311,7 @@
<!-- Sound Selection follows -->
<variable CV="120" mask="XXVVVVVV" item="Sound Option 6" default="12" tooltip="Selects which airhorn to use">
<defaultItem default="2" include="825"/>
<defaultItem default="6" include="863,864"/>
<defaultItem default="6" include="863,864,975"/>
<defaultItem default="7" include="851"/>
<defaultItem default="10" include="846"/>
<enumVal>
Expand All @@ -309,16 +333,16 @@
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumDieselBellAthearn.xml"/>
<label>Bell Select</label>
</variable>
<variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="774,775,850,851,780,773,789,781,863,864">
<defaultItem default="0" include="774,775,850,851,780"/>
<defaultItem default="2" include="773,789,781,863,864"/>
<variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="2" exclude="825">
<defaultItem default="0" include="774,775,780,850,851"/>
<defaultItem default="2" include="773,781,789,862,863,864,975"/>
<defaultItem default="3" include="846"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumPrimeMover1Athearn.xml"/>
<label>Prime Mover Select</label>
<tooltip>Select one of prime mover sound effects</tooltip>
</variable>
<variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="825,846">
<variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="825">
<defaultItem default="0" include="825"/>
<defaultItem default="3" include="846"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumPrimeMover2Athearn.xml"/>
<label>Prime Mover Select</label>
<tooltip>Select one of prime mover sound effects</tooltip>
Expand All @@ -337,18 +361,18 @@
<!-- End Sound Selection -->
<!-- Volume Controls follow -->
<variable CV="128" mask="VVVVVVVV" item="Sound Setting 1" default="199" tooltip="Sets the overall volume of all sound channels">
<defaultItem default="150" include="863,864"/>
<defaultItem default="150" include="862,863,864,975"/>
<defaultItem default="215" include="825"/>
<decVal/>
<label>Master Volume Control</label>
</variable>
<variable CV="129" mask="VVVVVVVV" item="Sound Setting 2" default="100" tooltip="Sets the volume of the airhorn">
<defaultItem default="75" include="863,864"/>
<defaultItem default="75" include="862,863,864,975"/>
<decVal/>
<label>Airhorn Volume</label>
</variable>
<variable CV="130" mask="VVVVVVVV" item="Sound Setting 3" default="58" tooltip="Sets the volume of the bell">
<defaultItem default="40" include="863,864"/>
<defaultItem default="40" include="862,863,864,975"/>
<defaultItem default="215" include="825"/>
<decVal/>
<label>Bell Volume</label>
Expand Down Expand Up @@ -376,42 +400,42 @@
<label>Poppet Valve Volume</label>
</variable>
<variable item="Equalizer Control" CV="225" mask="XXXXXVVV" default="3" tooltip="Selects one of six equalizer presets or selects a user adjustable profile">
<defaultItem default="7" include="863,864"/>
<defaultItem default="7" include="862,863,864,975"/>
<xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumEQ.xml"/>
<label>Equalizer Control</label>
</variable>
<variable item="62 Hz Cut/Boost" CV="226" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="0" include="863,864"/>
<defaultItem default="0" include="862,863,864,975"/>
<decVal/>
<label>62 Hz Cut/Boost</label>
</variable>
<variable item="125 Hz Cut/Boost" CV="227" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="0" include="863,864"/>
<defaultItem default="0" include="862,863,864,975"/>
<decVal/>
<label>125 Hz Cut/Boost</label>
</variable>
<variable item="250 Hz Cut/Boost" CV="228" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="150" include="863,864"/>
<defaultItem default="150" include="862,863,864,975"/>
<decVal/>
<label>250 Hz Cut/Boost</label>
</variable>
<variable item="500 Hz Cut/Boost" CV="229" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="175" include="863,864"/>
<defaultItem default="175" include="862,863,864,975"/>
<decVal/>
<label>500 Hz Cut/Boost</label>
</variable>
<variable item="1K Hz Cut/Boost" CV="230" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="100" include="863,864"/>
<defaultItem default="100" include="862,863,864,975"/>
<decVal/>
<label>1K Hz Cut/Boost</label>
</variable>
<variable item="2K Hz Cut/Boost" CV="231" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="150" include="863,864"/>
<defaultItem default="150" include="862,863,864,975"/>
<decVal/>
<label>2K Hz Cut/Boost</label>
</variable>
<variable item="4K Hz Cut/Boost" CV="232" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
<defaultItem default="150" include="863,864"/>
<defaultItem default="150" include="862,863,864,975"/>
<decVal/>
<label>4K Hz Cut/Boost</label>
</variable>
Expand Down

0 comments on commit 4d83d36

Please sign in to comment.