Move common/ directory into decoders/.

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

diff --git a/decoders/timing/pd.py b/decoders/timing/pd.py
index 5cb162f99a8ab597a9ac9620a5546060fa0da5b4..e0795f3677a7e0f4a306aab4198ed55800b37630 100644 (file)
--- a/decoders/timing/pd.py
+++ b/decoders/timing/pd.py
@@ -26,13 +26,13 @@ class SamplerateError(Exception):
 
 def normalize_time(t):
     if t >= 1.0:
-        return '%.3f sec' % t
+        return '%.3f s' % t
     elif t >= 0.001:
-        return '%.3f msec' % (t * 1000.0)
+        return '%.3f ms' % (t * 1000.0)
     elif t >= 0.000001:
-        return '%.3f usec' % (t * 1000.0 * 1000.0)
+        return '%.3f μs' % (t * 1000.0 * 1000.0)
     elif t >= 0.000000001:
-        return '%.3f nsec' % (t * 1000.0 * 1000.0 * 1000.0)
+        return '%.3f ns' % (t * 1000.0 * 1000.0 * 1000.0)
     else:
         return '%f' % t
 
@@ -55,7 +55,7 @@ class Decoder(srd.Decoder):
         ('time', 'Time', (0,)),
     )
 
-    def __init__(self, **kwargs):
+    def __init__(self):
         self.samplerate = None
         self.oldpin = None
         self.last_samplenum = None
@@ -71,24 +71,24 @@ class Decoder(srd.Decoder):
         if not self.samplerate:
             raise SamplerateError('Cannot decode without samplerate.')
 
-        for (samplenum, (pin,)) in data:
+        for (self.samplenum, (pin,)) in data:
             # Ignore identical samples early on (for performance reasons).
             if self.oldpin == pin:
                 continue
 
             if self.oldpin is None:
                 self.oldpin = pin
-                self.last_samplenum = samplenum
+                self.last_samplenum = self.samplenum
                 continue
 
             if self.oldpin != pin:
-                samples = samplenum - self.last_samplenum
+                samples = self.samplenum - self.last_samplenum
                 t = samples / self.samplerate
 
                 # Report the timing normalized.
-                self.put(self.last_samplenum, samplenum, self.out_ann,
+                self.put(self.last_samplenum, self.samplenum, self.out_ann,
                          [0, [normalize_time(t)]])
 
                 # Store data for next round.
-                self.last_samplenum = samplenum
+                self.last_samplenum = self.samplenum
                 self.oldpin = pin