Added more test

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

devices/protocols/ZWave/xaal/zwave/test_gw.py

@@ -10,9 +10,11 @@ from pydispatch import dispatcher
 import sys
 import time
 
+from cmdclass import COMMAND_CLASS
+import auto
 
-device="/dev/ttyACM0"
-#device="/dev/ttyUSB0"
+#device="/dev/ttyACM0"
+device="/dev/ttyUSB0"
 network = None
 
 def connected():
@@ -33,12 +35,22 @@ def value_update(network, node, value):
 
 def dump_device(node_id):
     zdev = network.nodes[node_id]
-    print(zdev.product_name)
+    print("***** %s" % zdev.product_name)
+    print("***** %s:%s:%s" % (zdev.manufacturer_id,zdev.product_id,zdev.product_type))
     for k in zdev.values:
-        value = zdev.values[k]
-        print("%s %s" % (value.label,value.data))
+        val = zdev.values[k]
+        klass = COMMAND_CLASS(val.command_class)
+        print("%s/%s/%s [%s] %s%s %s" % (k,val.instance,val.index,val.label,val.data,val.units,klass))
 
 
+def get_value(node_id,cmd_class,instance=1,idx=0):
+    zdev = network.nodes[node_id]
+    for k in zdev.values:
+        val = zdev.values[k]
+        if ((cmd_class == COMMAND_CLASS(val.command_class)) and (val.index==idx) and (val.instance == instance)):
+            return val
+    return None
+
 
 options = ZWaveOption(device)
 options.set_console_output(False)
@@ -51,18 +63,21 @@ dispatcher.connect(connected, ZWaveNetwork.SIGNAL_NETWORK_STARTED)
 dispatcher.connect(disconnected, ZWaveNetwork.SIGNAL_NETWORK_FAILED)
 dispatcher.connect(ready, ZWaveNetwork.SIGNAL_NETWORK_READY)
 dispatcher.connect(node_update, ZWaveNetwork.SIGNAL_NODE)
-dispatcher.connect(value_update, ZWaveNetwork.SIGNAL_VALUE)
+
 
 
 for i in range(0,90):
-    if network.state>=network.STATE_READY:
+    if network.is_ready:
         print("***** Network is ready")
+        dispatcher.connect(value_update, ZWaveNetwork.SIGNAL_VALUE)
         break
     else:
         sys.stdout.write(".")
         sys.stdout.flush()
         time.sleep(1.0)
 
+#dump_device(2)
 import pdb;pdb.set_trace()
 
 
+