diff options
| -rw-r--r-- | dist/ebus-0.2_r1652-py2.5.egg | bin | 9707 -> 9813 bytes | |||
| -rw-r--r-- | ebus/__init__.py | 2 | ||||
| -rw-r--r-- | ebus/ebus_specification.xml | 10 |
3 files changed, 11 insertions, 1 deletions
diff --git a/dist/ebus-0.2_r1652-py2.5.egg b/dist/ebus-0.2_r1652-py2.5.egg Binary files differindex cd7096d..a1f8c2a 100644 --- a/dist/ebus-0.2_r1652-py2.5.egg +++ b/dist/ebus-0.2_r1652-py2.5.egg 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> |