X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=f80ebc6da33fa57f640b7185a43e965781e4f9fe;hp=0234e3315fd2eeef7a8a9db7bcdb7af3ed8eb572;hb=21cda9512f29947617da45822ab524b1f76f56c1;hpb=9f2f42c064e8a7100cee13460a7a3638f468f56a

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 0234e33..f80ebc6 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -20,8 +20,11 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'can'
     name = 'CAN'
     longname = 'Controller Area Network'
@@ -29,40 +32,38 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['can']
-    probes = [
+    channels = (
         {'id': 'can_rx', 'name': 'CAN RX', 'desc': 'CAN bus line'},
-    ]
-    optional_probes = []
-    options = {
-        'bitrate': ['Bitrate', 1000000], # 1Mbit/s
-        'sample_point': ['Sample point', 70], # 70%
-    }
-    annotations = [
-        ['data', 'CAN payload data'],
-        ['sof', 'Start of frame'],
-        ['eof', 'End of frame'],
-        ['id', 'Identifier'],
-        ['ext-id', 'Extended identifier'],
-        ['full-id', 'Full identifier'],
-        ['ide', 'Identifier extension bit'],
-        ['reserved-bit', 'Reserved bit 0 and 1'],
-        ['rtr', 'Remote transmission request'],
-        ['srr', 'Substitute remote request'],
-        ['dlc', 'Data length count'],
-        ['crc-sequence', 'CRC sequence'],
-        ['crc-delimiter', 'CRC delimiter'],
-        ['ack-slot', 'ACK slot'],
-        ['ack-delimiter', 'ACK delimiter'],
-        ['stuff-bit', 'Stuff bit'],
-        ['warnings', 'Human-readable warnings'],
-    ]
+    )
+    options = (
+        {'id': 'bitrate', 'desc': 'Bitrate (bits/s)', 'default': 1000000},
+        {'id': 'sample_point', 'desc': 'Sample point (%)', 'default': 70.0},
+    )
+    annotations = (
+        ('data', 'CAN payload data'),
+        ('sof', 'Start of frame'),
+        ('eof', 'End of frame'),
+        ('id', 'Identifier'),
+        ('ext-id', 'Extended identifier'),
+        ('full-id', 'Full identifier'),
+        ('ide', 'Identifier extension bit'),
+        ('reserved-bit', 'Reserved bit 0 and 1'),
+        ('rtr', 'Remote transmission request'),
+        ('srr', 'Substitute remote request'),
+        ('dlc', 'Data length count'),
+        ('crc-sequence', 'CRC sequence'),
+        ('crc-delimiter', 'CRC delimiter'),
+        ('ack-slot', 'ACK slot'),
+        ('ack-delimiter', 'ACK delimiter'),
+        ('stuff-bit', 'Stuff bit'),
+        ('warnings', 'Human-readable warnings'),
+    )
 
     def __init__(self, **kwargs):
         self.samplerate = None
         self.reset_variables()
 
     def start(self):
-        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
@@ -360,8 +361,8 @@ class Decoder(srd.Decoder):
         self.curbit += 1
 
     def decode(self, ss, es, data):
-        if self.samplerate is None:
-            raise Exception("Cannot decode without samplerate.")
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
         for (self.samplenum, pins) in data:
 
             (can_rx,) = pins
@@ -378,6 +379,4 @@ class Decoder(srd.Decoder):
                 if not self.reached_bit(self.curbit):
                     continue
                 self.handle_bit(can_rx)
-            else:
-                raise Exception("Invalid state: %s" % self.state)