Skip to content

Commit 00f9eac

Browse files
DreamSourceLabDreamSourceLab
authored
Merge pull request DreamSourceLab#389 from Makuna/NeoPixel
Enhance RGB Decoder to support more types
2 parents df3279c + f6308ab commit 00f9eac

File tree

1 file changed

+73
-16
lines changed
  • libsigrokdecode4DSL/decoders/rgb_led_ws281x

1 file changed

+73
-16
lines changed

‎libsigrokdecode4DSL/decoders/rgb_led_ws281x/pd.py

+73-16
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
##
44
## Copyright (C) 2016 Vladimir Ermakov <[email protected]>
55
## Copyright (C) 2019 DreamSourceLab <[email protected]>
6+
## Copyright (C) 2021 Michael Miller <[email protected]>
67
##
78
## This program is free software; you can redistribute it and/or modify
89
## it under the terms of the GNU General Public License as published by
@@ -27,16 +28,22 @@ class SamplerateError(Exception):
2728
class Decoder(srd.Decoder):
2829
api_version = 3
2930
id = 'rgb_led_ws281x'
30-
name = 'RGB LED (WS281x)'
31-
longname = 'RGB LED string decoder (WS281x)'
32-
desc = 'RGB LED string protocol (WS281x).'
31+
name = 'RGB LED WS2812+'
32+
longname = 'RGB LED color decoder'
33+
desc = 'Decodes colors from bus pulses for single wire RGB leds like APA106, WS2811, WS2812, WS2813, SK6812, TM1829, TM1814, and TX1812.'
3334
license = 'gplv3+'
3435
inputs = ['logic']
3536
outputs = []
3637
tags = ['Display', 'IC']
3738
channels = (
3839
{'id': 'din', 'name': 'DIN', 'desc': 'DIN data line'},
3940
)
41+
options = (
42+
{'id': 'colors', 'desc': 'Colors', 'default': 'GRB',
43+
'values': ( 'GRB', 'RGB', 'BRG', 'RBG', 'BGR', 'GRBW', 'RGBW', 'WRGB', 'LBGR', 'LGRB', 'LRGB', 'LRBG', 'LGBR', 'LBRG')},
44+
{'id': 'polarity', 'desc': 'Polarity', 'default': 'normal',
45+
'values': ('normal', 'inverted')},
46+
)
4047
annotations = (
4148
('bit', 'Bit'),
4249
('reset', 'RESET'),
@@ -58,22 +65,67 @@ def reset(self):
5865
self.es = None
5966
self.bits = []
6067
self.bit_ = None
68+
self.colorsize = None
6169

6270
def start(self):
6371
self.out_ann = self.register(srd.OUTPUT_ANN)
6472

73+
6574
def metadata(self, key, value):
6675
if key == srd.SRD_CONF_SAMPLERATE:
6776
self.samplerate = value
6877

6978
def handle_bits(self, samplenum):
70-
if len(self.bits) == 24:
71-
grb = reduce(lambda a, b: (a << 1) | b, self.bits)
72-
rgb = (grb & 0xff0000) >> 8 | (grb & 0x00ff00) << 8 | (grb & 0x0000ff)
73-
self.put(self.ss_packet, samplenum, self.out_ann,
74-
[2, ['#%06x' % rgb]])
75-
self.bits = []
76-
self.ss_packet = samplenum
79+
if len(self.bits) == self.colorsize:
80+
elems = reduce(lambda a, b: (a << 1) | b, self.bits)
81+
if self.colorsize == 24:
82+
if self.options['colors'] == 'GRB':
83+
rgb = (elems & 0xff0000) >> 8 | (elems & 0x00ff00) << 8 | (elems & 0x0000ff)
84+
elif self.options['colors'] == 'RGB':
85+
rgb = elems
86+
elif self.options['colors'] == 'BRG':
87+
rgb = (elems & 0xff0000) >> 16 | (elems & 0x00ffff) << 8
88+
elif self.options['colors'] == 'RBG':
89+
rgb = (elems & 0xff0000) | (elems & 0x00ff00) >> 8 | (elems & 0x0000ff) << 8
90+
elif self.options['colors'] == 'BGR':
91+
rgb = (elems & 0xff0000) >> 16 | (elems & 0x00ff00) | (elems & 0x0000ff) << 16
92+
93+
self.put(self.ss_packet, samplenum, self.out_ann,
94+
[2, ['RGB#%06x' % rgb]])
95+
else:
96+
if self.options['colors'] == 'GRBW':
97+
rgb = (elems & 0xff000000) >> 16 | (elems & 0x00ff0000) | (elems & 0x0000ff00) >> 8
98+
w = (elems & 0x000000ff)
99+
elif self.options['colors'] == 'RGBW':
100+
rgb = (elems & 0xffffff00) >> 8
101+
w = (elems & 0x000000ff)
102+
elif self.options['colors'] == 'WRGB':
103+
rgb = (elems & 0x00ffffff)
104+
w = (elems & 0xff000000) >> 32
105+
elif self.options['colors'] == 'LBGR':
106+
rgb = (elems & 0x0000ff00) | (elems & 0x00ff0000) >> 16 | (elems & 0x000000ff) << 16
107+
w = (elems & 0xff000000) >> 32
108+
elif self.options['colors'] == 'LGRB':
109+
rgb = (elems & 0x000000ff) | (elems & 0x00ff0000) >> 8 | (elems & 0x0000ff00) << 8
110+
w = (elems & 0xff000000) >> 32
111+
elif self.options['colors'] == 'LRGB':
112+
rgb = (elems & 0x00ffffff)
113+
w = (elems & 0xff000000) >> 32
114+
elif self.options['colors'] == 'LRBG':
115+
rgb = (elems & 0x00ff0000) | (elems & 0x0000ff00) >> 8 | (elems & 0x000000ff) << 8
116+
w = (elems & 0xff000000) >> 32
117+
elif self.options['colors'] == 'LGBR':
118+
rgb = (elems & 0x00ffff00) >> 8 | (elems & 0x000000ff) << 16
119+
w = (elems & 0xff000000) >> 32
120+
elif self.options['colors'] == 'LBRG':
121+
rgb = (elems & 0x00ff0000) >> 16 | (elems & 0x0000ffff) << 8
122+
w = (elems & 0xff000000) >> 32
123+
124+
self.put(self.ss_packet, samplenum, self.out_ann,
125+
[2, ['RGB#%06x #%02x' % (rgb, w)]])
126+
127+
self.bits = []
128+
self.ss_packet = samplenum
77129

78130
def check_bit_(self, samplenum):
79131
period = samplenum - self.ss
@@ -90,30 +142,35 @@ def decode(self):
90142
if not self.samplerate:
91143
raise SamplerateError('Cannot decode without samplerate.')
92144

145+
if len(self.options['colors']) == 4:
146+
self.colorsize = 32
147+
else:
148+
self.colorsize = 24
149+
93150
while True:
94151
if self.state == 'FIND RESET':
95-
self.wait({0: 'l'})
152+
self.wait({0: 'l' if self.options['polarity'] == 'normal' else 'h'})
96153
self.ss = self.samplenum
97-
self.wait({0: 'r'})
154+
self.wait({0: 'e'})
98155
self.es = self.samplenum
99156
if ((self.es - self.ss) / self.samplerate > 50e-6):
100157
self.state = 'RESET'
101158
elif ((self.es - self.ss) / self.samplerate > 3e-6):
102159
self.bits = []
103160
self.ss = self.samplenum
104161
self.ss_packet = self.samplenum
105-
self.wait({0: 'f'})
162+
self.wait({0: 'e'})
106163
self.state = 'BIT FALLING'
107164
elif self.state == 'RESET':
108165
self.put(self.ss, self.es, self.out_ann, [1, ['RESET', 'RST', 'R']])
109166
self.bits = []
110167
self.ss = self.samplenum
111168
self.ss_packet = self.samplenum
112-
self.wait({0: 'f'})
169+
self.wait({0: 'e'})
113170
self.state = 'BIT FALLING'
114171
elif self.state == 'BIT FALLING':
115172
self.es = self.samplenum
116-
self.wait({0: 'r'})
173+
self.wait({0: 'e'})
117174
if ((self.samplenum - self.es) / self.samplerate > 50e-6):
118175
self.check_bit_(self.samplenum)
119176
self.put(self.ss, self.es, self.out_ann,
@@ -134,5 +191,5 @@ def decode(self):
134191
self.handle_bits(self.samplenum)
135192

136193
self.ss = self.samplenum
137-
self.wait({0: 'f'})
194+
self.wait({0: 'e'})
138195
self.state = 'BIT FALLING'

0 commit comments

Comments
 (0)