spec up

git-svn-id: http://10.2.2.13/svn/common/ebus@1667 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd
author: yvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd> 2010-04-24 13:02:22 +0000
committer: yvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd> 2010-04-24 13:02:22 +0000
commit: 7a1542162fe2c2f06f808b3b628e028576a28114 (patch)
tree: 0631bf1ce5037e38a043d6b071aca2c969b1f6e9 /doc
parent: 697dee0c94d256f1b858748753264c8731fa55f1 (diff)
download: ebus-alt-7a1542162fe2c2f06f808b3b628e028576a28114.tar.gz
ebus-alt-7a1542162fe2c2f06f808b3b628e028576a28114.zip
2 files changed, 375 insertions, 76 deletions
diff --git a/doc/ebus_specification.html b/doc/ebus_specification.html
index 0969fe8..fbdd101 100644
--- a/doc/ebus_specification.html
+++ b/doc/ebus_specification.html
@@ -1,21 +1,62 @@
 <html>
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css">
+      table {
+      border: 1px solid gray;
+      width: 100%;
+      }
+      table td {
+      border-left: 1px dotted gray;
+      border-right: 1px dotted gray;
+      }
+
+      table th {
+      border: 1px dotted gray;
+      }
+    </style>
+</head>
 <body>
 <h2>Ebus Geräte</h2>
-<table class="ebus_devices">
+<table class="devices">
 <tr>
 <th>Adresse</th>
 <th>Gerät</th>
 <th>Typ</th>
 </tr>
 <tr>
+<td>0x00</td>
+<td>PC/Modem</td>
+<td>master</td>
+</tr>
+<tr>
 <td>0x03</td>
-<td>Feuerungsautomat</td>
+<td>Feuerungsautomat 2</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0x0f</td>
+<td>RC Clock Model</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0x07</td>
+<td>Unknown</td>
 <td>master</td>
 </tr>
 <tr>
 <td>0x10</td>
-<td>Heizungsregler 2</td>
+<td>Heizkreisregler 2</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0x11</td>
+<td>Bus Interface 1</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0x13</td>
+<td>Feuerungsautomat 2</td>
 <td>master</td>
 </tr>
 <tr>
@@ -24,6 +65,16 @@
 <td>master</td>
 </tr>
 <tr>
+<td>0x31</td>
+<td>Bus Interface 2</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0x33</td>
+<td>Feuerungsautomat 3</td>
+<td>master</td>
+</tr>
+<tr>
 <td>0x70</td>
 <td>Heizkreisregler 2</td>
 <td>master</td>
@@ -34,6 +85,11 @@
 <td>master</td>
 </tr>
 <tr>
+<td>0x73</td>
+<td>Feuerungsautomat 4</td>
+<td>master</td>
+</tr>
+<tr>
 <td>0xf1</td>
 <td>Heizkreisregler 10</td>
 <td>master</td>
@@ -59,170 +115,388 @@
 <td>slave</td>
 </tr>
 <tr>
+<td>0xf0</td>
+<td>Heizkreisregler 3</td>
+<td>master</td>
+</tr>
+<tr>
+<td>0xf3</td>
+<td>Feuerungsautomat 5</td>
+<td>master</td>
+</tr>
+<tr>
 <td>0xfe</td>
 <td>Broadcastadresse</td>
 <td>broadcast</td>
 </tr>
+<tr>
+<td>0xff</td>
+<td>PC</td>
+<td>master</td>
+</tr>
 </table>
-<h2>Ebus Packete</h2>
-<table class="ebus_packets">
+<h2>Ebus Pakete</h2>
+<table class="packets">
 <tr>
-<th>prim. command</th>
-<th>sec. command</th>
-<th>descript.</th>
-<th>fieldsr</th>
+<th>Primary Command</th>
+<th>Secondary Command</th>
+<th>Name</th>
+<th>Description</th>
 </tr>
 <tr>
 <td>0x05</td>
 <td>0x03</td>
+<td>betriebsdatenRegler1</td>
 <td>Betriebsdaten des Feuerungsautomaten an den Regler Block1</td>
-<td><table><tr>
-<th>name</th>
-<th>typ</th>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
+<tr>
 <th>offset</th>
