Merge branch 'ebus-rust'HEADmaster

3 files changed, 56 insertions, 8 deletions

diff --git a/ebus-xml/Makefile b/ebus-xml/Makefile
index 1a8f4fc..3d17503 100644
--- a/ebus-xml/Makefile
+++ b/ebus-xml/Makefile
@@ -2,14 +2,14 @@ TARGET_DIST=dist/$(shell date --rfc-3339=date)
 
 all: doc
 
-doc:
+doc: validate
 	test -d build || mkdir build
 	xsltproc ebus.docbook.xslt ebus.xml > build/ebus.docbook.xml
-	dblatex -T db2latex build/ebus.docbook.xml
+	pandoc -s -f docbook build/ebus.docbook.xml -o build/ebus.html
 
 dist: doc
 	test -d $(TARGET_DIST) || mkdir -p $(TARGET_DIST)
-	cp build/ebus.docbook.pdf $(TARGET_DIST)
+	cp build/ebus.html $(TARGET_DIST)
 	cp ebus.xml $(TARGET_DIST)
 
 validate:
diff --git a/ebus-xml/ebus-0.1.xsd b/ebus-xml/ebus-0.1.xsd
index 4e96176..bc7d504 100644
--- a/ebus-xml/ebus-0.1.xsd
+++ b/ebus-xml/ebus-0.1.xsd
@@ -75,6 +75,7 @@
       <element name="word" type="tns:FIELD_WORD"></element>
       <element name="bit" type="tns:FIELD_BIT"></element>
       <element name="byteEnum" type="tns:FIELD_BYTE_ENUM" />
+      <element name="string" type="tns:FIELD_STRING" />
     </choice>
   </complexType>
 
@@ -155,4 +156,12 @@
       </extension>
     </complexContent>
   </complexType>
+  
+  <complexType name="FIELD_STRING">
+    <complexContent>
+      <extension base="tns:FIELD_BASE_TYPE">
+        <attribute name="length" type="short" use="required" />
+      </extension>
+    </complexContent>
+  </complexType>
 </schema>
diff --git a/ebus-xml/ebus.xml b/ebus-xml/ebus.xml
index a4552ba..bc7147e 100644
--- a/ebus-xml/ebus.xml
+++ b/ebus-xml/ebus.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" standalone="yes"?>
 <!-- Ebus Paketspezifikation. https://xapek.org/ -->
-<ebus xmlns="http://xapek.org/ebus/0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://xapek.org/ebus/0.1 ebus-0.1.xsd">
+<ebus xmlns="http://xapek.org/ebus/0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xapek.org/ebus/0.1 ebus-0.1.xsd">
   <devices>
     <device address="0" type="master" name="pcModem">
       <description lang="de">PC oder Modem</description>
@@ -72,6 +71,9 @@
     </device>
   </devices>
   <packets>
+    <packet primary="3" secondary="1" name="unknown-3h-1h">
+      <fields />
+    </packet>
     <packet primary="5" secondary="3" name="betriebsdatenRegler1">
       <description lang="de">Betriebsdaten des Feuerungsautomaten an den Regler Block1</description>
       <fields>
@@ -88,7 +90,7 @@
           <description lang="de">Boiler Temperatur</description>
         </byte>
         <data1b offset="7" name="aussenTemperatur">
-			<description lang="de">Aussentemperatur</description>
+          <description lang="de">Aussentemperatur</description>
         </data1b>
       </fields>
     </packet>
@@ -164,7 +166,7 @@
       <fields>
         <data2b offset="0" name="aussenTemperatur" />
         <bcd offset="2" name="sekunden" />
-        <bcd offset="3" name="minuten" /><!-- FEHLER ab hier beim offset??? -->
+        <bcd offset="3" name="minuten" /> <!-- FEHLER ab hier beim offset??? -->
         <bcd offset="4" name="stunden" />
         <bcd offset="5" name="tag" />
         <bcd offset="6" name="monat" />
@@ -173,6 +175,17 @@
       </fields>
     </packet>
 
+    <packet primary="7" secondary="4" name="identifikation">
+      <fields>
+        <byte offset="0" name="hersteller" />
+        <string offset="1" name="device" length="5" />
+        <bcd offset="7" name="softwareversion" />
+        <bcd offset="8" name="softwarerevision" />
+        <bcd offset="9" name="hardwareversion" />
+        <bcd offset="10" name="hardwarerevision" />
+      </fields>
+    </packet>
+
     <packet primary="8" secondary="0" name="sollwertuebertragungRegler">
       <description lang="de">Sollwertübertragung des Reglers an andere Regler</description>
       <fields>
@@ -252,5 +265,31 @@
         </word>
       </fields>
     </packet>
+
+    <packet primary="80" secondary="18" name="unknown-50h-12h">
+      <fields />
+    </packet>
+
+    <packet primary="80" secondary="22" name="unknown-50h-16h">
+      <fields />
+    </packet>
+
+    <packet primary="80" secondary="34" name="unknown-50h-22h">
+      <fields />
+    </packet>
+
+    <packet primary="80" secondary="35" name="unknown-50h-23h">
+      <fields />
+    </packet>
+
+    <packet primary="80" secondary="80" name="unknown-50h-50h">
+      <fields />
+    </packet>
+
+    <packet primary="254" secondary="1" name="unknown3">
+      <fields>
+        <string offset="0" name="statusstring" length="10" />
+      </fields>
+    </packet>
   </packets>
-</ebus>
+</ebus>
\ No newline at end of file