X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fi2c%2Fpd.py;h=ced58cde5d093278b93f8af7328be135e7482729;hp=2d6e5c2986bdf26d1ca54b0e9cc23641dfc58a2b;hb=d2bdb1303679b97c3de5ce2d2d1f2b62c9828a3a;hpb=d510f7b3d5d03c6fca5b6af4e184dc2f46da9a1a diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py index 2d6e5c2..ced58cd 100644 --- a/decoders/i2c/pd.py +++ b/decoders/i2c/pd.py @@ -63,6 +63,9 @@ proto = { 'DATA WRITE': [9, 'Data write', 'DW'], } +class SamplerateError(Exception): + pass + class Decoder(srd.Decoder): api_version = 2 id = 'i2c' @@ -265,8 +268,8 @@ class Decoder(srd.Decoder): self.bits = [] 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: # Ignore identical samples early on (for performance reasons). @@ -293,8 +296,6 @@ class Decoder(srd.Decoder): elif self.state == 'FIND ACK': if self.is_data_bit(scl, sda): self.get_ack(scl, sda) - else: - raise Exception('Invalid state: %s' % self.state) # Save current SDA/SCL values for the next round. self.oldscl, self.oldsda = scl, sda