-</tr></table></td>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>3</td>
+<td>byte</td>
+<td>stellgradKesselleistung</td>
+<td>Stellgrad Kesselleistung</td>
+</tr>
+<tr>
+<td>4</td>
+<td>data1c</td>
+<td>kesselTemperatur</td>
+<td>Kessel Temperatur</td>
+</tr>
+<tr>
+<td>4</td>
+<td>byte</td>
+<td>ruecklaufTemperatur</td>
+<td>Rücklauf Temperatur</td>
+</tr>
+<tr>
+<td>6</td>
+<td>byte</td>
+<td>boilerTemperatur</td>
+<td>Boiler Temperatur</td>
 </tr>
 <tr>
+<td>7</td>
+<td>byte</td>
+<td>aussenTemperatur</td>
+<td>Aussentemperatur</td>
+</tr>
+</table></td>
+</tr>
+<tr><td colspan="4"><hr></td></tr>
+<tr>
 <td>0x05</td>
 <td>0x07</td>
+<td>betriebsdatenFeuerungsautomat</td>
 <td>Betriebsdaten des Reglers an den Feuerungsautomaten</td>
-<td><table>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
 <tr>
-<th>name</th>
-<th>typ</th>
 <th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
 </tr>
 <tr>
-<td>betriebszustand</td>
-<td>byteEnum</td>
 <td>0</td>
+<td>byteEnum</td>
+<td>betriebszustand</td>
+<td>
+          </td>
 </tr>
 <tr>
-<td>aktion</td>
-<td>byteEnum</td>
 <td>1</td>
+<td>byteEnum</td>
+<td>aktion</td>
+<td>
+          </td>
 </tr>
 <tr>
-<td>kesselSollwertTemperatur</td>
-<td>data2c</td>
 <td>2</td>
+<td>data2c</td>
+<td>kesselSollwertTemperatur</td>
+<td>Kessel Temperatur Sollwert</td>
 </tr>
 <tr>
-<td>kesselSollwertDruck</td>
-<td>data2b</td>
 <td>4</td>
+<td>data2b</td>
+<td>kesselSollwertDruck</td>
+<td>Kesseldruck Sollwert</td>
 </tr>
 <tr>
-<td>stellgrad</td>
-<td>data1c</td>
 <td>6</td>
+<td>data1c</td>
+<td>stellgrad</td>
+<td>Stellgrad</td>
 </tr>
 <tr>
-<td>brauchwasserSollwert</td>
-<td>data1c</td>
 <td>7</td>
+<td>data1c</td>
+<td>brauchwasserSollwert</td>
+<td>Brauchwasser Sollwert</td>
 </tr>
 </table></td>
 </tr>
+<tr><td colspan="4"><hr></td></tr>
 <tr>
 <td>0x07</td>
 <td>0x00</td>
+<td>datumZeit</td>
 <td>Datum/Zeit Meldung eines eBus Master</td>
-<td><table>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
 <tr>
-<th>name</th>
-<th>typ</th>
 <th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
 </tr>
 <tr>
-<td>aussenTemperatur</td>
-<td>data2b</td>
 <td>0</td>
+<td>data2b</td>
+<td>aussenTemperatur</td>
+<td>Aussentemperatur</td>
 </tr>
 <tr>
-<td>sekunden</td>
-<td>bcd</td>
 <td>2</td>
+<td>bcd</td>
+<td>sekunden</td>
+<td>Sekunden</td>
 </tr>
 <tr>
-<td>minuten</td>
-<td>bcd</td>
 <td>3</td>
+<td>bcd</td>
+<td>minuten</td>
+<td>Minuten</td>
 </tr>
 <tr>
-<td>stunden</td>
-<td>bcd</td>
 <td>4</td>
+<td>bcd</td>
+<td>stunden</td>
+<td>Studen</td>
 </tr>
 <tr>
-<td>tag</td>
-<td>bcd</td>
 <td>5</td>
+<td>bcd</td>
+<td>tag</td>
+<td>Tag</td>
 </tr>
 <tr>
-<td>monat</td>
-<td>bcd</td>
 <td>6</td>
+<td>bcd</td>
+<td>monat</td>
+<td>Monat</td>
 </tr>
 <tr>
