X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=df2cbee7818c7d3f4938f76a44af5e44c61e92b1;hb=95d11271b46a46788d497481d03177e883c8554e;hp=bf38b7fb9d0e1d23f9a9b83dd76ba82349ed7a84;hpb=12851357e784b893e24880efc6cd22a0cbcc64ce;p=libsigrokdecode.git diff --git a/decoders/can/pd.py b/decoders/can/pd.py index bf38b7f..df2cbee 100644 --- a/decoders/can/pd.py +++ b/decoders/can/pd.py @@ -20,6 +20,9 @@ import sigrokdecode as srd +class SamplerateError(Exception): + pass + class Decoder(srd.Decoder): api_version = 2 id = 'can' @@ -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) -