X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Frgb_led_ws281x%2Fpd.py;h=dbd41dfa1319748a143ebff388d42acace6183a7;hb=192a9e78f97ea82f7ee69a683b4639847cbf4e5a;hp=43fbce4d0e2c9c89baacdb263649a706c2e21f38;hpb=47ff9910f7e1c6f170a48aedad152ca19ccd4579;p=libsigrokdecode.git

diff --git a/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
index 43fbce4..dbd41df 100644
--- a/decoders/rgb_led_ws281x/pd.py
+++ b/decoders/rgb_led_ws281x/pd.py
@@ -23,6 +23,8 @@ from functools import reduce
 class SamplerateError(Exception):
     pass
 
+( ANN_BIT, ANN_RESET, ANN_RGB, ) = range(3)
+
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'rgb_led_ws281x'
@@ -42,8 +44,8 @@ class Decoder(srd.Decoder):
         ('rgb', 'RGB'),
     )
     annotation_rows = (
-        ('bits', 'Bits', (0, 1)),
-        ('rgb-vals', 'RGB values', (2,)),
+        ('bits', 'Bits', (ANN_BIT, ANN_RESET,)),
+        ('rgb-vals', 'RGB values', (ANN_RGB,)),
     )
     options = (
         {'id': 'type', 'desc': 'RGB or RGBW', 'default': 'RGB',
@@ -69,21 +71,24 @@ class Decoder(srd.Decoder):
         if key == srd.SRD_CONF_SAMPLERATE:
             self.samplerate = value
 
+    def putg(self, ss, es, cls, text):
+        self.put(ss, es, self.out_ann, [cls, text])
+
     def handle_bits(self, samplenum):
         if self.options['type'] == 'RGB':
             if len(self.bits) == 24:
                 grb = reduce(lambda a, b: (a << 1) | b, self.bits)
                 rgb = (grb & 0xff0000) >> 8 | (grb & 0x00ff00) << 8 | (grb & 0x0000ff)
-                self.put(self.ss_packet, samplenum, self.out_ann,
-                         [2, ['#%06x' % rgb]])
+                text = ['#{:06x}'.format(rgb)]
+                self.putg(self.ss_packet, samplenum, ANN_RGB, text)
                 self.bits = []
                 self.ss_packet = None
         else:
             if len(self.bits) == 32:
                 grb = reduce(lambda a, b: (a << 1) | b, self.bits)
                 rgb = (grb & 0xff0000) >> 8 | (grb & 0x00ff00) << 8 | (grb & 0xff0000ff)
-                self.put(self.ss_packet, samplenum, self.out_ann,
-                         [2, ['#%08x' % rgb]])
+                text = ['#{:08x}'.format(rgb)]
+                self.putg(self.ss_packet, samplenum, ANN_RGB, text)
                 self.bits = []
                 self.ss_packet = None
 
@@ -112,9 +117,10 @@ class Decoder(srd.Decoder):
                 self.bits.append(bit_)
                 self.handle_bits(self.es)
 
-                self.put(self.ss, self.es, self.out_ann, [0, ['%d' % bit_]])
-                self.put(self.es, self.samplenum, self.out_ann,
-                         [1, ['RESET', 'RST', 'R']])
+                text = ['{:d}'.format(bit_)]
+                self.putg(self.ss, self.es, ANN_BIT, text)
+                text = ['RESET', 'RST', 'R']
+                self.putg(self.es, self.samplenum, ANN_RESET, text)
 
                 self.inreset = True
                 self.bits = []
@@ -129,8 +135,8 @@ class Decoder(srd.Decoder):
                     # Ideal duty for T0H: 33%, T1H: 66%.
                     bit_ = (duty / period) > 0.5
 
-                    self.put(self.ss, self.samplenum, self.out_ann,
-                             [0, ['%d' % bit_]])
+                    text = ['{:d}'.format(bit_)]
+                    self.putg(self.ss, self.samplenum, ANN_BIT, text)
 
                     self.bits.append(bit_)
                     self.handle_bits(self.samplenum)