Cleanup after merge

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

devices/tests/dummy/xaal/dummy/asyncbot.py

-from xaal.lib.asyncio import Engine
-from xaal.lib import Device,tools,helpers
+from xaal.lib import AsyncEngine,Device,tools,helpers
+import functools
+
+import random,sys,asyncio
 
-import time,random,sys,asyncio
 
 def usage():
     print("Usage:")
@@ -9,7 +10,6 @@ def usage():
 
 
 def main():
-    helpers.setup_console_logger()
     target = tools.get_uuid(sys.argv[-1])
     if not target:
         usage()
@@ -20,30 +20,29 @@ def main():
     dev.product_id = "Fake Auto Switch"
     dev.info = 'Autobot switch for %s' % target
 
-    eng = Engine()
+    eng = AsyncEngine()
     eng.add_device(dev)
 
     async def run():
         while 1:
+            print(' => turn_on')
             eng.send_request(dev,[target,],'turn_on')
-            print('turn_on')
-            await asyncio.sleep(3)
+            await asyncio.sleep(5)
 
+            print(' => turn_off')
             eng.send_request(dev,[target,],'turn_off')
-            print('turn_off')
-            await asyncio.sleep(3)
+            await asyncio.sleep(5)
 
+            print(' => set_brightness')
             eng.send_request(dev,[target,],'set_brightness',{'brightness':random.randint(0,100)})
-            print('set_brightness')
-            await asyncio.sleep(3)
+            await asyncio.sleep(5)
 
-    tasks = [ asyncio.ensure_future(eng.run()),
-              asyncio.ensure_future(run()), ]
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(asyncio.wait(tasks))
+    eng.on_start(run)
+    eng.on_stop(functools.partial(print,"Bye Bye"))
+    eng.run()
 
 if __name__ == '__main__':
     try:
         main()
     except KeyboardInterrupt:
-        print("Bye ..")
\ No newline at end of file
+        print("Bye ..")

devices/tests/dummy/xaal/dummy/lamp.py

 
-from xaal.lib import Device,Engine,tools
+from xaal.lib import Device,Engine,tools,helpers
 import sys
 
+helpers.setup_console_logger()
+
 def main(addr):
     if addr == None:
         addr = tools.get_random_uuid()
@@ -29,8 +31,8 @@ def main(addr):
         val = int(_brightness)
         if (val <= 100) and (val >=0):
             dimmer.value = val
-            print("Dimming to %d" % val)
-    
+            print("%s Dimming to %d" % (dev,val))
+
     dev.add_method('turn_on',on)
     dev.add_method('turn_off',off)
     dev.add_method('set_brightness',dim)
@@ -40,9 +42,9 @@ def main(addr):
 
     eng = Engine()
     eng.add_device(dev)
+    light.value = True
     eng.run()
 
-
 if __name__ =='__main__':
     try:
         addr = None

devices/tests/dummy/xaal/dummy/lamp_minimal.py

@@ -16,9 +16,9 @@ def setup(engine):
         
     dev.methods['turn_on']  = on 
     dev.methods['turn_off'] = off
-    
+
     engine.add_device(dev)
     return True
 
 if __name__ =='__main__':
-    helpers.run_package('lamp_minimal',setup)
\ No newline at end of file
+    helpers.run_async_package('lamp_minimal',setup)