X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=df2cbee7818c7d3f4938f76a44af5e44c61e92b1;hb=92adde514e1be3015ebd44da813fb6bec0001370;hp=0687ea5192d35ed4b7431791e89d027eb2176e38;hpb=c761524941fcb2237ceb65082e504e5e48e62a05;p=libsigrokdecode.git diff --git a/decoders/can/pd.py b/decoders/can/pd.py index 0687ea5..df2cbee 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' @@ -358,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 @@ -376,6 +379,3 @@ 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) -