X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fi2c%2Fpd.py;h=60e9c452cd711524de5d0561f4d4d86e4d9700d4;hb=03d6d746b742fb21ca22086ba6b72943a845ecc9;hp=dc7c5b549e1c8834a42f8f1699eac82675d43f2f;hpb=8d2a96368a130d8c7d1b7877536cfcf48305f609;p=libsigrokdecode.git diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py index dc7c5b5..60e9c45 100644 --- a/decoders/i2c/pd.py +++ b/decoders/i2c/pd.py @@ -92,6 +92,12 @@ class Decoder(srd.Decoder): ['Data write', 'Data write'], ['Warnings', 'Human-readable warnings'], ] + binary = ( + 'Address read', + 'Address write', + 'Data read', + 'Data write', + ) def __init__(self, **kwargs): self.samplerate = None @@ -115,18 +121,19 @@ class Decoder(srd.Decoder): def start(self): self.out_proto = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) + self.out_binary = self.add(srd.OUTPUT_BINARY) self.out_bitrate = self.register(srd.OUTPUT_META, meta=(int, 'Bitrate', 'Bitrate from Start bit to Stop bit')) - def report(self): - pass - def putx(self, data): self.put(self.startsample, self.samplenum, self.out_ann, data) def putp(self, data): self.put(self.startsample, self.samplenum, self.out_proto, data) + def putb(self, data): + self.put(self.startsample, self.samplenum, self.out_binary, data) + def is_start_condition(self, scl, sda): # START condition (S): SDA = falling, SCL = high if (self.oldsda == 1 and sda == 0) and scl == 1: @@ -181,18 +188,24 @@ class Decoder(srd.Decoder): if self.options['address_format'] == 'shifted': d = d >> 1 + bin_class = -1 if self.state == 'FIND ADDRESS' and self.wr == 1: cmd = 'ADDRESS WRITE' + bin_class = 1 elif self.state == 'FIND ADDRESS' and self.wr == 0: cmd = 'ADDRESS READ' + bin_class = 0 elif self.state == 'FIND DATA' and self.wr == 1: cmd = 'DATA WRITE' + bin_class = 3 elif self.state == 'FIND DATA' and self.wr == 0: cmd = 'DATA READ' + bin_class = 2 self.putp([cmd, d]) self.putx([proto[cmd][0], ['%s: %02X' % (proto[cmd][1], d), '%s: %02X' % (proto[cmd][2], d), '%02X' % d]]) + self.putb((bin_class, bytes([d]))) # Done with this packet. self.startsample = -1