##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
##
## Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
##
import itertools
__all__ = ['Error', 'Context', 'Driver', 'Device', 'Session', 'Packet', 'Log',
- 'LogLevel', 'PacketType', 'Quantity', 'Unit', 'QuantityFlag']
+ 'LogLevel', 'PacketType', 'Quantity', 'Unit', 'QuantityFlag', 'ConfigKey']
class Error(Exception):
if result != SR_OK:
raise Error(result)
-def config_key(name):
- if not name.lower() == name:
- raise AttributeError
- key_name = "SR_CONF_" + name.upper()
- return getattr(lowlevel, key_name)
-
def gvariant_to_python(value):
type_string = g_variant_get_type_string(value)
if type_string == 't':
return g_variant_new_string(value)
if isinstance(value, Fraction):
array = new_gvariant_ptr_array(2)
- gvariant_ptr_array_setitem(array, 0, value.numerator)
- gvariant_ptr_array_setitem(array, 1, value.denominator)
+ gvariant_ptr_array_setitem(array, 0,
+ g_variant_new_uint64(value.numerator))
+ gvariant_ptr_array_setitem(array, 1,
+ g_variant_new_uint64(value.denominator))
result = g_variant_new_tuple(array, 2)
delete_gvariant_ptr_array(array)
return result
def name(self):
return self.struct.name
- def scan(self):
+ def scan(self, **kwargs):
if not self._initialized:
check(sr_driver_init(self.context.struct, self.struct))
self._initialized = True
- devices = []
- device_list = sr_driver_scan(self.struct, None)
- device_list_item = device_list
- while device_list_item:
- ptr = device_list_item.data
- device_ptr = gpointer_to_sr_dev_inst_ptr(ptr)
- devices.append(Device(self, device_ptr))
- device_list_item = device_list_item.next
+ options = []
+ for name, value in kwargs.items():
+ key = getattr(ConfigKey, name.upper())
+ src = sr_config()
+ src.key = key.id
+ src.data = python_to_gvariant(value)
+ options.append(src.this)
+ option_list = python_to_gslist(options)
+ device_list = sr_driver_scan(self.struct, option_list)
+ g_slist_free(option_list)
+ devices = [Device(self, gpointer_to_sr_dev_inst_ptr(ptr))
+ for ptr in gslist_to_python(device_list)]
g_slist_free(device_list)
return devices
self.struct = struct
def __getattr__(self, name):
- key = config_key(name)
+ key = getattr(ConfigKey, name.upper())
data = new_gvariant_ptr_ptr()
try:
- check(sr_config_get(self.driver.struct, key, data, self.struct))
+ check(sr_config_get(self.driver.struct,
+ key.id, data, self.struct))
except Error as error:
if error.errno == SR_ERR_NA:
raise NotImplementedError(
def __setattr__(self, name, value):
try:
- key = config_key(name)
+ key = getattr(ConfigKey, name.upper())
except AttributeError:
super(Device, self).__setattr__(name, value)
return
- check(sr_config_set(self.struct, key, python_to_gvariant(value)))
+ check(sr_config_set(self.struct,
+ key.id, python_to_gvariant(value)))
@property
def vendor(self):
def add_device(self, device):
check(sr_session_dev_add(device.struct))
+ def open_device(self, device):
+ check(sr_dev_open(device.struct))
+
def add_callback(self, callback):
wrapper = partial(callback_wrapper, self, callback)
check(sr_session_datafeed_python_callback_add(wrapper))
mask = new_mask
return result
+class ConfigKey(EnumValue):
+ pass
+
for symbol_name in dir(lowlevel):
for prefix, cls in [
('SR_LOG_', LogLevel),
('SR_DF_', PacketType),
('SR_MQ_', Quantity),
('SR_UNIT_', Unit),
- ('SR_MQFLAG_', QuantityFlag)]:
+ ('SR_MQFLAG_', QuantityFlag),
+ ('SR_CONF_', ConfigKey)]:
if symbol_name.startswith(prefix):
name = symbol_name[len(prefix):]
value = getattr(lowlevel, symbol_name)