From: Stefan <redacted>
Date: Thu, 4 Jun 2020 09:11:32 +0000 (+0200)
Subject: rgb_led_ws281x: Support RGBW
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=47ff9910f7e1c6f170a48aedad152ca19ccd4579;p=libsigrokdecode.git

rgb_led_ws281x: Support RGBW

Support of the now common RGBW type LED strips (uses 4 bytes instead of 3).

Added an option to select RGB or RGBW
---

diff --git a/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
index bf181b6..43fbce4 100644
--- a/decoders/rgb_led_ws281x/pd.py
+++ b/decoders/rgb_led_ws281x/pd.py
@@ -45,6 +45,10 @@ class Decoder(srd.Decoder):
         ('bits', 'Bits', (0, 1)),
         ('rgb-vals', 'RGB values', (2,)),
     )
+    options = (
+        {'id': 'type', 'desc': 'RGB or RGBW', 'default': 'RGB',
+         'values': ('RGB', 'RGBW')},
+    )
 
     def __init__(self):
         self.reset()
@@ -66,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: