Use python 2.

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index 289d25c6dd97d8b1b1b7b190c634b0ecfdd4427d..988412e6abf1d4831a5aa1c24f3718491ae3a3c9 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -1,4 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
+
 ##
 ## This file is part of the sigrok-meter project.
 ##
@@ -41,20 +42,22 @@ def init_and_run(queue):
             elif QuantityFlag.DC in mqflags:
                 mqflags_str = " DC"
             for i in range(packet.payload.num_samples):
-                dev = "%s" % device.vendor
+                dev = "%s %s" % (device.vendor, device.model)
                 val = "%f%s%s" % (data[i], unit_str, mqflags_str)
                 queue.put((dev, val))
 
     # log = Log()
     # log.level = LogLevel.SPEW
     context = Context()
-    drivers_to_use = ['voltcraft-vc820', 'victor-dmm']
+    drivers_to_use = ['tecpel-dmm-8061-ser']
     drivers = [context.drivers[d] for d in drivers_to_use]
-    devices = [d.scan()[0] for d in drivers]
-    for dev in devices:
-        dev.limit_samples = 1000
+    devices = [d.scan(conn="/dev/ttyUSB0")[0] for d in drivers]
+    # devices = [d.scan()[0] for d in drivers]
+    # for dev in devices:
+    #     dev.limit_samples = 1000
     session = Session(context)
     for dev in devices:
+        session.open_device(dev)
         session.add_device(dev)
     session.add_callback(datafeed_in)
     session.start()