ols: Use new trigger API.

[libsigrok.git] / bindings / python / sigrok / core / classes.py

diff --git a/bindings/python/sigrok/core/classes.py b/bindings/python/sigrok/core/classes.py
index b5a64cfc2e13bf78f6e20b67a6b7037a4b7ff5d8..d4e209f3890ee9c32c2c1e161d108f288ab009b7 100644 (file)
--- a/bindings/python/sigrok/core/classes.py
+++ b/bindings/python/sigrok/core/classes.py
@@ -26,7 +26,7 @@ import itertools
 
 __all__ = ['Error', 'Context', 'Driver', 'Device', 'Session', 'Packet', 'Log',
     'LogLevel', 'PacketType', 'Quantity', 'Unit', 'QuantityFlag', 'ConfigKey',
-    'ProbeType', 'Probe', 'ProbeGroup', 'InputFormat', 'OutputFormat',
+    'ChannelType', 'Channel', 'ChannelGroup', 'InputFormat', 'OutputFormat',
     'InputFile', 'Output']
 
 class Error(Exception):
@@ -173,8 +173,8 @@ class Device(object):
             device = super(Device, cls).__new__(cls)
             device.struct = struct
             device.context = context
-            device._probes = None
-            device._probe_groups = None
+            device._channels = None
+            device._channel_groups = None
             context._devices[address] = device
         return context._devices[address]
 
@@ -191,28 +191,28 @@ class Device(object):
         return self.struct.version
 
     @property
-    def probes(self):
-        if self._probes is None:
-            self._probes = {}
-            probe_list = self.struct.probes
-            while (probe_list):
-                probe_ptr = void_ptr_to_sr_probe_ptr(probe_list.data)
-                self._probes[probe_ptr.name] = Probe(self, probe_ptr)
-                probe_list = probe_list.next
-        return self._probes
-
-    @property
-    def probe_groups(self):
-        if self._probe_groups is None:
-            self._probe_groups = {}
-            probe_group_list = self.struct.probe_groups
-            while (probe_group_list):
-                probe_group_ptr = void_ptr_to_sr_probe_group_ptr(
-                    probe_group_list.data)
-                self._probe_groups[probe_group_ptr.name] = ProbeGroup(self,
-                    probe_group_ptr)
-                probe_group_list = probe_group_list.next
-        return self._probe_groups
+    def channels(self):
+        if self._channels is None:
+            self._channels = {}
+            channel_list = self.struct.channels
+            while (channel_list):
+                channel_ptr = void_ptr_to_sr_channel_ptr(channel_list.data)
+                self._channels[channel_ptr.name] = Channel(self, channel_ptr)
+                channel_list = channel_list.next
+        return self._channels
+
+    @property
+    def channel_groups(self):
+        if self._channel_groups is None:
+            self._channel_groups = {}
+            channel_group_list = self.struct.channel_groups
+            while (channel_group_list):
+                channel_group_ptr = void_ptr_to_sr_channel_group_ptr(
+                    channel_group_list.data)
+                self._channel_groups[channel_group_ptr.name] = ChannelGroup(self,
+                    channel_group_ptr)
+                channel_group_list = channel_group_list.next
+        return self._channel_groups
 
 class HardwareDevice(Device):
 
@@ -244,7 +244,7 @@ class HardwareDevice(Device):
             return
         check(sr_config_set(self.struct, None, key.id, python_to_gvariant(value)))
 
-class Probe(object):
+class Channel(object):
 
     def __init__(self, device, struct):
         self.device = device
@@ -252,7 +252,7 @@ class Probe(object):
 
     @property
     def type(self):
-        return ProbeType(self.struct.type)
+        return ChannelType(self.struct.type)
 
     @property
     def enabled(self):
@@ -262,15 +262,15 @@ class Probe(object):
     def name(self):
         return self.struct.name
 
-class ProbeGroup(object):
+class ChannelGroup(object):
 
     def __init__(self, device, struct):
         self.device = device
         self.struct = struct
-        self._probes = None
+        self._channels = None
 
     def __iter__(self):
-        return iter(self.probes)
+        return iter(self.channels)
 
     def __getattr__(self, name):
         key = config_key(name)
@@ -281,7 +281,7 @@ class ProbeGroup(object):
         except Error as error:
             if error.errno == SR_ERR_NA:
                 raise NotImplementedError(
-                    "Probe group does not implement %s" % name)
+                    "Channel group does not implement %s" % name)
             else:
                 raise AttributeError
         value = gvariant_ptr_ptr_value(data)
@@ -291,7 +291,7 @@ class ProbeGroup(object):
         try:
             key = config_key(name)
         except AttributeError:
-            super(ProbeGroup, self).__setattr__(name, value)
+            super(ChannelGroup, self).__setattr__(name, value)
             return
         check(sr_config_set(self.device.struct, self.struct,
             key.id, python_to_gvariant(value)))
@@ -301,15 +301,15 @@ class ProbeGroup(object):
         return self.struct.name
 
     @property
-    def probes(self):
-        if self._probes is None:
-            self._probes = []
-            probe_list = self.struct.probes
-            while (probe_list):
-                probe_ptr = void_ptr_to_sr_probe_ptr(probe_list.data)
-                self._probes.append(Probe(self, probe_ptr))
-                probe_list = probe_list.next
-        return self._probes
+    def channels(self):
+        if self._channels is None:
+            self._channels = []
+            channel_list = self.struct.channels
+            while (channel_list):
+                channel_ptr = void_ptr_to_sr_channel_ptr(channel_list.data)
+                self._channels.append(Channel(self, channel_ptr))
+                channel_list = channel_list.next
+        return self._channels
 
 class Session(object):
 
@@ -606,7 +606,7 @@ class ConfigKey(EnumValue):
 class DataType(EnumValue):
     pass
 
-class ProbeType(EnumValue):
+class ChannelType(EnumValue):
     pass
 
 for symbol_name in dir(lowlevel):
@@ -618,7 +618,7 @@ for symbol_name in dir(lowlevel):
         ('SR_MQFLAG_', QuantityFlag),
         ('SR_CONF_', ConfigKey),
         ('SR_T_', DataType),
-        ('SR_PROBE_', ProbeType)]:
+        ('SR_CHANNEL_', ChannelType)]:
         if symbol_name.startswith(prefix):
             name = symbol_name[len(prefix):]
             value = getattr(lowlevel, symbol_name)