Added setup and lamp/powerrelay toggle

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

devices/protocols/IPX-800/xaal/ipx800/__main__.py

+from xaal.lib import Engine
 from . import gw
-gw.main()
+
+def run():
+    eng = Engine()
+    gw.setup(eng)
+    eng.run()
+
+try:
+    run()
+except KeyboardInterrupt:
+    print("Bye Bye...")
 

devices/protocols/IPX-800/xaal/ipx800/devices.py

@@ -29,15 +29,21 @@ class OutputChannel(object):
     def off(self):
         self.ipx.relay_off(self.chan)
 
+    def toggle(self):
+        if self.state.value:
+            self.on()
+        else:
+            self.off()
+
 def new_lamp(ipx,channel,addr,group):
     lamp = OutputChannel(ipx,channel,addr,'light',group)
-    lamp.dev.devtype = 'lamp.basic'
+    lamp.dev.devtype = 'lamp.toggle'
     lamp.dev.product_id = 'IPX-800 Lamp'
     return lamp
 
 
 def new_relay(ipx,channel,addr,group):
     relay = OutputChannel(ipx,channel,addr,'power',group)
-    relay.dev.devtype = 'powerrelay.basic'
+    relay.dev.devtype = 'powerrelay.toggle'
     relay.dev.product_id = 'IPX-800 Power Relay'
     return relay

devices/protocols/IPX-800/xaal/ipx800/gw.py

@@ -107,17 +107,7 @@ class GW(gevent.Greenlet):
         msg = 'Set%02d0' % ID
         self.send(msg)
 
-        
-def run():
-    eng = Engine()
-    GW.spawn(eng)
-    eng.run()
 
-def main():
-    try:
-        run()
-    except KeyboardInterrupt:
-        print("Bye Bye...")
-        
-if __name__ == '__main__':
-    main()
+def setup(engine):
+    GW.spawn(eng)
+    return True