Skip to content
Snippets Groups Projects
Commit 786a9784 authored by jkerdreu's avatar jkerdreu
Browse files

New UUID API



git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2432 b32b6428-25c9-4566-ad07-03861ab6144f
parent 064c14b2
No related branches found
No related tags found
No related merge requests found
......@@ -17,26 +17,25 @@ class ZDevice(object):
key = str(self.node.node_id)
if key in cfg.keys():
tmp = cfg[key]['base_addr']
self.base_addr = tmp[:-2]
self.base_addr = tools.get_uuid(tmp)
else:
self.gw.save_config=True
tmp = tools.get_random_uuid()
self.base_addr = tmp[:-2]
cfg.update({key:{}})
cfg[key]['base_addr'] = self.base_addr + '00'
cfg[key]['group'] = tools.get_random_uuid()
cfg[key]['base_addr'] = str(tools.get_random_base_uuid())
cfg[key]['group'] = str(tools.get_random_uuid())
cfg.inline_comments[key] = self.node.product_name
def new_device(self,devtype):
""" embed an new device """
node_id = str(self.node.node_id)
cfg = self.gw.cfg['products'][node_id]
dev = Device(devtype)
dev.vendor_id = "IHSEV/OpenZWave"
dev.product_id = self.node.product_name
dev.hw_id = node_id
dev.url = "http://www.openzwave.com"
dev.address = self.base_addr + '%02x' % (len(self.devices) + 1)
dev.group_id = self.gw.cfg['products'][node_id]['group']
dev.address = tools.get_uuid(cfg['base_addr']) + len(self.devices) + 1
dev.group_id = tools.get_uuid(cfg['group'])
dev.info = '%s/%s' % (self.node.type,node_id)
self.devices.append(dev)
return dev
......
......@@ -18,6 +18,9 @@ import atexit
PACKAGE_NAME = "xaal.zwave"
logger = logging.getLogger(PACKAGE_NAME)
logging.getLogger("libopenzwave").setLevel(logging.INFO)
logging.getLogger("openzwave").setLevel(logging.INFO)
class GW(object):
def __init__(self,engine):
......@@ -106,7 +109,7 @@ class GW(object):
def setup_gw(self):
# last step build the GW device
gw = Device("gateway.basic")
gw.address = self.cfg['config']['addr']
gw.address = tools.get_uuid(self.cfg['config']['addr'])
gw.vendor_id = "IHSEV"
gw.product_id = "OpenZwave gateway"
gw.version = 0.1
......
......@@ -13,8 +13,7 @@ import time
from .cmdclass import COMMAND_CLASS
#import auto
#device="/dev/ttyACM0"
device="/dev/ttyUSB0"
device="/dev/zwave"
network = None
def connected():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment