X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=ee32e7ab51b4a0006288323d661581a3ba0d6d80;hp=61b0a744cacb217f56a3ded29e95f6db9e49c5f9;hb=0169f19c53e195df2f96c4df731ad3214c59e20a;hpb=74c9bb3caa945409b3e8a68920f910e8363732fb

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 61b0a74..ee32e7a 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -60,18 +60,18 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
+        self.samplerate = None
         self.reset_variables()
 
-    def start(self, metadata):
-        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'can')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'can')
+    def start(self):
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
-        self.samplerate = metadata['samplerate']
-        self.bit_width = float(self.samplerate) / float(self.options['bitrate'])
-        self.bitpos = (self.bit_width / 100.0) * self.options['sample_point']
-
-    def report(self):
-        pass
+    def metadata(self, key, value):
+        if key == srd.SRD_CONF_SAMPLERATE:
+            self.samplerate = value
+            self.bit_width = float(self.samplerate) / float(self.options['bitrate'])
+            self.bitpos = (self.bit_width / 100.0) * self.options['sample_point']
 
     # Generic helper for CAN bit annotations.
     def putg(self, ss, es, data):
@@ -362,6 +362,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.")
         for (self.samplenum, pins) in data:
 
             (can_rx,) = pins