X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Faud%2Fpd.py;h=15fce85d675e03593bf9828872a9944d43854a36;hb=e500b376b5cf74f4862688f310b9b8008bfc3eea;hp=6be1f8385270e3284a5bebe8ed0d0dffb2fc3d8e;hpb=e96593c1e2e614d3b08076d4f7318ef388e35a9d;p=libsigrokdecode.git diff --git a/decoders/aud/pd.py b/decoders/aud/pd.py index 6be1f83..15fce85 100644 --- a/decoders/aud/pd.py +++ b/decoders/aud/pd.py @@ -26,7 +26,7 @@ import sigrokdecode as srd class Decoder(srd.Decoder): - api_version = 2 + api_version = 3 id = 'aud' name = 'AUD' longname = 'Advanced User Debugger' @@ -46,13 +46,11 @@ class Decoder(srd.Decoder): ('dest', 'Destination address'), ) - def __init__(self, **kwargs): + def __init__(self): self.ncnt = 0 self.nmax = 0 self.addr = 0 self.lastaddr = 0 - self.samplenum = 0 - self.oldclk = 0 self.ss = 0 def start(self): @@ -61,15 +59,7 @@ class Decoder(srd.Decoder): def putx(self, data): self.put(self.ss, self.samplenum, self.out_ann, data) - def find_clk_edge(self, clk, sync, datapins): - # Ignore sample if there's no edge. - if clk == self.oldclk: - return - self.oldclk = clk - # Ignore falling edges. - if clk == 0: - return - + def handle_clk_edge(self, clk, sync, datapins): # Reconstruct nibble. nib = 0 for i in range(4): @@ -106,9 +96,10 @@ class Decoder(srd.Decoder): self.addr |= nib << (self.ncnt * 4) self.ncnt += 1 - def decode(self, ss, es, data): - for (self.samplenum, pins) in data: + def decode(self): + while True: + pins = self.wait({0: 'r'}) clk = pins[0] sync = pins[1] d = pins[2:] - self.find_clk_edge(clk, sync, d) + self.handle_clk_edge(clk, sync, d)