on() / off() => turn_on() / turn_off()

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

devices/protocols/ZWave/xaal/zwave/products/Everspring/AD142.py

@@ -24,8 +24,8 @@ class AD142(core.ZDevice):
         lamp.new_attribute("light")
         lamp.new_attribute("dimmer")
         # methods
-        lamp.add_method('on',self.on)
-        lamp.add_method('off',self.off)
+        lamp.add_method('turn_on',self.turn_on)
+        lamp.add_method('turn_off',self.turn_off)
         lamp.add_method('dim',self.dim)
         self.monitor_value('level',core.COMMAND_CLASS.SWITCH_MULTILEVEL)
 
@@ -33,10 +33,10 @@ class AD142(core.ZDevice):
         self.set_value('level',value)
         self.gw.engine.add_timer(self.values['level'].refresh,1.8,2)
         
-    def on(self):
+    def turn_on(self):
         self.set_level(0x63)
 
-    def off(self):
+    def turn_off(self):
         self.set_level(0)
 
     def dim(self,value):

devices/protocols/ZWave/xaal/zwave/products/Fibaro/FGWPE.py

@@ -9,8 +9,8 @@ class FGWPE(core.ZDevice):
     def setup(self):
         # powerrelay 
         relay = self.new_device("powerrelay.basic")
-        relay.add_method('on',self.on)
-        relay.add_method('off',self.off)
+        relay.add_method('turn_on',self.turn_on)
+        relay.add_method('turn_off',self.turn_off)
         relay.new_attribute("power")
         # powermeter
         power = self.new_device("powermeter.basic")
@@ -19,10 +19,10 @@ class FGWPE(core.ZDevice):
         self.monitor_value('relay',core.COMMAND_CLASS.SWITCH_BINARY)
         self.monitor_value('power',core.COMMAND_CLASS.SENSOR_MULTILEVEL,1,4)
         
-    def on(self):
+    def turn_on(self):
         self.set_value('relay',True)
 
-    def off(self):
+    def turn_off(self):
         self.set_value('relay',False)
         
     def handle_value_changed(self,value):

devices/protocols/ZWave/xaal/zwave/products/Zipato/RGBBulb.py

@@ -11,8 +11,8 @@ class RGBBulb(core.ZDevice):
         lamp.new_attribute("light")
         lamp.new_attribute("dimmer")
         # methods
-        lamp.add_method('on',self.on)
-        lamp.add_method('off',self.off)
+        lamp.add_method('turn_on',self.turn_on)
+        lamp.add_method('turn_off',self.turn_off)
         lamp.add_method('dim',self.dim)
         lamp.add_method('blink',self.blink)
         self.monitor_value('level',core.COMMAND_CLASS.SWITCH_MULTILEVEL)
@@ -23,10 +23,10 @@ class RGBBulb(core.ZDevice):
         self.set_value('level',value)
         self.gw.engine.add_timer(self.get_value('level').refresh,1,2)
         
-    def on(self):
+    def turn_on(self):
         self.set_level(0x63)
 
-    def off(self):
+    def turn_off(self):
         self.set_level(0)
 
     def dim(self,_value):
@@ -53,10 +53,10 @@ class RGBBulb(core.ZDevice):
         eng = self.gw.engine
         state = self.devices[0].attributes["light"]
         #self.set_value('level',0x63)
-        self.on()
+        self.turn_on()
         eng.add_timer(self.white,19,1)        
         if state == False:
-            eng.add_timer(self.off,20,1)
+            eng.add_timer(self.turn_off,20,1)
         self.gw.engine.add_timer(self._blink,1,15)