s/out_proto/out_python/.

The output type is now called OUTPUT_PYTHON, adapt all PDs to that.

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index a0daf0bb73d25c1bac9765435ac17d7befb6a502..be8ee29fee464054b3e3ceddd61a11e579fee8e6 100644 (file)
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -49,7 +49,7 @@ class Decoder(srd.Decoder):
         self.xx, self.yy, self.zz, self.mm = 0, 0, 0, 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 putx(self, data):

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 0234e3315fd2eeef7a8a9db7bcdb7af3ed8eb572..c394cf1faa84bb77ab1957bb05ba6c4444e69426 100644 (file)
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -62,7 +62,7 @@ class Decoder(srd.Decoder):
         self.reset_variables()
 
     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):

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 4c76eeb1444fab2502af5ab79acdb7491cd30857..e8d1443ec798dbbe525594a5d038f5e3c92e56f3 100644 (file)
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -74,7 +74,7 @@ class Decoder(srd.Decoder):
         self.dcf77_bitnumber_is_known = 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):

diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index 0ab312995dcbdb6a25d62e43af04625fe82cd6eb..3249b31427f1b421037719680dc39bd3e0a87b9b 100644 (file)
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -49,7 +49,7 @@ class Decoder(srd.Decoder):
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']
-        # 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 decode(self, ss, es, data):

diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index a959ecac6e66ef7d0cbddc1751f44755d1c309fb..4d77920842e319de98593f2f1eab55532aec608b 100644 (file)
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -26,7 +26,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 I²C packet:
 [<cmd>, <data>]
