Last cleanup

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

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

@@ -196,9 +196,12 @@ class Gateway(AqaraDev):
             logger.warning(e)
 
     def send_cmd(self,cmd,sid,data={}):
-        if self.token == None:
+        if not self.token :
             logger.warning("No token yet, please wait")
             return
+        if not self.secret:
+            logger.warn("Please set the secret key in cfg file")
+            return
         key = self.make_key()
         data.update({"key":key})
         pload = {"cmd":   cmd,

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

@@ -59,31 +59,16 @@ class GW(gevent.Greenlet):
             self.devices.update({sid:dev})
             return dev
         else:
-            logger.info('Unsupported device %s/%s' % (model,sid))
+            logger.info('Unsupported device [%s]/[%s]' % (model,sid))
             return None
 
     def setup(self):
         self.aqara = AqaraConnector()
     
-    def load_devices_from_cfg(self):
-        # not used anymore
-        self.aqara = AqaraConnector()
-        devs = self.cfg['devices']
-        for sid in devs:
-            cfg = devs[sid]
-            model = cfg.get('model',None)
-            base_addr = cfg.get('base_addr',None)
-            # TBD : Merge this w/ handle new device
-            if model and base_addr:
-                dev = self.add_device(sid,model,base_addr)
-                if dev and model == 'gateway':
-                    dev.secret = devs[sid].get('secret',None)
-    
     def get_device(self,sid,model):
         # Already running device ? 
         if sid in self.devices.keys():
             return self.devices[sid]
-
         # Already known device ? 
         elif sid in self.cfg['devices'].keys():
             cfg = self.cfg['devices'][sid]
@@ -97,7 +82,6 @@ class GW(gevent.Greenlet):
                 if dev and model == 'gateway':
                     dev.secret = cfg.get('secret',None)
             return dev
-
         # Still not found ? => new device
         else:
             base_addr = tools.get_random_uuid()[:-2]
@@ -114,18 +98,10 @@ class GW(gevent.Greenlet):
                 self.on_receive(pkt)
 
     def on_receive(self,pkt):
-        print(pkt)
         sid = pkt.get('sid',None)
         if not sid: return
-        dev = None
-        if sid in self.devices.keys():
-            dev = self.devices[sid]
-        else:
         model = pkt.get('model',None)
-            if not model:
-                return
         dev = self.get_device(sid,model)
-
         if dev:
             dev.parse(pkt)