From: Uwe Hermann Date: Wed, 23 Dec 2015 19:01:48 +0000 (+0100) Subject: Use self.out_binary naming consistently across all PDs. X-Git-Tag: libsigrokdecode-0.4.0~7 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;ds=inline;h=2f37032807e19bc93b7f3223e1568db46318790c;p=libsigrokdecode.git Use self.out_binary naming consistently across all PDs. --- diff --git a/decoders/eeprom24xx/pd.py b/decoders/eeprom24xx/pd.py index 928a1f7..386431e 100644 --- a/decoders/eeprom24xx/pd.py +++ b/decoders/eeprom24xx/pd.py @@ -78,7 +78,7 @@ class Decoder(srd.Decoder): def start(self): self.out_ann = self.register(srd.OUTPUT_ANN) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.chip = chips[self.options['chip']] self.addr_counter = self.options['addr_counter'] @@ -86,7 +86,7 @@ class Decoder(srd.Decoder): self.put(self.ss_block, self.es_block, self.out_ann, data) def putbin(self, data): - self.put(self.ss_block, self.es_block, self.out_bin, data) + self.put(self.ss_block, self.es_block, self.out_binary, data) def putbits(self, bit1, bit2, bits, data): self.put(bits[bit1][1], bits[bit2][2], self.out_ann, data) diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py index eeeea20..6b94c10 100644 --- a/decoders/i2s/pd.py +++ b/decoders/i2s/pd.py @@ -73,7 +73,7 @@ class Decoder(srd.Decoder): def start(self): self.out_python = self.register(srd.OUTPUT_PYTHON) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_ann = self.register(srd.OUTPUT_ANN) def metadata(self, key, value): @@ -84,7 +84,7 @@ class Decoder(srd.Decoder): self.put(self.ss_block, self.samplenum, self.out_python, data) def putbin(self, data): - self.put(self.ss_block, self.samplenum, self.out_bin, data) + self.put(self.ss_block, self.samplenum, self.out_binary, data) def putb(self, data): self.put(self.ss_block, self.samplenum, self.out_ann, data) @@ -154,7 +154,7 @@ class Decoder(srd.Decoder): if self.ss_block is not None: if not self.wrote_wav_header: - self.put(0, 0, self.out_bin, [0, self.wav_header()]) + self.put(0, 0, self.out_binary, [0, self.wav_header()]) self.wrote_wav_header = True self.samplesreceived += 1 diff --git a/decoders/jitter/pd.py b/decoders/jitter/pd.py index d40c643..ba1bffa 100644 --- a/decoders/jitter/pd.py +++ b/decoders/jitter/pd.py @@ -77,7 +77,7 @@ class Decoder(srd.Decoder): self.clk_edge = edge_detector[self.options['clk_polarity']] self.sig_edge = edge_detector[self.options['sig_polarity']] self.out_ann = self.register(srd.OUTPUT_ANN) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_clk_missed = self.register(srd.OUTPUT_META, meta=(int, 'Clock missed', 'Clock transition missed')) self.out_sig_missed = self.register(srd.OUTPUT_META, @@ -111,7 +111,7 @@ class Decoder(srd.Decoder): return # Format the delta to an ASCII float value terminated by a newline. x = str(delta) + '\n' - self.put(self.clk_start, self.sig_start, self.out_bin, + self.put(self.clk_start, self.sig_start, self.out_binary, [0, x.encode('UTF-8')]) # Helper function for missed clock and signal annotations. diff --git a/decoders/pwm/pd.py b/decoders/pwm/pd.py index 7b10d97..7bf21f4 100644 --- a/decoders/pwm/pd.py +++ b/decoders/pwm/pd.py @@ -66,7 +66,7 @@ class Decoder(srd.Decoder): def start(self): self.startedge = 0 if self.options['polarity'] == 'active-low' else 1 self.out_ann = self.register(srd.OUTPUT_ANN) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_average = \ self.register(srd.OUTPUT_META, meta=(float, 'Average', 'PWM base (cycle) frequency')) @@ -92,7 +92,7 @@ class Decoder(srd.Decoder): self.put(self.ss, self.es, self.out_ann, [1, [period_s]]) def putb(self, data): - self.put(self.num_cycles, self.num_cycles, self.out_bin, data) + self.put(self.num_cycles, self.num_cycles, self.out_binary, data) def decode(self, ss, es, data): diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py index 864bca6..fc8c7d0 100644 --- a/decoders/spi/pd.py +++ b/decoders/spi/pd.py @@ -149,7 +149,7 @@ class Decoder(srd.Decoder): def start(self): self.out_python = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_bitrate = self.register(srd.OUTPUT_META, meta=(int, 'Bitrate', 'Bitrate during transfers')) @@ -165,10 +165,10 @@ class Decoder(srd.Decoder): if self.have_miso: ss, es = self.misobits[-1][1], self.misobits[0][2] - self.put(ss, es, self.out_bin, [0, bytes([so])]) + self.put(ss, es, self.out_binary, [0, bytes([so])]) if self.have_mosi: ss, es = self.mosibits[-1][1], self.mosibits[0][2] - self.put(ss, es, self.out_bin, [1, bytes([si])]) + self.put(ss, es, self.out_binary, [1, bytes([si])]) self.put(ss, es, self.out_python, ['BITS', si_bits, so_bits]) self.put(ss, es, self.out_python, ['DATA', si, so]) diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py index 4c37c34..d42a5d4 100644 --- a/decoders/uart/pd.py +++ b/decoders/uart/pd.py @@ -157,7 +157,7 @@ class Decoder(srd.Decoder): def putbin(self, rxtx, data): s, halfbit = self.startsample[rxtx], self.bit_width / 2.0 - self.put(s - floor(halfbit), self.samplenum + ceil(halfbit), self.out_bin, data) + self.put(s - floor(halfbit), self.samplenum + ceil(halfbit), self.out_binary, data) def __init__(self, **kwargs): self.samplerate = None @@ -176,7 +176,7 @@ class Decoder(srd.Decoder): def start(self): self.out_python = self.register(srd.OUTPUT_PYTHON) - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_ann = self.register(srd.OUTPUT_ANN) def metadata(self, key, value): diff --git a/decoders/usb_request/pd.py b/decoders/usb_request/pd.py index fa2e674..79539c6 100644 --- a/decoders/usb_request/pd.py +++ b/decoders/usb_request/pd.py @@ -152,7 +152,7 @@ class Decoder(srd.Decoder): self.put(ss, es, self.out_ann, data) def putb(self, ts, data): - self.put(ts, ts, self.out_bin, data) + self.put(ts, ts, self.out_binary, data) def pcap_global_header(self): # See https://wiki.wireshark.org/Development/LibpcapFileFormat. @@ -173,7 +173,7 @@ class Decoder(srd.Decoder): self.secs_per_sample = float(1) / float(self.samplerate) def start(self): - self.out_bin = self.register(srd.OUTPUT_BINARY) + self.out_binary = self.register(srd.OUTPUT_BINARY) self.out_ann = self.register(srd.OUTPUT_ANN) def handle_transfer(self): @@ -242,7 +242,7 @@ class Decoder(srd.Decoder): def write_pcap_header(self): if not self.wrote_pcap_header: - self.put(0, 0, self.out_bin, [0, self.pcap_global_header()]) + self.put(0, 0, self.out_binary, [0, self.pcap_global_header()]) self.wrote_pcap_header = True def request_summary(self, request):