New run_package API

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@2072 b32b6428-25c9-4566-ad07-03861ab6144f

devices/protocols/Aqara/xaal/aqara/__init__.py

-

devices/protocols/Aqara/xaal/aqara/__main__.py

-from xaal.lib import Engine
 from . import gw
+from xaal.lib import helpers
 
-def main():
-    eng = Engine()
-    gw.setup(eng)
-    eng.run()
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        print("bye bye")
+helpers.run_package(gw.PACKAGE_NAME,gw.setup)

devices/protocols/Aqara/xaal/aqara/gw.py

@@ -7,10 +7,10 @@ from . import devices
 
 import inspect
 import atexit
+import logging
 
 PACKAGE_NAME = 'xaal.aqara'
-logger = tools.get_logger(PACKAGE_NAME,'DEBUG')
-
+logger = logging.getLogger(PACKAGE_NAME)
 
 def find_device_class(model):
     if model in ['sensor_switch.aq3','sensor_switch.aq2','switch','86sw1']:
@@ -39,7 +39,7 @@ class GW(gevent.Greenlet):
         atexit.register(self._exit)
         self.config()
         self.setup()
-
+        
     def config(self):
         cfg = tools.load_cfg(PACKAGE_NAME)
         if not cfg:

devices/protocols/HQ433/xaal/hq433/__main__.py

 from . import gw
-gw.main()
+from xaal.lib import helpers
+
+helpers.run_package(gw.PACKAGE_NAME,gw.setup)
 

devices/protocols/HQ433/xaal/hq433/gw.py

@@ -4,9 +4,10 @@ from xaal.lib import tools,Engine,Device
 
 import platform
 import serial
+import logging
 
 PACKAGE_NAME = "xaal.hq433"
-logger = tools.get_logger(PACKAGE_NAME,'DEBUG')
+logger = logging.getLogger(PACKAGE_NAME)
 
 
 def new_dev(gw,key,channel,addr,dtype):
@@ -51,7 +52,11 @@ class GW(object):
         """ connect to serial port, and load configuration file"""
         # connect to serial port
         port = self.cfg['config']['port']
-        self.ser = serial.Serial(port,19200,timeout=0.5)
+        try:
+            self.ser = serial.Serial(port,19200,timeout=0.5)
+        except:
+            logger.critical('Unable to open serial port')
+            return
         
         # load devices from 
         devices = [] 
@@ -82,16 +87,6 @@ class GW(object):
         return True
 
 
-def run():
-    eng = Engine()
-    gw = GW(eng)
-    eng.run()
+def setup(engine):
+    GW(engine)
+    return True
\ No newline at end of file
-
-def main():
-    try:
-        run()
-    except KeyboardInterrupt:
-        print("Bye Bye...")
-        
-if __name__ == '__main__':
-    main()