@@ -117,7 +117,7 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     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)
         self.out_binary = self.register(srd.OUTPUT_BINARY)
         self.out_bitrate = self.register(srd.OUTPUT_META,
@@ -127,7 +127,7 @@ class Decoder(srd.Decoder):
         self.put(self.startsample, self.samplenum, self.out_ann, data)
 
     def putp(self, data):
-        self.put(self.startsample, self.samplenum, self.out_proto, data)
+        self.put(self.startsample, self.samplenum, self.out_python, data)
 
     def putb(self, data):
         self.put(self.startsample, self.samplenum, self.out_binary, data)

diff --git a/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
index 23c42532240490be6c48a2df0ec7f53f5c344bad..12ebb88447097903d69b7dab6ad03b6634e125aa 100644 (file)
--- a/decoders/i2cdemux/pd.py
+++ b/decoders/i2cdemux/pd.py
@@ -41,7 +41,7 @@ class Decoder(srd.Decoder):
         self.streamcount = 0 # Number of created output streams
 
     def start(self):
-        self.out_proto = []
+        self.out_python = []
 
     # Grab I²C packets into a local cache, until an I²C STOP condition
     # packet comes along. At some point before that STOP condition, there
@@ -63,8 +63,8 @@ class Decoder(srd.Decoder):
 
             # We're never seen this slave, add a new stream.
             self.slaves.append(databyte)
-            self.out_proto.append(self.register(srd.OUTPUT_PYTHON,
-                                  proto_id='i2c-%s' % hex(databyte)))
+            self.out_python.append(self.register(srd.OUTPUT_PYTHON,
+                                   proto_id='i2c-%s' % hex(databyte)))
             self.stream = self.streamcount
             self.streamcount += 1
         elif cmd == 'STOP':
@@ -73,7 +73,7 @@ class Decoder(srd.Decoder):
 
             # Send the whole chunk of I²C packets to the correct stream.
             for p in self.packets:
-                self.put(p[0], p[1], self.out_proto[self.stream], p[2])
+                self.put(p[0], p[1], self.out_python[self.stream], p[2])
 
             self.packets = []
             self.stream = -1

diff --git a/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
index 70613d24e909a627907ba53b8f901487c0ac5bfc..09c12f1f69182fd9af3f6cc547db50a61136f85b 100644 (file)
--- a/decoders/i2cfilter/pd.py
+++ b/decoders/i2cfilter/pd.py
@@ -46,7 +46,7 @@ class Decoder(srd.Decoder):
         self.packets = [] # Local cache of I²C packets
 
     def start(self):
-        self.out_proto = self.register(srd.OUTPUT_PYTHON, proto_id='i2c')
+        self.out_python = self.register(srd.OUTPUT_PYTHON, proto_id='i2c')
         if self.options['address'] not in range(0, 127 + 1):
             raise Exception('Invalid slave (must be 0..127).')
         if self.options['direction'] not in ('both', 'read', 'write'):
@@ -86,7 +86,7 @@ class Decoder(srd.Decoder):
             # TODO: START->STOP chunks with both read and write (Repeat START)
             # Otherwise, send out the whole chunk of I²C packets.
             for p in self.packets:
-                self.put(p[0], p[1], self.out_proto, p[2])
+                self.put(p[0], p[1], self.out_python, p[2])
 
             self.packets = []
         else:

diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py
index 3064b7dae026cb0fafa2eca9bdc6732f8275f9f9..73bfa6f634bec9547fb387233ec469df59e1054c 100644 (file)
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 Packet:
 [<ptype>, <pdata>]
@@ -71,7 +71,7 @@ class Decoder(srd.Decoder):
         self.wrote_wav_header = False
 
     def start(self):
-        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_bin = self.register(srd.OUTPUT_BINARY)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
@@ -80,7 +80,7 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     def putpb(self, data):
-        self.put(self.start_sample, self.samplenum, self.out_proto, data)
+        self.put(self.start_sample, self.samplenum, self.out_python, data)
 
     def putbin(self, data):
         self.put(self.start_sample, self.samplenum, self.out_bin, data)

diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py
index 024192422808cf14dd4c44aed6ae4a5c96bbfe92..26ddbac5fd9a7152e6287b370a4962c321689aae 100644 (file)
--- a/decoders/jtag/pd.py
+++ b/decoders/jtag/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 JTAG packet:
 [<packet-type>, <data>]
@@ -96,14 +96,14 @@ class Decoder(srd.Decoder):
         self.first = True
 
     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 putx(self, data):
         self.put(self.ss_item, self.es_item, self.out_ann, data)
 
     def putp(self, data):
-        self.put(self.ss_item, self.es_item, self.out_proto, data)
+        self.put(self.ss_item, self.es_item, self.out_python, data)
 
     def advance_state_machine(self, tms):
         self.oldstate = self.state

diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py
index 3928ae36ca45fa35ab83015e363fa83dadb5a0d6..7d6a71d2ba8180707830359020eb50ac3b674cfc 100644 (file)
--- a/decoders/jtag_stm32/pd.py
+++ b/decoders/jtag_stm32/pd.py
@@ -139,7 +139,7 @@ class Decoder(srd.Decoder):
         # self.state = 'BYPASS'
 
     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 handle_reg_bypass(self, cmd, bits):

diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 2f4d1358bc349ccd96e2c116b218fd27a5b7b6cd..58c2c89a6c4a433ed8c8e3978a33673153c136f9 100644 (file)
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -73,7 +73,7 @@ class Decoder(srd.Decoder):
         self.databytes = []
 
     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 putx(self, data):

diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py
index 983e8d9b28e6d5f85d2b4918250def9f8a9c8043..584b0059b70b5504fd3e9ba9062bc92a1bb2a863 100644 (file)
--- a/decoders/lpc/pd.py
+++ b/decoders/lpc/pd.py
@@ -149,7 +149,7 @@ class Decoder(srd.Decoder):
         self.ss_block = self.es_block = None
 
     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 putb(self, data):

diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index 2bd1d89995df6a8384e9d38e28f120d77ae1a556..b20dcc3ce00b554110e6f0b8e2dc0aa236efbece 100644 (file)
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -49,7 +49,7 @@ class Decoder(srd.Decoder):
         self.es_block = None
 
     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 putx(self, data):

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 08c7a7bd580c7225fd688f953d8399ccda3a1245..14451c86dd462581b1a144a0c3881431682e0ef4 100644 (file)
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -42,7 +42,7 @@ class Decoder(srd.Decoder):
         self.data = []
 
     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 putx(self, data):

diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index fe1ca623e1d73048e9c41f7ad61f40661993fae2..faecf594051dc6e3d55837bd706ed2819af33c2f 100644 (file)
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -107,7 +107,7 @@ class Decoder(srd.Decoder):
         self.data = []
 
     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 putx(self, data):

diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index 94dff2779d82eae8aa425739fb774fc261819a5a..46c6c09dc95e5e1871c00c254734d450f15c6248 100644 (file)
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -81,7 +81,7 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     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 putx(self, data):

diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
index 01563c28a17b4a0dfe8eb749beddd43a4efd6e82..d4fe34afeb28dae8f07f5471f616b092503df7ca 100644 (file)
--- a/decoders/nunchuk/pd.py
+++ b/decoders/nunchuk/pd.py
@@ -46,7 +46,7 @@ class Decoder(srd.Decoder):
         self.init_seq = []
 
     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 putx(self, data):

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 650a7a0297fc17059545cd758c55cb9107d325ee..c27abc6b0225d38f319921f3e10f9f40482ecb32 100644 (file)
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -60,7 +60,7 @@ class Decoder(srd.Decoder):
         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)
