summaryrefslogtreecommitdiff
path: root/decoders/can
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2014-07-08 21:32:32 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2014-07-09 17:58:37 +0200
commit21cda9512f29947617da45822ab524b1f76f56c1 (patch)
tree1419531d60662eb87bacb9ce53e05374314c6ded /decoders/can
parente28f7aee3b96afeb543e0c3c29e3950ddd61a490 (diff)
downloadlibsigrokdecode-21cda9512f29947617da45822ab524b1f76f56c1.tar.gz
libsigrokdecode-21cda9512f29947617da45822ab524b1f76f56c1.zip
Various PDs: Throw SamplerateError instead of Exception.
Also, use the "if not self.samplerate" form, which catches both the case where self.samplerate is None, as well as the case where it is 0.
Diffstat (limited to 'decoders/can')
-rw-r--r--decoders/can/pd.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index e425575..f80ebc6 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