Add missing open_device, hardcode tecpel-dmm-8061-ser for now.

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index 4355ff733171310819da5ee13c23ae8efef429a7..aef1f27aaa2cf225b5f08db758f581bd94a38517 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -22,6 +22,7 @@
 from multiprocessing import Process, Queue
 from gi.repository import Gtk, GObject
 from sigrok.core import *
+from sigrok.core import lowlevel as ll
 
 def init_and_run(queue):
     def datafeed_in(device, packet):
@@ -32,7 +33,7 @@ def init_and_run(queue):
                 unit_str = " V"
             elif unit is Unit.OHM:
                 unit_str = " Ohm"
-            elif unit is unit.AMPERE:
+            elif unit is Unit.AMPERE:
                 unit_str = " A"
             mqflags, mqflags_str = packet.payload.mqflags, ""
             if QuantityFlag.AC in mqflags:
@@ -40,20 +41,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()