## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
+import argparse
from multiprocessing import Process, Queue
from gi.repository import Gtk, GObject
-from sigrok.core import *
-from sigrok.core import lowlevel as ll
+import sigrok.core as sr
+import sys
-def init_and_run(queue):
+default_loglevel = sr.LogLevel.WARN
+
+def init_and_run(queue, loglevel):
def datafeed_in(device, packet):
- if packet.type is PacketType.ANALOG:
+ if packet.type == sr.PacketType.ANALOG:
data = packet.payload.data
unit, unit_str = packet.payload.unit, ""
- if unit is Unit.VOLT:
+ if unit == sr.Unit.VOLT:
unit_str = " V"
- elif unit is Unit.OHM:
+ elif unit == sr.Unit.OHM:
unit_str = " Ohm"
- elif unit is Unit.AMPERE:
+ elif unit == sr.Unit.AMPERE:
unit_str = " A"
- mqflags, mqflags_str = packet.payload.mqflags, ""
- if QuantityFlag.AC in mqflags:
+ mqflags, mqflags_str = packet.payload.mq_flags, ""
+ if sr.QuantityFlag.AC in mqflags:
mqflags_str = " AC"
- elif QuantityFlag.DC in mqflags:
+ elif sr.QuantityFlag.DC in mqflags:
mqflags_str = " DC"
for i in range(packet.payload.num_samples):
dev = "%s %s" % (device.vendor, device.model)
- val = "%f%s%s" % (data[i], unit_str, mqflags_str)
+ val = "%f%s%s" % (data[0][i], unit_str, mqflags_str)
queue.put((dev, val))
- # log = Log()
- # log.level = LogLevel.SPEW
- context = Context()
+ context = sr.Context_create()
+ context.log_level = loglevel
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 = Session(context)
+ session = context.create_session()
for dev in devices:
- session.open_device(dev)
session.add_device(dev)
- session.add_callback(datafeed_in)
+ dev.open()
+ session.add_datafeed_callback(datafeed_in)
session.start()
session.run()
session.stop()
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 = sr.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__':
+ parser = argparse.ArgumentParser(
+ description='Simple sigrok GUI for multimeters and dataloggers.')
+ parser.add_argument('-l', '--loglevel',
+ type=int,
+ help='Set loglevel (5 is most verbose)')
+ args = parser.parse_args()
+
+ loglevel = default_loglevel
+ if args.loglevel != None:
+ try:
+ loglevel = sr.LogLevel.get(args.loglevel)
+ except:
+ sys.exit('error: invalid log level')
+
s = SigrokMeter()
- process = Process(target=init_and_run, args=(s.queue,))
+ process = Process(target=init_and_run, args=(s.queue, loglevel))
process.start()
Gtk.main()
process.terminate()