Port to the new bindings.

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index 25b7025989023b3dd62a611bae5c34c05ef38229..fcf5eb4f10c2202c778c44f3ff06817f780fee11 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.
 ##
@@ -21,37 +22,42 @@
 
 from multiprocessing import Process, Queue
 from gi.repository import Gtk, GObject
-from sigrok.core import Context, Driver, Device, Session, Packet, Log
-from sigrok.core import lowlevel as ll
+from sigrok.core import *
 
 def init_and_run(queue):
     def datafeed_in(device, packet):
-        if packet.type == Packet.ANALOG:
+        if packet.type == PacketType.ANALOG:
             data = packet.payload.data
             unit, unit_str = packet.payload.unit, ""
-            if unit == ll.SR_UNIT_VOLT:
+            if unit == Unit.VOLT:
                 unit_str = " V"
-            elif unit == ll.SR_UNIT_OHM:
+            elif unit == Unit.OHM:
                 unit_str = " Ohm"
-            elif unit == ll.SR_UNIT_AMPERE:
+            elif unit == Unit.AMPERE:
                 unit_str = " A"
-            mqflags, mqflags_str = packet.payload.unit, ""
-            if mqflags & ll.SR_MQFLAG_AC:
+            mqflags, mqflags_str = packet.payload.mq_flags, ""
+            if QuantityFlag.AC in mqflags:
                 mqflags_str = " AC"
-            elif mqflags & ll.SR_MQFLAG_DC:
+            elif QuantityFlag.DC in mqflags:
                 mqflags_str = " DC"
             for i in range(packet.payload.num_samples):
-                queue.put("%f%s%s" % (data[i], unit_str, mqflags_str))
+                dev = "%s %s" % (device.vendor, device.model)
+                val = "%f%s%s" % (data[0][i], unit_str, mqflags_str)
+                queue.put((dev, val))
 
-    # log = Log()
-    # log.level = Log.SPEW
-    context = Context()
-    driver = context.drivers['voltcraft-vc820']
-    device = driver.scan()[0]
-    device.limit_samples = 1000
-    session = Session(context)
-    session.add_device(device)
-    session.add_callback(datafeed_in)
+    context = Context_create()
+    context.log_level = LogLevel.SPEW
+    drivers_to_use = ['tecpel-dmm-8061-ser']
+    drivers = [context.drivers[d] for d in drivers_to_use]
+    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 = context.create_session()
+    for dev in devices:
+        session.add_device(dev)
+        dev.open()
+    session.add_datafeed_callback(datafeed_in)
     session.start()
     session.run()
     session.stop()
@@ -62,6 +68,7 @@ class SigrokMeter:
         self.builder.add_from_file("sigrok-meter.glade")
         self.builder.connect_signals(self)
         self.value_label = self.builder.get_object("value_label")
+        self.value_label2 = self.builder.get_object("value_label2")
         self.win = self.builder.get_object("mainwindow")
         self.win.show_all()
         self.queue = Queue()
@@ -70,7 +77,8 @@ class SigrokMeter:
     def update_label_if_needed(self):
         try:
             t = self.queue.get_nowait()
-            self.value_label.set_text(t)
+            l = self.value_label if t[0] != "Victor" else self.value_label2
+            l.set_text("%s: %s" % (t[0], t[1]))
         except:
             pass
         GObject.timeout_add(100, self.update_label_if_needed)
@@ -80,17 +88,18 @@ class SigrokMeter:
 
     def on_about(self, action):
         about = self.builder.get_object("aboutdialog")
-        sr_pkg = ll.sr_package_version_string_get()
-        sr_lib = ll.sr_lib_version_string_get()
+        context = Context_create()
+        sr_pkg = context.package_version
+        sr_lib = context.lib_version
         s = "Using libsigrok %s (lib version %s)." % (sr_pkg, sr_lib)
         about.set_comments(s)
         about.run()
         about.hide()
 
 if __name__ == '__main__':
-        s = SigrokMeter()
-        process = Process(target=init_and_run, args=(s.queue,))
-        process.start()
-        Gtk.main()
-        process.terminate()
+    s = SigrokMeter()
+    process = Process(target=init_and_run, args=(s.queue,))
+    process.start()
+    Gtk.main()
+    process.terminate()