@@ -72,7 +72,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)
@@ -90,7 +90,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):

diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
index 19ee649caeccf9d23a457f07c7c29a50867f932c..a80132e2a23a41d5151c097ce9e2c185a0999d4e 100644 (file)
--- a/decoders/onewire_network/pd.py
+++ b/decoders/onewire_network/pd.py
@@ -60,7 +60,7 @@ class Decoder(srd.Decoder):
         self.rom = 0x0000000000000000
 
     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 putx(self, data):
@@ -69,7 +69,7 @@ class Decoder(srd.Decoder):
 
     def puty(self, data):
         # Helper function for most protocol packets.
-        self.put(self.beg, self.end, self.out_proto, data)
+        self.put(self.beg, self.end, self.out_python, data)
 
     def decode(self, ss, es, data):
         code, val = data
@@ -80,7 +80,7 @@ class Decoder(srd.Decoder):
             self.bit_cnt = 0
             self.put(ss, es, self.out_ann,
                      [0, ['Reset/presence: %s' % ('true' if val else 'false')]])
-            self.put(ss, es, self.out_proto, ['RESET/PRESENCE', val])
+            self.put(ss, es, self.out_python, ['RESET/PRESENCE', val])
             self.state = 'COMMAND'
             return
 

diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index 8db3b8f408618a25e9917b1c525ee6d993515b70..f345506cdac69aea42cc258dcfe1a4dfa4c175e7 100644 (file)
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -47,7 +47,7 @@ class Decoder(srd.Decoder):
         self.ss_block = None
 
     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 putx(self, data):

diff --git a/decoders/parallel/pd.py b/decoders/parallel/pd.py
index 540ab24d250010d0857cb4cc1e0b48a97ad445f5..b2903d20e4b41425a4edc2163d990f095d1ee0e8 100644 (file)
--- a/decoders/parallel/pd.py
+++ b/decoders/parallel/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 Packet:
 [<ptype>, <pdata>]
@@ -95,17 +95,17 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     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 putpb(self, data):
-        self.put(self.ss_item, self.es_item, self.out_proto, data)
+        self.put(self.ss_item, self.es_item, self.out_python, data)
 
     def putb(self, data):
         self.put(self.ss_item, self.es_item, self.out_ann, data)
 
     def putpw(self, data):
-        self.put(self.ss_word, self.es_word, self.out_proto, data)
+        self.put(self.ss_word, self.es_word, self.out_python, data)
 
     def putw(self, data):
         self.put(self.ss_word, self.es_word, self.out_ann, data)
@@ -142,7 +142,7 @@ class Decoder(srd.Decoder):
         if self.itemcount < ws:
             return
 
-        # Output annotations/proto for a word (a collection of items).
+        # Output annotations/python for a word (a collection of items).
         word = 0
         for i in range(ws):
             if endian == 'little':

diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index d2d01d1fa9e8ffdffaded8f5a1260d866718de69..afc2fe02df9e8e0cbd78dfee7668b72310f17293 100644 (file)
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -54,7 +54,7 @@ class Decoder(srd.Decoder):
         self.years = -1
 
     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 putx(self, data):

diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
index 0ff0e22c2b459c4ba4c0389dcf74b0fb52ec191b..8324e4f627bc9ffc1866fe140d2c9ed8530e3bc7 100644 (file)
--- a/decoders/sdcard_spi/pd.py
+++ b/decoders/sdcard_spi/pd.py
@@ -96,7 +96,7 @@ class Decoder(srd.Decoder):
         self.read_buf = []
 
     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 putx(self, data):

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index a7830cdde2a4d0e3f0b0bebc0a7add3f8d7240c1..7761f31de946e7a95106169034dfdef0dc421265 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -22,7 +22,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 SPI packet:
 [<cmd>, <data1>, <data2>]
@@ -108,13 +108,13 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     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)
         self.out_bitrate = self.register(srd.OUTPUT_META,
                 meta=(int, 'Bitrate', 'Bitrate during transfers'))
 
     def putpw(self, data):
-        self.put(self.startsample, self.samplenum, self.out_proto, data)
+        self.put(self.startsample, self.samplenum, self.out_python, data)
 
     def putw(self, data):
         self.put(self.startsample, self.samplenum, self.out_ann, data)
@@ -179,7 +179,7 @@ class Decoder(srd.Decoder):
     def find_clk_edge(self, miso, mosi, clk, cs):
         if self.have_cs and self.oldcs != cs:
             # Send all CS# pin value changes.
