counter: prepare for variable width annotations

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

diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py
index 384f978f536b5af2ed3ee10eeb8a8bdc47b45f26..23cbd9781b5a5618bf95ce1fdf938c8a6f801f5e 100644 (file)
--- a/decoders/counter/pd.py
+++ b/decoders/counter/pd.py
@@ -68,37 +68,39 @@ class Decoder(srd.Decoder):
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
-    def putc(self, cls, annlist):
-        self.put(self.samplenum, self.samplenum, self.out_ann, [cls, annlist])
+    def putc(self, cls, ss, annlist):
+        self.put(ss, self.samplenum, self.out_ann, [cls, annlist])
 
     def decode(self):
         opt_edge_map = {'rising': 'r', 'falling': 'f', 'any': 'e'}
 
-        self.edge = self.options['data_edge']
-        self.divider = self.options['divider']
-        if self.divider < 0:
-            self.divider = 0
+        data_edge = self.options['data_edge']
+        divider = self.options['divider']
+        if divider < 0:
+            divider = 0
+        reset_edge = self.options['reset_edge']
 
-        condition = [{PIN_DATA: opt_edge_map[self.edge]}]
-        self.have_reset = self.has_channel(PIN_RESET)
-        if self.have_reset:
+        condition = [{PIN_DATA: opt_edge_map[data_edge]}]
+        have_reset = self.has_channel(PIN_RESET)
+        if have_reset:
             cond_reset = len(condition)
-            condition.append({PIN_RESET: opt_edge_map[self.options['reset_edge']]})
+            condition.append({PIN_RESET: opt_edge_map[reset_edge]})
 
-        self.edge_count = 0
-        self.word_count = 0
+        edge_count = 0
+        word_count = 0
         while True:
             self.wait(condition)
+            now = self.samplenum
 
-            if self.have_reset and self.matched[cond_reset]:
-                self.edge_count = 0
-                self.word_count = 0
-                self.putc(ROW_RESET, ['Word reset', 'Reset', 'Rst', 'R'])
+            if have_reset and self.matched[cond_reset]:
+                edge_count = 0
+                word_count = 0
+                self.putc(ROW_RESET, now, ['Word reset', 'Reset', 'Rst', 'R'])
                 continue
 
-            self.edge_count += 1
-            self.putc(ROW_EDGE, [str(self.edge_count)])
+            edge_count += 1
+            self.putc(ROW_EDGE, now, ["{:d}".format(edge_count)])
 
-            if self.divider > 0 and (self.edge_count % self.divider) == 0:
-                self.word_count += 1
-                self.putc(ROW_WORD, [str(self.word_count)])
+            if divider and (edge_count % divider) == 0:
+                word_count += 1
+                self.putc(ROW_WORD, now, ["{:d}".format(word_count)])