]> sigrok.org Git - libsigrokdecode.git/commitdiff
timing: use ss/es for consistency
authorGerhard Sittig <redacted>
Fri, 3 Jul 2020 09:22:03 +0000 (11:22 +0200)
committerGerhard Sittig <redacted>
Tue, 7 Jul 2020 20:50:46 +0000 (22:50 +0200)
Consistently use ss and es identifiers for annotation emission to match
other decoders, as well as counting distances between sample points to
increase readability. This also dramatically reduces text line length.

decoders/timing/pd.py

index e6875622cd60ff95abf69d869fddb70f15f9c383..f14b64f4853abe3ada07cfbb4edd958faadb81ba 100644 (file)
@@ -98,7 +98,7 @@ class Decoder(srd.Decoder):
             raise SamplerateError('Cannot decode without samplerate.')
         edge = self.options['edge']
         avg_period = self.options['avg_period']
-        last_samplenum = None
+        ss = None
         last_n = deque()
         last_t = None
         while True:
@@ -109,10 +109,11 @@ class Decoder(srd.Decoder):
             else:
                 pin = self.wait({Pin.DATA: 'e'})
 
-            if not last_samplenum:
-                last_samplenum = self.samplenum
+            if not ss:
+                ss = self.samplenum
                 continue
-            samples = self.samplenum - last_samplenum
+            es = self.samplenum
+            samples = es - ss
             t = samples / self.samplerate
 
             if t > 0:
@@ -120,14 +121,14 @@ class Decoder(srd.Decoder):
             if len(last_n) > avg_period:
                 last_n.popleft()
 
-            self.put(last_samplenum, self.samplenum, self.out_ann,
+            self.put(ss, es, self.out_ann,
                      [Ann.TIME, [normalize_time(t)]])
             if avg_period > 0:
-                self.put(last_samplenum, self.samplenum, self.out_ann,
+                self.put(ss, es, self.out_ann,
                          [Ann.AVG, [normalize_time(sum(last_n) / len(last_n))]])
             if last_t and self.options['delta'] == 'yes':
-                self.put(last_samplenum, self.samplenum, self.out_ann,
+                self.put(ss, es, self.out_ann,
                          [Ann.DELTA, [normalize_time(t - last_t)]])
 
             last_t = t
-            last_samplenum = self.samplenum
+            ss = es