wn/MeterbusLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

category field in device

Browse Source
This commit is contained in:
hg 2015-06-15 22:28:06 +02:00
parent c3a7c19d33
commit 7c68e78ea5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MeterbusLib.py
View File

@ -8,13 +8,13 @@ Created on 11.06.2015
'''
import MeterbusTypeConversion
from MeterbusLibExceptions import *
import struct
class Device(object):
def __init__(self, address, comment, dataItems):
def __init__(self, address, category, comment, dataItems):
self.address = address
self.category = category
self.comment = comment
self.dataItems = dataItems
@ -417,9 +417,9 @@ class LongFrame(ControlFrame):
device = d
break
if device is not None:
self.comment = device.comment
self.comment, self.category = device.comment, device.category
else:
self.comment = '-'
self.comment, self.category = '-', '-'
self.dib = []
consumed = 0
dibIndex = 0
@ -445,7 +445,7 @@ class LongFrame(ControlFrame):
def getJSON(self):
superJSON = super(LongFrame, self).getJSON()
j = {'comment': self.comment, 'header': self.fixedDataHeader.getJSON(), 'dib': [dib.getJSON() for dib in self.dib]}
j = {'comment': self.comment, 'category': self.category, 'header': self.fixedDataHeader.getJSON(), 'dib': [dib.getJSON() for dib in self.dib]}
j.update(superJSON)
return j