X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=e425575433510c3edea2512d0b707404134af4d9;hp=13a4b24ea38ef24f826a5a324a432804fb75a1bb;hb=e28f7aee3b96afeb543e0c3c29e3950ddd61a490;hpb=ef36224880135a05d2fbde8f048ea3fe3f425df9

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 13a4b24..e425575 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'can'
     name = 'CAN'
     longname = 'Controller Area Network'
@@ -29,40 +29,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):
@@ -378,6 +376,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)