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

0.7 migration

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2383 b32b6428-25c9-4566-ad07-03861ab6144f
parent 1c226939
No related branches found
No related tags found
No related merge requests found
......@@ -38,13 +38,13 @@ class OutputChannel(object):
def new_lamp(ipx,channel,addr,group):
lamp = OutputChannel(ipx,channel,addr,'light',group)
lamp.dev.devtype = 'lamp.toggle'
lamp.dev.dev_type = 'lamp.toggle'
lamp.dev.product_id = 'IPX-800 Lamp'
return lamp
def new_relay(ipx,channel,addr,group):
relay = OutputChannel(ipx,channel,addr,'power',group)
relay.dev.devtype = 'powerrelay.toggle'
relay.dev.dev_type = 'powerrelay.toggle'
relay.dev.product_id = 'IPX-800 Power Relay'
return relay
......@@ -39,10 +39,11 @@ class GW(gevent.Greenlet):
i = 0
group = cfg['group']
base_addr = tools.get_uuid(cfg['base_addr'])
for t in cfg['outputs_type']:
i = i+1
out = None
addr = '%s%02x' % (cfg['base_addr'][:-2],i)
addr = base_addr + i
if t == 'relay':
out = devices.new_relay(self,i,addr,group)
......@@ -55,7 +56,7 @@ class GW(gevent.Greenlet):
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 = "IPX-800 Ethernet Control System"
gw.version = 0.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment