Drop obsolete report() method.

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

diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index c8afc45598ab0f4f29241fc38e60d31e8953e2e5..9f8cbaff36434758f0c5f0d9876c10b9cb14d4b3 100644 (file)
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -78,7 +78,6 @@ class Decoder(srd.Decoder):
     ]
     optional_probes = []
     options = {
-        'addressing': ['Slave addressing (in bits)', 7], # 7 or 10
         'address_format': ['Displayed slave address format', 'shifted'],
     }
     annotations = [
@@ -95,6 +94,7 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
+        self.samplerate = None
         self.startsample = -1
         self.samplenum = None
         self.bitcount = 0
@@ -105,13 +105,18 @@ class Decoder(srd.Decoder):
         self.oldscl = 1
         self.oldsda = 1
         self.oldpins = [1, 1]
+        self.pdu_start = None
+        self.pdu_bits = 0
 
-    def start(self, metadata):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2c')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'i2c')
+    def metadata(self, key, value):
+        if key == srd.SRD_CONF_SAMPLERATE:
+            self.samplerate = value
 
-    def report(self):
-        pass
+    def start(self):
+        self.out_proto = 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 from Start bit to Stop bit'))
 
     def putx(self, data):
         self.put(self.startsample, self.samplenum, self.out_ann, data)
@@ -139,6 +144,8 @@ class Decoder(srd.Decoder):
 
     def found_start(self, scl, sda):
         self.startsample = self.samplenum
+        self.pdu_start = self.samplenum
+        self.pdu_bits = 0
         cmd = 'START REPEAT' if (self.is_repeat_start == 1) else 'START'
         self.putp([cmd, None])
         self.putx([proto[cmd][0], proto[cmd][1:]])
@@ -199,6 +206,11 @@ class Decoder(srd.Decoder):
         self.state = 'FIND DATA'
 
     def found_stop(self, scl, sda):
+        # Meta bitrate
+        elapsed = 1 / float(self.samplerate) * (self.samplenum - self.pdu_start + 1)
+        bitrate = int(1 / elapsed * self.pdu_bits)
+        self.put(self.startsample, self.samplenum, self.out_bitrate, bitrate)
+
         self.startsample = self.samplenum
         cmd = 'STOP'
         self.putp([cmd, None])
@@ -208,6 +220,8 @@ class Decoder(srd.Decoder):
         self.wr = -1
 
     def decode(self, ss, es, data):
+        if self.samplerate is None:
+            raise Exception("Cannot decode without samplerate.")
         for (self.samplenum, pins) in data:
 
             # Ignore identical samples early on (for performance reasons).
@@ -215,6 +229,8 @@ class Decoder(srd.Decoder):
                 continue
             self.oldpins, (scl, sda) = pins, pins
 
+            self.pdu_bits += 1
+
             # TODO: Wait until the bus is idle (SDA = SCL = 1) first?
 
             # State machine.