From 2441c5f85c8a9ca84df6827c6c32790741797a29 Mon Sep 17 00:00:00 2001
From: Dale Schultz <dschultzca@yahoo.ca>
Date: Sat, 31 Jan 2015 11:11:36 -0500
Subject: [PATCH] Update logger definition DTD for new elements of DS2 protocol

---
 logger.dtd | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/logger.dtd b/logger.dtd
index 9c4c4c89..7c194e0a 100644
--- a/logger.dtd
+++ b/logger.dtd
@@ -2,7 +2,7 @@
 
 <!ELEMENT address ( #PCDATA ) >
 <!ATTLIST address length CDATA #IMPLIED >
-<!ATTLIST address bit ( 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 ) #IMPLIED >
+<!ATTLIST address bit ( 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 ) #IMPLIED >
 
 <!ELEMENT ecu ( address+ ) >
 <!ATTLIST ecu id CDATA #REQUIRED >
@@ -20,7 +20,8 @@
 <!ELEMENT conversion ( replace* ) >
 <!ATTLIST conversion expr CDATA #REQUIRED >
 <!ATTLIST conversion format ( 0 | 0.0 | 0.00 | 0.000 | 0.0000 | 0.00000 | 0.000000) #REQUIRED >
-<!ATTLIST conversion storagetype ( int8 | int16 | uint8 | uint16 | float ) #IMPLIED >
+<!ATTLIST conversion storagetype ( int8 | int16 | uint8 | uint16 | int32 | uint32 | float ) #IMPLIED >
+<!ATTLIST conversion endian CDATA #IMPLIED >
 <!ATTLIST conversion units CDATA #REQUIRED >
 <!ATTLIST conversion gauge_min CDATA #IMPLIED >
 <!ATTLIST conversion gauge_max CDATA #IMPLIED >
@@ -37,6 +38,7 @@
 <!ATTLIST parameter id ID #REQUIRED >
 
 <!ELEMENT parameters ( parameter+ ) >
+<!ATTLIST parameters mode CDATA #IMPLIED >
 
 <!ELEMENT switch EMPTY >
 <!ATTLIST switch target CDATA #REQUIRED >
@@ -61,13 +63,30 @@
 
 <!ELEMENT ecuparam ( ecu+, conversions? ) >
 <!ATTLIST ecuparam target CDATA #REQUIRED >
+<!ATTLIST ecuparam groupsize CDATA #IMPLIED >
+<!ATTLIST ecuparam subgroup CDATA #IMPLIED >
+<!ATTLIST ecuparam group CDATA #IMPLIED >
 <!ATTLIST ecuparam desc CDATA #REQUIRED >
 <!ATTLIST ecuparam name CDATA #REQUIRED >
 <!ATTLIST ecuparam id ID #REQUIRED >
 
 <!ELEMENT ecuparams ( ecuparam+ ) >
 
-<!ELEMENT protocol ( parameters?, switches?, dtcodes?, ecuparams? ) >
+<!ELEMENT module EMPTY >
+<!ATTLIST module fastpoll CDATA #IMPLIED >
+<!ATTLIST module tester CDATA #IMPLIED >
+<!ATTLIST module desc CDATA #REQUIRED >
+<!ATTLIST module address CDATA #REQUIRED >
+<!ATTLIST module id ID #REQUIRED >
+
+<!ELEMENT transport ( module+ ) >
+<!ATTLIST transport desc CDATA #REQUIRED >
+<!ATTLIST transport name CDATA #REQUIRED >
+<!ATTLIST transport id ID #REQUIRED >
+
+<!ELEMENT transports ( transport+ ) >
+
+<!ELEMENT protocol ( transports, parameters?, switches?, dtcodes?, ecuparams? ) >
 <!ATTLIST protocol id ID #REQUIRED >
 <!ATTLIST protocol baud CDATA #REQUIRED >
 <!ATTLIST protocol databits CDATA #REQUIRED >