-<td>wochentag</td>
-<td>bcd</td>
 <td>7</td>
+<td>bcd</td>
+<td>wochentag</td>
+<td>Wochentag</td>
 </tr>
 <tr>
-<td>jahr</td>
-<td>bcd</td>
 <td>8</td>
+<td>bcd</td>
+<td>jahr</td>
+<td>Jahr</td>
 </tr>
 </table></td>
 </tr>
+<tr><td colspan="4"><hr></td></tr>
 <tr>
 <td>0x08</td>
 <td>0x00</td>
+<td>sollwertuebertragungRegler</td>
 <td>Sollwertübertragung des Reglers an andere Regler</td>
-<td><table><tr>
-<th>name</th>
-<th>typ</th>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
+<tr>
 <th>offset</th>
-</tr></table></td>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>0</td>
+<td>data2b</td>
+<td>TK_soll</td>
+<td>Kessel Sollwert in °C [1/256]</td>
 </tr>
 <tr>
+<td>2</td>
+<td>data2b</td>
+<td>TA_ist</td>
+<td>Aussentemperatur in °C [1/256]</td>
+</tr>
+<tr>
+<td>4</td>
+<td>data1b</td>
+<td>L_zwang</td>
+<td>Leistungszwang in %</td>
+</tr>
+<tr>
+<td>5</td>
+<td>bit</td>
+<td>Status</td>
+<td>Status</td>
+</tr>
+<tr>
+<td>6</td>
+<td>data2b</td>
+<td>TB_soll</td>
+<td>Brauchwassersollwert</td>
+</tr>
+</table></td>
+</tr>
+<tr><td colspan="4"><hr></td></tr>
+<tr>
 <td>0x03</td>
 <td>0x08</td>
+<td>brenstoffmengeLesen</td>
 <td>Gesamtbrennstoffmenge Lesen</td>
-<td><table><tr>
-<th>name</th>
-<th>typ</th>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields"><tr>
 <th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
 </tr></table></td>
 </tr>
+<tr><td colspan="4"><hr></td></tr>
+<tr>
+<td>0x50</td>
+<td>0x14</td>
+<td>vorlauftemperatur</td>
+<td>Reversed: http://www.mikrocontroller.net/topic/91164#1070401</td>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
+<tr>
+<th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>0</td>
+<td>data2b</td>
+<td>vorlauftemperaturIst</td>
+<td>Aktuelle Vorlauftemperatur Mischerkreis</td>
+</tr>
+<tr>
+<td>2</td>
+<td>data2b</td>
+<td>vorlauftemperaturSoll</td>
+<td>Soll Vorlaufteperatur Mischerkreis</td>
+</tr>
+</table></td>
+</tr>
+<tr><td colspan="4"><hr></td></tr>
 <tr>
 <td>0x50</td>
 <td>0x17</td>
+<td>solarDaten</td>
 <td>Solar Daten</td>
-<td><table>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
 <tr>
-<th>name</th>
-<th>typ</th>
 <th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
 </tr>
 <tr>
-<td>solarPumpe</td>
-<td>bit</td>
 <td>0</td>
+<td>bit</td>
+<td>solarPumpe</td>
+<td>Betriebszustand Solarpumpe</td>
 </tr>
 <tr>
+<td>2</td>
+<td>data2c</td>
 <td>tempKollektor</td>
+<td>Wassertemperatur am Kollektor</td>
+</tr>
+<tr>
+<td>4</td>
 <td>data2c</td>
+<td>tempWarmwasserSolar</td>
+<td>Warmwassertemperatur am Kollektor</td>
+</tr>
+</table></td>
+</tr>
+<tr><td colspan="4"><hr></td></tr>
+<tr>
+<td>0x50</td>
+<td>0x18</td>
+<td>solarDatenSumme</td>
+<td>Reversed siehe ebus-wiki</td>
+</tr>
+<tr>
+<td></td>
+<td colspan="3"><table class="fields">
+<tr>
+<th>offset</th>
+<th>typ</th>
+<th>name</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>0</td>
+<td>data2b</td>
+<td>aktuelleLeistung</td>
+<td>Aktuelle Solarleistung</td>
+</tr>
+<tr>
 <td>2</td>