-            self.put(self.samplenum, self.samplenum, self.out_proto,
+            self.put(self.samplenum, self.samplenum, self.out_python,
                      ['CS-CHANGE', self.oldcs, cs])
             self.oldcs = cs
             # Reset decoder state when CS# changes (and the CS# pin is used).

diff --git a/decoders/tlc5620/pd.py b/decoders/tlc5620/pd.py
index 8c22b850b06c7fe8a6e6a0024abbfd20a4170eb9..4097c458e793c6f59488760d54a2834547b12082 100644 (file)
--- a/decoders/tlc5620/pd.py
+++ b/decoders/tlc5620/pd.py
@@ -63,7 +63,7 @@ class Decoder(srd.Decoder):
         self.dac_select = self.gain = self.dac_value = None
 
     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 handle_11bits(self):

diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py
index 00be94bdd1b50da1a501a8d066716c992305ab85..051c803418baee787ed22d3e5a494313c22edac3 100644 (file)
--- a/decoders/uart/pd.py
+++ b/decoders/uart/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 UART packet:
 [<packet-type>, <rxtx>, <packet-data>]
@@ -118,7 +118,7 @@ class Decoder(srd.Decoder):
 
     def putp(self, data):
         s, halfbit = self.samplenum, int(self.bit_width / 2)
-        self.put(s - halfbit, s + halfbit, self.out_proto, data)
+        self.put(s - halfbit, s + halfbit, self.out_python, data)
 
     def putbin(self, rxtx, data):
         s, halfbit = self.startsample[rxtx], int(self.bit_width / 2)
@@ -139,7 +139,7 @@ class Decoder(srd.Decoder):
         self.oldpins = [1, 1]
 
     def start(self):
-        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_bin = self.register(srd.OUTPUT_BINARY)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index e6fc35595740ccc3f3c5262ab128bf0f923605a6..8e5fb9e9da29bc3a545debc3a7c8c514b3d1fce2 100644 (file)
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -22,7 +22,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 Packet:
 [<ptype>, <pdata>]
@@ -162,19 +162,19 @@ class Decoder(srd.Decoder):
         self.state = 'WAIT FOR SOP'
 
     def putpb(self, data):
-        self.put(self.ss, self.es, self.out_proto, data)
+        self.put(self.ss, self.es, self.out_python, data)
 
     def putb(self, data):
         self.put(self.ss, self.es, self.out_ann, data)
 
     def putpp(self, data):
-        self.put(self.ss_packet, self.es_packet, self.out_proto, data)
+        self.put(self.ss_packet, self.es_packet, self.out_python, data)
 
     def putp(self, data):
         self.put(self.ss_packet, self.es_packet, self.out_ann, data)
 
     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 handle_packet(self):
@@ -251,7 +251,7 @@ class Decoder(srd.Decoder):
                 data = data[8:]
             self.packet_summary += ' ]'
 
-            # Convenience proto output (no annotation) for all bytes together.
+            # Convenience python output (no annotation) for all bytes together.
             self.ss, self.es = self.bits[16][1], self.bits[-16][2]
             self.putpb(['DATABYTES', databytes])
             self.packet.append(databytes)

diff --git a/decoders/usb_signalling/pd.py b/decoders/usb_signalling/pd.py
index fbc390a3636b40e051dd3ed2cee37f68fd592a16..35ffce6b70128580f7c61117899be9416d379866 100644 (file)
--- a/decoders/usb_signalling/pd.py
+++ b/decoders/usb_signalling/pd.py
@@ -22,7 +22,7 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 Packet:
 [<ptype>, <pdata>]
@@ -107,7 +107,7 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     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):
@@ -118,14 +118,14 @@ class Decoder(srd.Decoder):
             self.halfbit = int(self.bitwidth / 2)
 
     def putpx(self, data):
-        self.put(self.samplenum, self.samplenum, self.out_proto, data)
+        self.put(self.samplenum, self.samplenum, self.out_python, data)
 
     def putx(self, data):
         self.put(self.samplenum, self.samplenum, self.out_ann, data)
 
     def putpm(self, data):
         s, h = self.samplenum, self.halfbit
-        self.put(self.ss_block - h, s + h, self.out_proto, data)
+        self.put(self.ss_block - h, s + h, self.out_python, data)
 
     def putm(self, data):
         s, h = self.samplenum, self.halfbit
@@ -133,7 +133,7 @@ class Decoder(srd.Decoder):
 
     def putpb(self, data):
         s, h = self.samplenum, self.halfbit
-        self.put(s - h, s + h, self.out_proto, data)
+        self.put(s - h, s + h, self.out_python, data)
 
     def putb(self, data):
         s, h = self.samplenum, self.halfbit