All PDs: Drop unneeded exceptions.

[libsigrokdecode.git] / decoders / can / pd.py

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 51b7a72ce452326f09bcf3024cc494c9f2cf14d4..e425575433510c3edea2512d0b707404134af4d9 100644 (file)
--- 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,12 +29,12 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['can']
-    probes = (
+    channels = (
         {'id': 'can_rx', 'name': 'CAN RX', 'desc': 'CAN bus line'},
     )
     options = (
-        {'id': 'bitrate', 'desc': 'Bitrate', 'default': 1000000}, # 1Mbit/s
-        {'id': 'sample_point', 'desc': 'Sample point', 'default': 70.0}, # 70%
+        {'id': 'bitrate', 'desc': 'Bitrate (bits/s)', 'default': 1000000},
+        {'id': 'sample_point', 'desc': 'Sample point (%)', 'default': 70.0},
     )
     annotations = (
         ('data', 'CAN payload data'),
@@ -61,7 +61,6 @@ class Decoder(srd.Decoder):
         self.reset_variables()
 
     def start(self):
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
@@ -377,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)