X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fir_nec%2Fpd.py;h=8c589fa480c8426a1b38fa524135e84c35c65b3e;hb=92b7b49f6964f57a7d6fc4473645c993cfa4ba52;hp=b01af9e77b7160c1fefc526a550e75b428c2c6a2;hpb=bee57ee84753471970f9b65b34e71c54a0558768;p=libsigrokdecode.git diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py index b01af9e..8c589fa 100644 --- a/decoders/ir_nec/pd.py +++ b/decoders/ir_nec/pd.py @@ -21,8 +21,11 @@ import sigrokdecode as srd from .lists import * +class SamplerateError(Exception): + pass + class Decoder(srd.Decoder): - api_version = 1 + api_version = 2 id = 'ir_nec' name = 'IR NEC' longname = 'IR NEC' @@ -30,7 +33,7 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['logic'] outputs = ['ir_nec'] - probes = ( + channels = ( {'id': 'ir', 'name': 'IR', 'desc': 'Data line'}, ) options = ( @@ -96,14 +99,13 @@ class Decoder(srd.Decoder): [11, ['%s: %s' % (dev, btn[0]), '%s: %s' % (dev, btn[1]), '%s' % btn[1]]]) - def __init__(self, **kwargs): + def __init__(self): self.state = 'IDLE' self.ss_bit = self.ss_start = self.ss_other_edge = self.ss_remote = 0 self.data = self.count = self.active = self.old_ir = None self.addr = self.cmd = None def start(self): - # self.out_python = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) self.active = 0 if self.options['polarity'] == 'active-low' else 1 self.old_ir = 1 if self.active == 0 else 0 @@ -149,8 +151,8 @@ class Decoder(srd.Decoder): return ret == 0 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: self.ir = pins[0] @@ -200,8 +202,5 @@ class Decoder(srd.Decoder): self.putremote() self.ss_bit = self.ss_start = self.samplenum self.state = 'IDLE' - else: - raise Exception('Invalid state: %s' % self.state) self.old_ir = self.ir -