Change to the new schema.

Buttons still use the old notifications.

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

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

@@ -94,7 +94,7 @@ class AqaraDev(object):
 
 class Switch(AqaraDev):
     def setup(self):
-        dev = Device('button.basic',self.base_addr)
+        dev = devices.button(self.base_addr)
         self.devices.append(dev)
 
     def on_report(self,data):
@@ -105,9 +105,9 @@ class Switch(AqaraDev):
 
 class Switch86sw2(AqaraDev):
     def setup(self):
-        btn1 = Device('button.basic',self.base_addr)
-        btn2 = Device('button.basic',self.base_addr+1)
-        btn3 = Device('button.basic',self.base_addr+2)
+        btn1 = devices.button(self.base_addr)
+        btn2 = devices.button(self.base_addr+1)
+        btn3 = devices.button(self.base_addr+2)
         self.devices = self.devices + [btn1,btn2,btn3]
 
     def on_report(self,data):
@@ -163,16 +163,15 @@ class Motion(AqaraDev):
 
 class Magnet(AqaraDev):
     def setup(self):
-        dev = devices.door(self.base_addr)
-        dev.unsupported_methods = ['open','close']
+        dev = devices.contact(self.base_addr)
         self.devices.append(dev)
 
     def on_report(self,data):
         status = data.get('status',None)
         if status and status == 'open':
-            self.devices[0].attributes['position'] = True
+            self.devices[0].attributes['detected'] = True
         if status and status == 'close':
-            self.devices[0].attributes['position'] = False
+            self.devices[0].attributes['detected'] = False
 
 
 class Vibration(AqaraDev):pass
@@ -204,9 +203,9 @@ class Gateway(AqaraDev):
         self._secret = None
         self._blink_color = 0
         self.connect()
-        lamp = devices.lamp_rgbw(self.base_addr)
-        lamp.methods['on'] = self.lamp_on
-        lamp.methods['off'] = self.lamp_off
+        lamp = devices.lamp_color(self.base_addr)
+        lamp.methods['turn_on'] = self.lamp_on
+        lamp.methods['turn_off'] = self.lamp_off
         lamp.methods['rand']   = self.lamp_rand
         lamp.methods['blink']   = self.lamp_blink
         lamp.methods['debug'] = self.debug