From 94d43b37bd34263f5ed9f7135aac5fe7413c7f07 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 10 Jan 2012 20:44:22 +0100 Subject: srd: Finish consistency rename to ANN/PROTO. --- decoders/ddc.py | 2 +- decoders/i2c.py | 4 ++-- decoders/mx25lxx05d.py | 4 ++-- decoders/nunchuk.py | 4 ++-- decoders/pan1321.py | 4 ++-- decoders/spi.py | 4 ++-- decoders/srd_usb.py | 4 ++-- decoders/transitioncounter.py | 4 ++-- decoders/uart.py | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'decoders') diff --git a/decoders/ddc.py b/decoders/ddc.py index c4978c9..58c74a4 100644 --- a/decoders/ddc.py +++ b/decoders/ddc.py @@ -45,7 +45,7 @@ class Decoder(sigrokdecode.Decoder): self.state = None def start(self, metadata): - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'ddc') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'ddc') def decode(self, start_sample, end_sample, i2c_data): try: diff --git a/decoders/i2c.py b/decoders/i2c.py index 5e63fdf..60558c5 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -162,8 +162,8 @@ class Decoder(sigrokdecode.Decoder): self.oldsda = None def start(self, metadata): - self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'i2c') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'i2c') + self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'i2c') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'i2c') def report(self): pass diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py index 7ffbfc1..bd1ce16 100644 --- a/decoders/mx25lxx05d.py +++ b/decoders/mx25lxx05d.py @@ -179,8 +179,8 @@ class Decoder(sigrokdecode.Decoder): self.out = [] def start(self, metadata): - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'mx25lxx05d') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'mx25lxx05d') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'mx25lxx05d') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'mx25lxx05d') def report(self): pass diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py index 111768b..cd2c064 100644 --- a/decoders/nunchuk.py +++ b/decoders/nunchuk.py @@ -87,8 +87,8 @@ class Decoder(sigrokdecode.Decoder): self.databytecount = 0 def start(self, metadata): - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'nunchuk') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'nunchuk') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'nunchuk') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'nunchuk') def report(self): pass diff --git a/decoders/pan1321.py b/decoders/pan1321.py index edd4162..3c09310 100644 --- a/decoders/pan1321.py +++ b/decoders/pan1321.py @@ -56,8 +56,8 @@ class Decoder(sigrokdecode.Decoder): self.cmd = '' def start(self, metadata): - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'pan1321') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'pan1321') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'pan1321') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'pan1321') def report(self): pass diff --git a/decoders/spi.py b/decoders/spi.py index 95302ce..a866767 100644 --- a/decoders/spi.py +++ b/decoders/spi.py @@ -46,8 +46,8 @@ class Decoder(sigrokdecode.Decoder): self.out_ann = None def start(self, metadata): - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'spi') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'spi') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'spi') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'spi') def report(self): return 'SPI: %d bytes received' % self.bytesreceived diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py index c68e82b..c97ef73 100644 --- a/decoders/srd_usb.py +++ b/decoders/srd_usb.py @@ -123,8 +123,8 @@ class Decoder(sigrokdecode.Decoder): def start(self, metadata): self.rate = metadata['samplerate'] - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'usb') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'usb') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'usb') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'usb') if self.rate < 48000000: raise Exception("Sample rate not sufficient for USB decoding") # Initialise decoder state. diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py index 7ad16fd..9d437d1 100644 --- a/decoders/transitioncounter.py +++ b/decoders/transitioncounter.py @@ -42,8 +42,8 @@ class Decoder(sigrokdecode.Decoder): self.lastsample = None def start(self, metadata): - # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'transitioncounter') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'transitioncounter') + # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'transitioncounter') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'transitioncounter') def report(self): pass diff --git a/decoders/uart.py b/decoders/uart.py index 896cd0a..1c204dc 100644 --- a/decoders/uart.py +++ b/decoders/uart.py @@ -258,8 +258,8 @@ class Decoder(sigrokdecode.Decoder): def start(self, metadata): self.samplerate = metadata['samplerate'] - self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'uart') - self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'uart') + self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'uart') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'uart') # TODO ### self.baudrate = metadata['baudrate'] -- cgit v1.2.3-70-g09d2