Skip to content

Commit b0cb16e

Browse files
committed
remove fill, move pin init after pixelbuf init
1 parent cff4726 commit b0cb16e

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

neopixel.py

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848

4949

5050
# Pixel color order constants
51-
RGB = 'rgb'
51+
RGB = 'RGB'
5252
"""Red Green Blue"""
53-
GRB = 'grb'
53+
GRB = 'GRB'
5454
"""Green Red Blue"""
55-
RGBW = 'rgbw'
55+
RGBW = 'RGBW'
5656
"""Red Green Blue White"""
57-
GRBW = 'grbw'
57+
GRBW = 'GRBW'
5858
"""Green Red Blue White"""
5959

6060

@@ -103,17 +103,14 @@ class NeoPixel(_pixelbuf.PixelBuf):
103103
time.sleep(2)
104104
"""
105105
def __init__(self, pin, n, *, bpp=3, brightness=1.0, auto_write=True, pixel_order=None):
106-
self.pin = digitalio.DigitalInOut(pin)
107-
self.pin.direction = digitalio.Direction.OUTPUT
108106
self.bpp = bpp
109107
self.n = n
110108
if not pixel_order:
111-
pixel_order = 'grb' if bpp == 3 else 'grbw'
109+
pixel_order = GRB if bpp == 3 else GRBW
112110
else:
113111
self.bpp = bpp = len(pixel_order)
114-
# Backwards compatibility with tuples
115112
if isinstance(pixel_order, tuple):
116-
order_chars = 'rgbw'
113+
order_chars = RGBW
117114
order = []
118115
for char_no, order in enumerate(pixel_order):
119116
order[pixel_order] = order_chars[char_no]
@@ -125,6 +122,9 @@ def __init__(self, pin, n, *, bpp=3, brightness=1.0, auto_write=True, pixel_orde
125122
byteorder=pixel_order,
126123
auto_write=auto_write)
127124

125+
self.pin = digitalio.DigitalInOut(pin)
126+
self.pin.direction = digitalio.Direction.OUTPUT
127+
128128
def deinit(self):
129129
"""Blank out the NeoPixels and release the pin."""
130130
self.fill(0)
@@ -140,16 +140,6 @@ def __exit__(self, exception_type, exception_value, traceback):
140140
def __repr__(self):
141141
return "[" + ", ".join([str(x) for x in self]) + "]"
142142

143-
def fill(self, color):
144-
"""Colors all pixels the given ***color***."""
145-
auto_write = self.auto_write
146-
self.auto_write = False
147-
for i, _ in enumerate(self):
148-
self[i] = color
149-
if auto_write:
150-
self.show()
151-
self.auto_write = auto_write
152-
153143
def write(self):
154144
""".. deprecated: 1.0.0
155145

0 commit comments

Comments
 (0)