-#!/usr/bin/python3
+#!/usr/bin/env python
+
##
## This file is part of the sigrok-meter project.
##
## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2014 Jens Steinhauser <jens.steinhauser@gmail.com>
##
## 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
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-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):
- if packet.type is PacketType.ANALOG:
- data = packet.payload.data
- unit, unit_str = packet.payload.unit, ""
- if unit is Unit.VOLT:
- unit_str = " V"
- elif unit is Unit.OHM:
- unit_str = " Ohm"
- elif unit is Unit.AMPERE:
- unit_str = " A"
- mqflags, mqflags_str = packet.payload.mqflags, ""
- if QuantityFlag.AC in mqflags:
- mqflags_str = " AC"
- elif 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)
- queue.put((dev, val))
-
- # log = Log()
- # log.level = LogLevel.SPEW
- context = Context()
- 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)
- for dev in devices:
- session.open_device(dev)
- session.add_device(dev)
- session.add_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):
+import argparse
+import re
+import sigrok.core as sr
+import sys
+import textwrap
+
+default_drivers = [('demo', {'analog_channels': 4})]
+default_loglevel = sr.LogLevel.WARN
+
+def parse_cli():
+ parser = argparse.ArgumentParser(
+ description='Simple sigrok GUI for multimeters and dataloggers.',
+ epilog=textwrap.dedent('''\
+ The DRIVER string is the same as for sigrok-cli(1).
+
+ examples:
+
+ %(prog)s --driver tecpel-dmm-8061-ser:conn=/dev/ttyUSB0
+
+ %(prog)s --driver uni-t-ut61e:conn=1a86.e008
+ '''),
+ formatter_class=argparse.RawDescriptionHelpFormatter)
+
+ parser.add_argument('-d', '--driver',
+ action='append',
+ help='The driver to use')
+ parser.add_argument('-l', '--loglevel',
+ type=int,
+ 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()
+
+ result = {
+ 'drivers': default_drivers,
+ 'loglevel': default_loglevel,
+ 'pyside': args.pyside
+ }
+
+ if args.driver:
+ result['drivers'] = []
+ for d in args.driver:
+ m = re.match('(?P<name>[^:]+)(?P<opts>(:[^:=]+=[^:=]+)*)', d)
+ if not m:
+ sys.exit('error parsing option "{}"'.format(d))
+
+ opts = m.group('opts').split(':')[1:]
+ opts = [tuple(kv.split('=')) for kv in opts]
+ opts = dict(opts)
+
+ result['drivers'].append((m.group('name'), opts))
+
+ if args.loglevel != None:
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]))
+ result['loglevel'] = sr.LogLevel.get(args.loglevel)
except:
- pass
- GObject.timeout_add(100, self.update_label_if_needed)
+ sys.exit('error: invalid log level')
- def on_quit(self, *args):
- Gtk.main_quit(*args)
-
- 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()
- s = "Using libsigrok %s (lib version %s)." % (sr_pkg, sr_lib)
- about.set_comments(s)
- about.run()
- about.hide()
+ return result
if __name__ == '__main__':
- s = SigrokMeter()
- process = Process(target=init_and_run, args=(s.queue,))
- process.start()
- Gtk.main()
- process.terminate()
+ args = parse_cli()
+
+ import qtcompat
+ qtcompat.load_modules(args['pyside'])
+ QtCore = qtcompat.QtCore
+ QtGui = qtcompat.QtGui
+ import mainwindow
+
+ context = sr.Context_create()
+ context.log_level = args['loglevel']
+
+ app = QtGui.QApplication([])
+ s = mainwindow.MainWindow(context, args['drivers'])
+ s.show()
+ sys.exit(app.exec_())
projects / sigrok-meter.git / blobdiff