X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=decoders%2Frgb_led_ws281x%2Fpd.py;h=43fbce4d0e2c9c89baacdb263649a706c2e21f38;hb=782c35b0158a84bbdbcfd2fc2f0ed7e507f17650;hp=b4f7c581d7e8f14b971fef5a912a56c9c42be64b;hpb=10aeb8ea8b183394cebc0033f048f49f4262b57d;p=libsigrokdecode.git

diff --git a/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
index b4f7c58..43fbce4 100644
--- a/decoders/rgb_led_ws281x/pd.py
+++ b/decoders/rgb_led_ws281x/pd.py
@@ -31,7 +31,8 @@ class Decoder(srd.Decoder):
     desc = 'RGB LED string protocol (WS281x).'
     license = 'gplv3+'
     inputs = ['logic']
-    outputs = ['rgb_led_ws281x']
+    outputs = []
+    tags = ['Display', 'IC']
     channels = (
         {'id': 'din', 'name': 'DIN', 'desc': 'DIN data line'},
     )
@@ -41,8 +42,12 @@ class Decoder(srd.Decoder):
         ('rgb', 'RGB'),
     )
     annotation_rows = (
-        ('bit', 'Bits', (0, 1)),
-        ('rgb', 'RGB', (2,)),
+        ('bits', 'Bits', (0, 1)),
+        ('rgb-vals', 'RGB values', (2,)),
+    )
+    options = (
+        {'id': 'type', 'desc': 'RGB or RGBW', 'default': 'RGB',
+         'values': ('RGB', 'RGBW')},
     )
 
     def __init__(self):
@@ -65,13 +70,22 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     def handle_bits(self, samplenum):
-        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]])
-            self.bits = []
-            self.ss_packet = None
+        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]])
+                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]])
+                self.bits = []
+                self.ss_packet = None
 
     def decode(self):
         if not self.samplerate:
@@ -88,6 +102,7 @@ class Decoder(srd.Decoder):
             # Check RESET condition (manufacturer recommends 50 usec minimal,
             # but real minimum is ~10 usec).
             if not self.inreset and not pin and self.es is not None and \
+                    self.ss is not None and \
                     (self.samplenum - self.es) / self.samplerate > 50e-6:
 
                 # Decode last bit value.