X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-meter;h=dc34745445d63f9efc7642726154f73d2d767b65;hb=8fa010184c5a1fa49f0ed483ff0e8ee65f886dc7;hp=9fc2c2b6fdec7ad80f9bdf38af7a15c524bbddd3;hpb=782f592684ead79ffbc50880a066affdf9995b7a;p=sigrok-meter.git diff --git a/sigrok-meter b/sigrok-meter index 9fc2c2b..dc34745 100755 --- a/sigrok-meter +++ b/sigrok-meter @@ -1,9 +1,9 @@ #!/usr/bin/env python - ## ## This file is part of the sigrok-meter project. ## ## Copyright (C) 2013 Uwe Hermann +## Copyright (C) 2014 Jens Steinhauser ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -21,103 +21,89 @@ ## import argparse -from multiprocessing import Process, Queue -from gi.repository import Gtk, GObject import sigrok.core as sr import sys +import textwrap -default_loglevel = sr.LogLevel.WARN - -def init_and_run(queue, loglevel): - def datafeed_in(device, packet): - if packet.type == sr.PacketType.ANALOG: - data = packet.payload.data - unit, unit_str = packet.payload.unit, "" - if unit == sr.Unit.VOLT: - unit_str = " V" - elif unit == sr.Unit.OHM: - unit_str = " Ohm" - elif unit == sr.Unit.AMPERE: - unit_str = " A" - mqflags, mqflags_str = packet.payload.mq_flags, "" - if sr.QuantityFlag.AC in mqflags: - mqflags_str = " AC" - 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[0][i], unit_str, mqflags_str) - queue.put((dev, val)) - - 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 = 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() - -class SigrokMeter: - def __init__(self): - self.builder = Gtk.Builder() - 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() - GObject.timeout_add(100, self.update_label_if_needed) - - def update_label_if_needed(self): - try: - t = self.queue.get_nowait() - 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) - - def on_quit(self, *args): - Gtk.main_quit(*args) - - def on_about(self, action): - about = self.builder.get_object("aboutdialog") - 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() +default_drivers = [('demo:analog_channels=4', 'samplerate=4')] +default_loglevel = 2 -if __name__ == '__main__': +def parse_cli(): parser = argparse.ArgumentParser( - description='Simple sigrok GUI for multimeters and dataloggers.') + description='Simple sigrok GUI for multimeters and dataloggers.', + epilog=textwrap.dedent('''\ + The DRIVER string is the same as for sigrok-cli(1). Multiple + DRIVER and CONFIG items can be supplied. The nth CONFIG is applied + to the nth DRIVER. If there are more drivers than configs, the + remaining drivers use the default configuration. + + Examples: + + %(prog)s --driver tecpel-dmm-8061-ser:conn=/dev/ttyUSB0 + + %(prog)s --driver uni-t-ut61e:conn=1a86.e008 + + %(prog)s --driver demo:analog_channels=1 \\ + --config samplerate=10 + + %(prog)s --driver voltcraft-k204:conn=/dev/ttyUSB0 \\ + --driver uni-t-ut61d:conn=1a86.e008 \\ + --driver uni-t-ut61e-ser:conn=/dev/ttyUSB1 + '''), + formatter_class=argparse.RawDescriptionHelpFormatter) + + parser.add_argument('-d', '--driver', + action='append', + default=[], + help='The driver to use') + parser.add_argument('-c', '--config', + action='append', + default=[], + help='Specify device configuration options') parser.add_argument('-l', '--loglevel', type=int, + default=default_loglevel, help='Set loglevel (5 is most verbose)') + parser.add_argument('--pyside', + action='store_true', + default=False, + help='Force use of PySide (default is to use PyQt4)') 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') + if len(args.config) > len(args.driver): + sys.exit('Error: More configurations than drivers given.') + + # Merge drivers and configurations into a list of tuples. + setattr(args, 'drivers', []) + if not args.driver: + args.drivers = default_drivers + sys.stderr.write('No driver given, using demo driver.\n') + if args.driver: + args.config.extend([''] * (len(args.driver) - len(args.config))) + args.drivers = zip(args.driver, args.config) + del args.driver + del args.config + + return args + +if __name__ == '__main__': + args = parse_cli() + + import qtcompat + qtcompat.load_modules(args.pyside) + QtCore = qtcompat.QtCore + QtGui = qtcompat.QtGui + import mainwindow + + context = sr.Context_create() + try: + loglevel = sr.LogLevel.get(args.loglevel) + context.log_level = loglevel + except: + sys.exit('Error: invalid log level.') - s = SigrokMeter() - process = Process(target=init_and_run, args=(s.queue, loglevel)) - process.start() - Gtk.main() - process.terminate() + app = QtGui.QApplication([]) + s = mainwindow.MainWindow(context, args.drivers) + s.show() + sys.exit(app.exec_())