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

Cleaner output (Mael request)

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2365 b32b6428-25c9-4566-ad07-03861ab6144f
parent df203736
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@ class GW(gevent.Greenlet):
self.devices.update({sid:dev})
return dev
else:
logger.info('Unsupported device [%s]/[%s]' % (model,sid))
logger.info(f"Unsupported device {model} / {sid}")
return None
def setup(self):
......@@ -75,11 +75,10 @@ class GW(gevent.Greenlet):
elif sid in self.cfg['devices'].keys():
cfg = self.cfg['devices'][sid]
model_old = cfg.get('model',None)
tmp = cfg.get('base_addr',None)
base_addr = tools.str_to_uuid(tmp)
base_addr = tools.get_uuid( cfg.get('base_addr',None) )
dev = None
if model != model_old:
logger.warn("Device %s wrong model" % sid)
logger.warn(f"Device {sid} wrong model")
if model and base_addr:
dev = self.add_device(sid,model,base_addr)
if dev and model == 'gateway':
......@@ -89,6 +88,7 @@ class GW(gevent.Greenlet):
else:
base_addr = tools.get_random_uuid()
dev = self.add_device(sid,model,base_addr)
logger.warning(f"Discover new Aqara Device {model} {sid}")
if dev:
cfg = {'base_addr' : base_addr.str,'model':model}
self.cfg['devices'].update({sid:cfg})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment