summaryrefslogtreecommitdiff
path: root/ebus
diff options
context:
space:
mode:
authoryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-04-20 21:00:40 +0000
committeryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-04-20 21:00:40 +0000
commit689d008a8531ad558787f86926655b58bb360153 (patch)
tree1a0e32e2bbc1e5bf27b9460aade057154950a873 /ebus
parent82275d41d591fe437c1ee3432c1d16d7ec50394d (diff)
downloadebus-alt-689d008a8531ad558787f86926655b58bb360153.tar.gz
ebus-alt-689d008a8531ad558787f86926655b58bb360153.zip
fixed specifcation migragetion from python
git-svn-id: http://10.2.2.13/svn/common/ebus@1664 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd
Diffstat (limited to 'ebus')
-rw-r--r--ebus/__init__.py2
-rw-r--r--ebus/ebus_specification.xml10
2 files changed, 11 insertions, 1 deletions
diff --git a/ebus/__init__.py b/ebus/__init__.py
index 0813b53..e92a74e 100644
--- a/ebus/__init__.py
+++ b/ebus/__init__.py
@@ -125,6 +125,8 @@ class EbusXMLMixin(object):
continue
elif field.tag == "bit":
yield fields.Bit( name, int(offset))
+ elif field.tag == "byte":
+ yield fields.Byte( name, int(offset))
elif field.tag == "data1c":
yield fields.Data1c( name, int(offset) )
elif field.tag == "data2b":
diff --git a/ebus/ebus_specification.xml b/ebus/ebus_specification.xml
index d247281..3753724 100644
--- a/ebus/ebus_specification.xml
+++ b/ebus/ebus_specification.xml
@@ -19,7 +19,15 @@
</devices>
<packets>
<packet primary="0x05" secondary="0x03" name="betriebsdatenRegler1"
- description="Betriebsdaten des Feuerungsautomaten an den Regler Block1"/>
+ description="Betriebsdaten des Feuerungsautomaten an den Regler Block1">
+ <fields>
+ <byte offset="3" name="stellgradKesselleistung">Stellgrad Kesselleistung</byte>
+ <data1c offset="4" name="kesselTemperatur">Kessel Temperatur</data1c>
+ <byte offset="4" name="ruecklaufTemperatur">Rücklauf Temperatur</byte>
+ <byte offset="6" name="boilerTemperatur">Boiler Temperatur</byte>
+ <byte offset="7" name="aussenTemperatur">Aussentemperatur</byte>
+ </fields>
+ </packet>
<packet primary="0x05" secondary="0x07" name="betriebsdatenFeuerungsautomat"
description="Betriebsdaten des Reglers an den Feuerungsautomaten">
<fields>