Skip to content

Commit

Permalink
ZIMO necessary files for decoder-files for v37
Browse files Browse the repository at this point in the history 
necessary files for decoder-files
  • Loading branch information
@Klb4ever
Klb4ever committed Apr 26, 2019
1 parent 3eabfc1 commit b99196d
Show file tree
Hide file tree
Showing 35 changed files with 1,807 additions and 255 deletions.
51 changes: 31 additions & 20 deletions xml/decoders/zimo/CV1-CV99.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,27 @@
-->
<!-- version 1.3 18 Jan 2015 Mark Waters - additional include for CV14 for newer decoder -->
<!-- version 1.4 14 Dec 2016 Ronald Kuhn - excludes for Function decoder -->
<!-- version 1.5 19 Apr 2019 Ronald Kuhn - some german translations, sorts and default values -->
<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">
<xi:include href="http://jmri.org/xml/decoders/nmra/shortAndLongAddress.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/accelDecel_255.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/vStartHighMid.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/mfgVersionId.xml"/>
<variable CV="9" item="Motor Frequency and EMF sample Rate" default="0" exclude="228,226,232,235,247,MX689_v30">
<variable item="Motor Frequency and EMF sample Rate" CV="9" default="0" exclude="228,226,232,235,247,MX689_v30">
<decVal/>
<label>Motor Frequency and EMF sample Rate</label>
<label xml:lang="it">Frequenza Motore e Freq.Campionamento EMF</label>
<label xml:lang="cs">Frekvence motoru a EMF vzorkovací míra</label>
<label xml:lang="de">Motoransteuerungsperiode bzw. – frequenz und EMK-Abtastrate</label>
</variable>
<variable CV="10" default="0" item="EMF Droop Config" tooltip="Range 0-252" exclude="228,226,232,235,247,MX689_v30">
<variable item="EMF Droop Config" CV="10" default="0" exclude="228,226,232,235,247,MX689_v30">
<decVal max="252"/>
<label>EMF Feedback Cutoff Speed Step</label>
<label xml:lang="it">Step velocità taglio EMF</label>
<label xml:lang="cs">Rychlostní stupeň pro přerušení regulace EMF</label>
<label xml:lang="de">Regelungs-Cutoff</label>
<tooltip>Range 0-252</tooltip>
<tooltip xml:lang="de">Interne Fahrstufe, ab der Ausregelungskraft laut CV #113 wirkt.</tooltip>
</variable>
<variable item="Analog Mode Function Status - F1" CV="13" mask="XXXXXXXV">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
Expand Down Expand Up @@ -163,21 +166,21 @@
<tooltip>Check to enable function F12 when the unit is operating in analog power mode</tooltip>
<tooltip xml:lang="de">Aktivieren Sie die Funktion wenn F12 im Analogbetrieb eingeschaltet sein soll.</tooltip>
</variable>
<variable CV="14" item="Zero-1 Power Conversion" mask="XVXXXXXX" default="1">
<variable item="Zero-1 Power Conversion" CV="14" mask="XVXXXXXX" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog operation with accel/decel from CV3/4</label>
<label xml:lang="it">Operatività in Analogico con accell/decell. da CV 3/4</label>
<label xml:lang="cs">Analogový provoz se zrychlením/zpomalením podle CV3/4</label>
<label xml:lang="de">Anfahr- und Bremsverzögerung (CV 3/4) aktiv</label>
</variable>
<variable CV="14" item="Trix Power Conversion" mask="VXXXXXXX" default="0" exclude="223,236">
<variable item="Trix Power Conversion" CV="14" mask="VXXXXXXX" default="0" exclude="223,236">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>DC Regulation</label>
<label xml:lang="it">Regolazioni in DC</label>
<label xml:lang="cs">Regilace v DC</label>
<label xml:lang="de">Motorregelung aktiv</label>
</variable>
<variable CV="19" default="0" item="Consist Address">
<variable item="Consist Address" CV="19" default="0">
<decVal/>
<label>Consist Address</label>
<label xml:lang="it">Indirizzo Consist</label>
Expand Down Expand Up @@ -352,14 +355,14 @@
<tooltip>Brake on DC detect</tooltip>
<tooltip xml:lang="de">Bremskonfiguration mittels asymmetrischer DCC-Digitalspannung</tooltip>
</variable>
<variable item="RailCom channel 1 (Broadcast)" CV="28" mask="XXXXXXXV">
<variable item="RailCom channel 1 (Broadcast)" CV="28" default="1" mask="XXXXXXXV">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>RailCom channel 1 (Broadcast)</label>
<label xml:lang="it">RailCom canale 1 (Broadcast)</label>
<label xml:lang="cs">RailCom kanál 1 (adresa)</label>
<label xml:lang="de">RailCom Kanal 1 (Broadcast)</label>
</variable>
<variable item="RailCom channel 2 (Data)" CV="28" mask="XXXXXXVX">
<variable item="RailCom channel 2 (Data)" CV="28" default="1" mask="XXXXXXVX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>RailCom channel 2 (Data)</label>
<label xml:lang="it">RailCom canale 2 (Dati)</label>
Expand Down Expand Up @@ -935,7 +938,7 @@
<label xml:lang="it">F10 controlla uscita 11</label>
<label xml:lang="cs">F10 řídí výstup 11</label>
</variable>
<variable item="F10 controls output 12" CV="44" mask="XXVXXXXX" minOut="12" minFn="7" exclude="228,226,232,235,247,MX689_v30">
<variable item="F10 controls output 12" CV="44" default="1" mask="XXVXXXXX" minOut="12" minFn="7" exclude="228,226,232,235,247,MX689_v30">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-NoYes.xml"/>
<label>F10 controls output 12</label>
<label xml:lang="it">F10 controlla uscita 12</label>
Expand Down Expand Up @@ -1584,30 +1587,32 @@
<comment xml:lang="it">Valori 0-252</comment>
<comment xml:lang="cs">Meze 0-252</comment>
</variable>
<variable CV="56" item="BEMF config" default="0" tooltip="Range 0-199" exclude="228,226,232,235,247,MX689_v30">
<variable item="BEMF config" CV="56" default="0" tooltip="Range 0-199" exclude="228,226,232,235,247,MX689_v30">
<decVal max="199"/>
<label>BEMF config</label>
<label xml:lang="it">Configuarzione BEMF</label>
<label xml:lang="cs">Konfigurace BEMF</label>
<label xml:lang="de">&lt;html&gt;P- und I-Wert&lt;br&gt;der EMK-Regelung&lt;/html&gt;</label>
</variable>
<variable CV="57" default="0" item="Dither frequency" exclude="228,226,232,235,247,MX689_v30">
<variable item="Dither frequency" CV="57" default="0" exclude="228,226,232,235,247,MX689_v30">
<decVal max="255"/>
<label>Voltage Reference</label>
<label xml:lang="it">Tensione di Riferimento</label>
<label xml:lang="cs">Referenční napětí</label>
<label xml:lang="de">Regelungsreferenz</label>
<tooltip>Value divided by 10 is voltage applied to motor at full speed, 0 = automatic adjustment</tooltip>
<tooltip xml:lang="de">Absolute Motoransteuerungs-Spannung in Zehntel- Volt, die bei voller Fahrt am Motor anliegen soll.</tooltip>
</variable>
<variable CV="58" default="255" item="Dither option" exclude="228,226,232,235,247,MX689_v30">
<variable item="Dither option" CV="58" default="255" exclude="228,226,232,235,247,MX689_v30">
<decVal/>
<label>BEMF Intensity</label>
<label xml:lang="it">Intensità BEMF</label>
<label xml:lang="cs">Intenzita BEMF</label>
<label xml:lang="de">&lt;html&gt;Regelungseinfluss&lt;br&gt;der EMK-Regelung&lt;/html&gt;</label>
<tooltip>Controls how much BEMF (0-no BEMF to 255-max)</tooltip>
<tooltip xml:lang="de">Ausregelungskraft des Lastausgleichs</tooltip>
</variable>
<variable CV="59" item="Signal Dependent Reaction Time" default="5" comment="Range 0-255">
<variable item="Signal Dependent Reaction Time" CV="59" default="5" comment="Range 0-255">
<decVal max="255"/>
<label>Signal Dependent Reaction Time</label>
<label xml:lang="it">Tempo di reazione dipendente da Segnale</label>
Expand All @@ -1617,7 +1622,7 @@
<comment xml:lang="it">Valori 0-255</comment>
<comment xml:lang="cs">Meze 0-255</comment>
</variable>
<variable CV="60" item="Output Level" default="0">
<variable item="Output Level" CV="60" default="0">
<decVal min="0" max="255"/>
<label>Output Level</label>
<label xml:lang="it">Livello di uscita</label>
Expand All @@ -1627,7 +1632,7 @@
<comment xml:lang="it">Controlla tensione uscita Funzioni (0-255=alta / 1-254)</comment>
<comment xml:lang="cs">Řídí napětí funkčního výstupu (0 nebo 255 maximum; 1 - 254 snížení)</comment>
</variable>
<variable CV="61" item="Special Function Mapping" default="0" exclude="228,226,232,235,247,MX689_v30">
<variable item="Special Function Mapping" CV="61" default="0" exclude="228,226,232,235,247,MX689_v30">
<enumVal>
<enumChoice choice="NMRA Standard Mapping">
<choice>NMRA Standard Mapping</choice>
Expand All @@ -1652,43 +1657,49 @@
<label xml:lang="cs">Přiřazení speciálních funkcí</label>
<label xml:lang="de">Spezielle „ZIMO-Funktionszuordnungen“</label>
</variable>
<variable CV="62" default="0" item="Global lighting option 1">
<variable item="Global lighting option 1" CV="62" default="0">
<decVal min="0" max="9"/>
<label>Minimum Dimming Value</label>
<label xml:lang="it">Valore minimo smorzamento luci</label>
<label xml:lang="cs">Minimální hodnota tlumení jasu</label>
<label xml:lang="de">Minimum-Dimm-Wert</label>
<tooltip> </tooltip>
<tooltip xml:lang="de">Veränderung des Minimum-Dimm-Wertes</tooltip>
</variable>
<variable CV="63" default="51" item="Global lighting option 2">
<variable item="Global lighting option 2" CV="63" default="51">
<decVal max="255"/>
<label>Light Effects Modifications</label>
<label xml:lang="it">Modifica effetti Luci</label>
<label xml:lang="cs">Úprava světelných efektů</label>
<label xml:lang="de">Lichteffekte anpassen</label>
<tooltip> </tooltip>
<tooltip xml:lang="de">Zykluszeit (Zehner-), Aus-Verlängerung (Einerstelle)</tooltip>
</variable>
<variable CV="64" default="5" item="Global lighting option 4" exclude="228,226,232,235,247,MX689_v30">
<variable item="Global lighting option 4" CV="64" default="5" exclude="228,226,232,235,247,MX689_v30">
<decVal min="0" max="9"/>
<label>Ditch Light Off Time</label>
<label xml:lang="it">Tempo di Off luci Ditch</label>
<label xml:lang="cs">Čas zhasínání návěstních světel</label>
<label xml:lang="de">Ditchlight Aus-Zeit</label>
<tooltip> </tooltip>
<tooltip xml:lang="de">Ditch light Aus-Zeit verändern</tooltip>
</variable>
<variable CV="65" readOnly="yes" default="0" item="Product Number">
<variable item="Product Number" CV="65" readOnly="yes" default="0">
<decVal/>
<label>Sub-version</label>
<label xml:lang="it">Sub-Vers. Numero prodotto</label>
<label xml:lang="cs">Podverze</label>
<tooltip>Sub-version Number (read only)</tooltip>
<tooltip xml:lang="de">Unterversion Nummer (nur lesend)</tooltip>
</variable>
<xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
<variable CV="67" item="Speed Table" exclude="228,226,232,235,247,MX689_v30">
<variable item="Speed Table" CV="67" exclude="228,226,232,235,247,MX689_v30">
<speedTableVal/>
<label>Speed Table</label>
<label xml:lang="fr">Speed Table(fr)</label>
<label xml:lang="it">Tabella Velocità</label>
<label xml:lang="cs">Rychlostní tabulka</label>
<label xml:lang="de">Geschwindigkeitskennlinie</label>
</variable>
<xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>
</variables>
28 changes: 20 additions & 8 deletions xml/decoders/zimo/CV100-CV152version30.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- version 1.4 5 jan 2015 Mark Waters - fixed dimming mask inverted -->
<!-- version 1.5 23 Jan 2015 Mark Waters - added more includes for CV133 for newer decoders -->
<!-- version 1.6 14 Dec 2016 Ronald Kuhn - added german translation and Function Decoder-->
<!-- version 1.7 15 Apr 2019 Ronald Kuhn - added some german translation -->
<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">
<xi:include href="http://jmri.org/xml/decoders/nmra/userId.xml"/>
<!-- Used unrelated item names used to place CV107-108 on the Lights pane -->
Expand Down Expand Up @@ -949,7 +950,7 @@
<enumChoice choice="F4">
<choice>F4</choice>
</enumChoice>
<enumChoice choice="F3">
<enumChoice choice="F3" value="16">
<choice>F3</choice>
</enumChoice>
</enumVal>
Expand All @@ -965,7 +966,7 @@
<label xml:lang="cs">Metoda DC zastavení v závislosti na polaritě</label>
<label xml:lang="de">polaritätsabhängige DC-Bremsabschnitte</label>
</variable>
<variable CV="124" item="SUSI" mask="VXXXXXXX" default="0" minOut="6" exclude="228,226,232,235,247,MX689_v30">
<variable CV="124" item="SUSI" mask="VXXXXXXX" default="0" minOut="6" exclude="195,197,228,226,232,235,247,MX689_v30">
<!-- value 0 => Susi, value 1 => normal function outputs -->
<enumVal>
<enumChoice choice="SUSI Serial interface for sound board">
Expand All @@ -989,6 +990,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Front light effect generated</label>
<label xml:lang="it">Effetti Luci frontali</label>
Expand All @@ -1008,6 +1010,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Rear light effect generated</label>
<label xml:lang="it">Effetti Luci posteriori</label>
Expand All @@ -1027,6 +1030,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Function output 1 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 1</label>
Expand All @@ -1046,6 +1050,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Function output 2 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 2</label>
Expand All @@ -1065,6 +1070,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Function output 3 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 3</label>
Expand All @@ -1084,6 +1090,7 @@
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Function output 4 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 4</label>
Expand All @@ -1097,38 +1104,40 @@
<label xml:lang="cs">Chování funkčního výstupu 4</label>
<label xml:lang="de">FA4 Verhalten</label>
</variable>
<variable CV="131" mask="VVVVVVXX" minOut="7" item="Output 7 effect generated">
<variable CV="131" mask="VVVVVVXX" item="Output 7 effect generated" minOut="7">
<enumVal>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth1.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Function output 5 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 5</label>
<label xml:lang="cs">Generátor efektů funkčního výstupu 5</label>
<label xml:lang="de">FA5 Effekt</label>
</variable>
<variable CV="131" mask="XXXXXXVV" minOut="7" item="Output 7 behavior">
<variable CV="131" mask="XXXXXXVV" item="Output 7 behavior" minOut="7">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-both_frw_rev.xml"/>
<label>Function output 5 behavior</label>
<label xml:lang="it">Comportamento uscita Funzione 5</label>
<label xml:lang="cs">Chování funkčního výstupu 5</label>
<label xml:lang="de">FA5 Verhalten</label>
</variable>
<variable CV="132" mask="VVVVVVXX" minOut="8" item="Output 8 effect generated">
<variable CV="132" mask="VVVVVVXX" item="Output 8 effect generated" minOut="8">
<enumVal>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth1.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth2.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth3.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth4.xml"/>
<xi:include href="http://jmri.org/xml/decoders/zimo/Choice-Ligth8.xml"/>
</enumVal>
<label>Functin output 6 effect generated</label>
<label xml:lang="it">Effetti uscita Funzione 6</label>
<label xml:lang="cs">Generátor efektů funkčního výstupu 6</label>
<label xml:lang="de">FA6 Effekt</label>
</variable>
<variable CV="132" mask="XXXXXXVV" minOut="8" item="Output 8 behavior">
<variable CV="132" mask="XXXXXXVV" item="Output 8 behavior" minOut="8">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-both_frw_rev.xml"/>
<label>Function output 6 behavior</label>
<label xml:lang="it">Comportamento uscita Funzione 6</label>
Expand Down Expand Up @@ -1459,6 +1468,7 @@
<label xml:lang="cs">Vyrovnání vůle převodovky motoru</label>
<label xml:lang="de">Ausgleich Leergang</label>
<tooltip>Motor Backlash Control</tooltip>
<tooltip xml:lang="de">Ausgleich des Getriebe-Leerganges bei Richtungsumkehr</tooltip>
</variable>
<variable CV="147" default="0" item="Total PWM Period" exclude="228,226,232,235,247,MX689_v30">
<decVal min="0" max="255"/>
Expand All @@ -1474,7 +1484,7 @@
<label xml:lang="cs">Diferenciální složka</label>
<label xml:lang="de">EMK - D-Wert</label>
</variable>
<variable CV="149" mask="VVVVVVVX" default="0" item="EMF Enable" exclude="228,226,232,235,247,MX689_v30">
<variable CV="149" mask="XXXXXXXV" default="0" item="EMF Enable" exclude="228,226,232,235,247,MX689_v30">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OnOff.xml"/>
<label>Adaptive proportional value</label>
<label xml:lang="it">Valore proprzionale adattabile</label>
Expand All @@ -1488,7 +1498,7 @@
<label xml:lang="cs">Regulace při plné rychlosti</label>
<label xml:lang="de">EMK - Ausregelung bei Vollgeschwindigkeit</label>
</variable>
<variable CV="151" item="Advanced Group 1 Option 1" default="0" tooltip="Motor braked by shorting output" exclude="228,226,232,235,247,MX689_v30">
<variable CV="151" item="Advanced Group 1 Option 1" default="0" exclude="228,226,232,235,247,MX689_v30">
<enumVal>
<enumChoice choice="No Braking">
<choice>No Braking</choice>
Expand Down Expand Up @@ -1555,6 +1565,8 @@
<label xml:lang="it">Freno motore</label>
<label xml:lang="cs">Motorová brzda</label>
<label xml:lang="de">Motorbremse</label>
<tooltip>Motor braked by shorting output</tooltip>
<tooltip xml:lang="de">Reduziert die Ausregelung des Motors auf 10 - 90 % des Wertes laut CV #58.</tooltip>
</variable>
<variable CV="152" item="Dim function output 7" mask="XXXXXXXV" default="0" minOut="9">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn-1_0.xml"/>
Expand Down
Loading

0 comments on commit b99196d

Please sign in to comment.