X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fonewire_link%2Fpd.py;h=51eebe84af9e749de87daa95119b136442f5c9dc;hp=bc44ce9317856caa536a01b8ae59658e6b5724f4;hb=8e11415b6bc83e6a114223a3ece588097b0e50d9;hpb=be465111b552c7c2a2262ac49758a30a8bf1b1d5 diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py index bc44ce9..51eebe8 100644 --- a/decoders/onewire_link/pd.py +++ b/decoders/onewire_link/pd.py @@ -18,8 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -# 1-Wire protocol decoder (link layer) - import sigrokdecode as srd class Decoder(srd.Decoder): @@ -57,12 +55,17 @@ class Decoder(srd.Decoder): ['presence', 'Presence'], ['overdrive', 'Overdrive mode notifications'], ] + annotation_rows = ( + ('bits', 'Bits', (0, 2, 3)), + ('info', 'Info', (4,)), + ('warnings', 'Warnings', (1,)), + ) def putm(self, data): self.put(0, 0, self.out_ann, data) def putpb(self, data): - self.put(self.fall, self.samplenum, self.out_proto, data) + self.put(self.fall, self.samplenum, self.out_python, data) def putb(self, data): self.put(self.fall, self.samplenum, self.out_ann, data) @@ -74,7 +77,7 @@ class Decoder(srd.Decoder): self.put(self.fall, self.rise, self.out_ann, data) def putprs(self, data): - self.put(self.rise, self.samplenum, self.out_proto, data) + self.put(self.rise, self.samplenum, self.out_python, data) def putrs(self, data): self.put(self.rise, self.samplenum, self.out_ann, data) @@ -92,7 +95,7 @@ class Decoder(srd.Decoder): self.rise = 0 def start(self): - self.out_proto = self.register(srd.OUTPUT_PYTHON) + self.out_python = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) def metadata(self, key, value): @@ -173,9 +176,6 @@ class Decoder(srd.Decoder): '(%2.1fus-%2.1fus) should be inside (7.3us, 10.0us).' % (time_min*1000000, time_max*1000000)]]) - def report(self): - pass - def decode(self, ss, es, data): if self.samplerate is None: raise Exception("Cannot decode without samplerate.")