Skip to content
Snippets Groups Projects
Commit 49f2f7a7 authored by KERDREUX Jerome's avatar KERDREUX Jerome
Browse files

Format

parent f10cd3d7
Branches
No related tags found
1 merge request!1First try of type hints
from xaal.lib import tools,Device,AsyncEngine
from xaal.lib import tools
from xaal.schemas import devices
import asyncio
import socketio
import atexit
import logging
......@@ -29,7 +28,7 @@ class GW(object):
cfg = tools.new_cfg(PACKAGE_NAME)
cfg['config']['url'] = 'http://floor1.enstb.org:8000/'
cfg['devices'] = {}
logger.warn("Created an empty config file")
logger.warning("Created an empty config file")
cfg.write()
self.cfg = cfg
......@@ -47,7 +46,6 @@ class GW(object):
dev = self.add_device(k, cfg['type'], tools.get_uuid(cfg['addr']))
self.engine.add_device(dev)
def add_device(self, idx, al_type, addr=None):
if not addr:
addr = tools.get_random_uuid()
......@@ -56,7 +54,7 @@ class GW(object):
dev = devices.falldetector(addr)
if al_type == 'presence':
dev = devices.motion(addr)
if dev==None:
if dev is None:
return
logger.debug(f"New device {addr} {idx}")
dev.vendor_id = 'Future Shape'
......@@ -67,21 +65,19 @@ class GW(object):
self.engine.add_device(dev)
return dev
def get_device(self, idx, al_type):
dev = self.devices.get(idx, None)
return dev
def on_alarm(self, data):
active = []
for k in data:
# print(k)
idx = str(k['index'])
al_type = k['type']
state = k['state']
# state = k['state']
dev = self.get_device(idx, al_type)
if dev == None:
if dev is None:
dev = self.add_device(idx, al_type)
self.cfg['devices'][str(idx)] = {'addr': dev.address, 'type': al_type}
......@@ -90,11 +86,11 @@ class GW(object):
active.append(dev)
# print(active)
for dev in self.devices.values():
if dev in active:continue
if dev in active:
continue
if dev.dev_type == 'motion.basic':
dev.attributes['presence'] = False
def _exit(self):
cfg = tools.load_cfg(PACKAGE_NAME)
if cfg != self.cfg:
......@@ -111,7 +107,9 @@ class GW(object):
def stop():
import pdb;pdb.set_trace()
import pdb
pdb.set_trace()
def setup(eng):
......@@ -119,3 +117,4 @@ def setup(eng):
eng.on_stop(stop)
eng.new_task(gw.sio_task())
return True
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment