easylinux/DCC_LokDecoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trim added,

Browse Source 
Arduino code:
Comments extended, code cleanup
- CV15/CV16 locking: local variables (unlockNumber, lockingNumber) created
- CV27 autstop: : local variable (autoStop) created
- CV65 kick-off: local variable (kickStart) created
- CV66/CV95 speed trimming: feature implemented
- CV67-94 speed table: : local variables (speedTable[28]) created
Motor period changed to motor pwm frequency [kHz]
Aux outputs 4-8 added

JMRI XML:
tooltips added
Motor period changed to motor pwm frequency [kHz]
CV15/CV16 added
Autostop added
This commit is contained in:
Gyuri
2021-02-14 13:53:54 +01:00
parent d98c634c00
commit 9016252b11
2 changed files with 129 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JMRI_decoder_file/Public_Domain_GTI_green.xml
+39 -18
View File
@@ -12,10 +12,10 @@
<!-- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -->
<!-- for more details. -->
<decoder-config 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-4-15-2.xsd" showEmptyPanes="no">
<version author="Till György" version="1" lastUpdated="20210212"/> <!-- initial release -->
<version author="Till György" version="1" lastUpdated="20210213"/> <!-- initial release -->
<decoder>
<family name="GTI" mfg="Public-domain and DIY" lowVersionID="1" highVersionID="10">
<model model="GTI green" numOuts="10" numFns="28" productID="258">
<model model="GTI green" numOuts="10" numFns="12" productID="258">
<output name="1" label="F0f" />
<output name="2" label="F0r" />
<output name="3" label="AUX1" />
@@ -31,49 +31,65 @@
<programming direct="yes" paged="no" register="yes" ops="no"/>
<variables>
<xi:include href="http://jmri.org/xml/decoders/nmra/shortAndLongAddress.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/accelDecel_255.xml"/>
<variable CV="3" item="Accel" default="0" comment="Range 0-255">
<decVal max="255"/>
<tooltip>x896 ms (0-228s)</tooltip>
<label>Acceleration Rate</label>
<label xml:lang="de">Anfahrverzögerung</label>
</variable>
<variable CV="4" item="Decel" default="0" comment="Range 0-255">
<decVal max="255"/>
<tooltip>x896 ms (0-228s)</tooltip>
<label>Deceleration Rate</label>
<label xml:lang="de">Bremszeit</label>
</variable>
<xi:include href="http://jmri.org/xml/decoders/nmra/vStartHighMid.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/mfgVersionId.xml"/>
<variable item="Total PWM Period" CV="9">
<decVal/>
<label>Total PWM Period (Motor Drive Frequency)</label>
<label xml:lang="de">PWM Periode (Motorfrequenz)</label>
<tooltip>1-40 kHz</tooltip>
<label>Motor Drive Frequency</label>
<label xml:lang="de">Motorfrequenz</label>
</variable>
<variable item="Packet Time-out Value" CV="11">
<decVal/>
<tooltip>x10 (10-2550ms)</tooltip>
<label>Packet Time-out Value</label>
<label xml:lang="de">Maximalzeit ohne Datenempfang</label>
</variable>
<variable item="User Id #3" CV="16" mask="XXXXXVVV" default="0">
<variable item="Advanced Group 1 Option 1" CV="15" default="0">
<decVal/>
<label>Decoder Lock ID number</label>
<label xml:lang="it">ID Codice Blocco Decoder</label>
<label xml:lang="fr">No de verrouillage décodeur (Lock ID)</label>
<label xml:lang="de">Nummer der Decoder Lock ID</label>
<label xml:lang="cs">Zámek dekodéru ID číslo</label>
<label xml:lang="nl">Nummer van het Decoder Lock ID</label>
<tooltip>CV15</tooltip>
<label>Decoder unlock number</label>
<label xml:lang="de">Dekoderaufsperrzahl</label>
</variable>
<variable CV="27" mask="XXVXXXXX" item="Advanced Group 1 Option 4" default="1">
<variable item="Advanced Group 1 Option 2" CV="16" default="0">
<decVal/>
<tooltip>CV16</tooltip>
<label>Decoder locking number</label>
<label xml:lang="de">Dekodersperrzahl</label>
</variable>
<variable CV="27" mask="XXVXXXXX" item="Advanced Group 2 Option 6" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Brake on positive DC</label>
<label xml:lang="de">Bremsen bei positiver Gleichspannung</label>
</variable>
<variable CV="27" mask="XXXVXXXX" item="Advanced Group 1 Option 5" default="1">
<variable CV="27" mask="XXXVXXXX" item="Advanced Group 2 Option 5" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Brake on negative DC</label>
<label xml:lang="de">Bremsen bei negativer Gleichspannung</label>
</variable>
<variable CV="27" mask="XXXXXVXX" item="Advanced Group 1 Option 6" default="1">
<variable CV="27" mask="XXXXXVXX" item="Advanced Group 2 Option 3" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Brake on signal controlled influence</label>
<label xml:lang="de">Bremsen beim Signaleinfluss</label>
</variable>
<variable CV="27" mask="XXXXXXVX" item="Advanced Group 1 Option 7" default="1">
<variable CV="27" mask="XXXXXXVX" item="Advanced Group 2 Option 2" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Brake on asymmetric DCC (left > right)</label>
<label xml:lang="de">Bremsen beim asymmetrischen DCC (Links > Rechts)</label>
</variable>
<variable CV="27" mask="XXXXXXXV" item="Advanced Group 1 Option 8" default="1">
<variable CV="27" mask="XXXXXXXV" item="Advanced Group 2 Option 1" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Brake on asymmetric DCC (right > left)</label>
<label xml:lang="de">Bremsen beim asymmetrischen DCC (Rechts > Links)</label>
@@ -84,7 +100,12 @@
<!-- this next large group forms a table, so doesn't need translation -->
<xi:include href="http://jmri.org/xml/decoders/nmra/functionmap.xml"/>
<!-- end of table that doesn't need translation -->
<xi:include href="http://jmri.org/xml/decoders/nmra/kickStart.xml"/>
<variable item="Kick Start" CV="65">
<decVal/>
<tooltip>0-255 ms</tooltip>
<label>Kick Start</label>
<label xml:lang="de">Kick Start</label>
</variable>
<xi:include href="http://jmri.org/xml/decoders/nmra/fwdTrim.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/cv67speedTableBasic.xml"/>
<xi:include href="http://jmri.org/xml/decoders/nmra/revTrim.xml"/>