+<td>word</td>
+<td>tagesertragLow</td>
+<td>Tagesertrag low</td>
 </tr>
 <tr>
-<td>tempWarmwasserSolar</td>
-<td>data2c</td>
 <td>4</td>
+<td>word</td>
+<td>tagesertragHigh</td>
+<td>Tagesertrag high * 1000</td>
+</tr>
+<tr>
+<td>6</td>
+<td>word</td>
+<td>ertragssumme</td>
+<td>Ertragssumme</td>
+</tr>
+<tr>
+<td>8</td>
+<td>word</td>
+<td>ertragssummeT</td>
+<td>Ertragssumme T * 1000</td>
+</tr>
+<tr>
+<td>10</td>
+<td>word</td>
+<td>ertragssummeM</td>
+<td>Etragssumme M * 1000 * 1000</td>
 </tr>
 </table></td>
 </tr>
+<tr><td colspan="4"><hr></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/ebus_specification.html.xslt b/doc/ebus_specification.html.xslt
index 668d3ba..2743e5b 100644
--- a/doc/ebus_specification.html.xslt
+++ b/doc/ebus_specification.html.xslt
@@ -5,11 +5,25 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:template match="/">
   <html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf8" /> 
+    <meta http-equiv="Content-Type" content="text/html; charset=utf8"/>
+    <style type="text/css">
+      table {
+      border: 1px solid gray;
+      width: 100%;
+      }
+      table td {
+      border-left: 1px dotted gray;
+      border-right: 1px dotted gray;
+      }
+
+      table th {
+      border: 1px dotted gray;
+      }
+    </style>
   </head>
   <body>
     <h2>Ebus Geräte</h2>
-    <table class="ebus_devices">
+    <table class="devices">
       <tr>
         <th>Adresse</th>
         <th>Gerät</th>
@@ -27,36 +41,47 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       </xsl:for-each>
     </table>
 
-    <h2>Ebus Packete</h2>
-    <table class="ebus_packets">
+    <h2>Ebus Pakete</h2>
+    <table class="packets">
       <tr>
-        <th>prim. command</th>
-        <th>sec. command</th>
-        <th>descript.</th>
-        <th>fieldsr</th>
+        <th>Primary Command</th>
+        <th>Secondary Command</th>
+        <th>Name</th>
+        <th>Description</th>
       </tr>
       <xsl:for-each select="ebus/packets/packet">
         <tr>
           <td><xsl:value-of select="@primary"/></td>
           <td><xsl:value-of select="@secondary"/></td>
+          <td><xsl:value-of select="@name"/></td>
           <td><xsl:value-of select="@description"/></td>
-          <td>
-            <table>
+	</tr>
+	<tr>
+	  <td/>
+          <td colspan="3">
+            <table class="fields">
               <tr>
-                <th>name</th>
-                <th>typ</th>
                 <th>offset</th>
+                <th>typ</th>
+                <th>name</th>
+		<th>Description</th>
               </tr>
               <xsl:for-each select="fields/*">
                 <tr>
-                  <td><xsl:value-of select="@name"/></td>
-                  <td><xsl:value-of select="name()"/></td>
                   <td><xsl:value-of select="@offset"/></td>
+                  <td><xsl:value-of select="name()"/></td>
+                  <td><xsl:value-of select="@name"/></td>
+		  <td><xsl:value-of select="text()"/></td>
                 </tr>
               </xsl:for-each>
             </table>
           </td>
         </tr>
+	<tr>
+	  <td colspan="4">
+	    <hr />
+	  </td>
+	</tr>
       </xsl:for-each>
     </table>
   </body>
author	yvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>	2010-04-24 13:02:22 +0000
committer	yvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>	2010-04-24 13:02:22 +0000
commit	7a1542162fe2c2f06f808b3b628e028576a28114 (patch)
tree	0631bf1ce5037e38a043d6b071aca2c969b1f6e9 /doc
parent	697dee0c94d256f1b858748753264c8731fa55f1 (diff)
download	ebus-alt-7a1542162fe2c2f06f808b3b628e028576a28114.tar.gz ebus-alt-7a1542162fe2c2f06f808b3b628e028576a28114.zip