s/out_proto/out_python/.

[libsigrokdecode.git] / decoders / i2c / pd.py

diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index 45b84e81d2a3e9b706af92502d769821ef353834..4d77920842e319de98593f2f1eab55532aec608b 100644 (file)
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -18,8 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# I2C protocol decoder
-
 # TODO: Look into arbitration, collision detection, clock synchronisation, etc.
 # TODO: Implement support for 10bit slave addresses.
 # TODO: Implement support for inverting SDA/SCL levels (0->1 and 1->0).
@@ -28,9 +26,9 @@
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
-I2C packet:
+I²C packet:
 [<cmd>, <data>]
 
 <cmd> is one of:
@@ -66,7 +64,7 @@ proto = {
 class Decoder(srd.Decoder):
     api_version = 1
     id = 'i2c'
-    name = 'I2C'
+    name = 'I²C'
     longname = 'Inter-Integrated Circuit'
     desc = 'Two-wire, multi-master, serial bus.'
     license = 'gplv2+'
@@ -93,10 +91,10 @@ class Decoder(srd.Decoder):
         ['warnings', 'Human-readable warnings'],
     ]
     binary = (
-        'Address read',
-        'Address write',
-        'Data read',
-        'Data write',
+        ('address-read', 'Address read'),
+        ('address-write', 'Address write'),
+        ('data-read', 'Data read'),
+        ('data-write', 'Data write'),
     )
 
     def __init__(self, **kwargs):
@@ -119,9 +117,9 @@ 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.add(srd.OUTPUT_BINARY)
+        self.out_binary = self.register(srd.OUTPUT_BINARY)
         self.out_bitrate = self.register(srd.OUTPUT_META,
                 meta=(int, 'Bitrate', 'Bitrate from Start bit to Stop bit'))
 
@@ -129,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)