sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move neopixel initialization into during_bootup

Browse Source
This commit is contained in:
xs5871 2023-03-09 20:39:04 +00:00 committed by xs5871
parent 3c796c16f8
commit 55b3a3a9b1
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
kmk/extensions/rgb.py
View File

@ -90,10 +90,10 @@ class RGB(Extension):
self, self,
pixel_pin, pixel_pin,
num_pixels=0, num_pixels=0,
rgb_order=(1, 0, 2), # GRB WS2812
val_limit=255, val_limit=255,
hue_default=0, hue_default=0,
sat_default=255, sat_default=255,
rgb_order=(1, 0, 2), # GRB WS2812
val_default=255, val_default=255,
hue_step=4, hue_step=4,
sat_step=13, sat_step=13,
@ -109,32 +109,9 @@ class RGB(Extension):
pixels=None, pixels=None,
refresh_rate=60, refresh_rate=60,
): ):
if pixels is None: self.pixel_pin = pixel_pin
import neopixel
pixels = neopixel.NeoPixel(
pixel_pin,
num_pixels,
pixel_order=rgb_order,
auto_write=not disable_auto_write,
)
self.pixels = pixels
self.num_pixels = num_pixels self.num_pixels = num_pixels
self.rgb_order = rgb_order
# PixelBuffer are already iterable, can't do the usual `try: iter(...)`
if issubclass(self.pixels.__class__, PixelBuf):
self.pixels = (self.pixels,)
if self.num_pixels == 0:
for pixels in self.pixels:
self.num_pixels += len(pixels)
if debug.enabled:
for n, pixels in enumerate(self.pixels):
debug(f'pixels[{n}] = {pixels.__class__}[{len(pixels)}]')
self.rgbw = bool(len(rgb_order) == 4)
self.hue_step = hue_step self.hue_step = hue_step
self.sat_step = sat_step self.sat_step = sat_step
self.val_step = val_step self.val_step = val_step
@ -153,8 +130,11 @@ class RGB(Extension):
self.reverse_animation = reverse_animation self.reverse_animation = reverse_animation
self.user_animation = user_animation self.user_animation = user_animation
self.disable_auto_write = disable_auto_write self.disable_auto_write = disable_auto_write
self.pixels = pixels
self.refresh_rate = refresh_rate self.refresh_rate = refresh_rate
self.rgbw = bool(len(rgb_order) == 4)
self._substep = 0 self._substep = 0
make_key( make_key(
@ -227,6 +207,28 @@ class RGB(Extension):
return return
def during_bootup(self, sandbox): def during_bootup(self, sandbox):
if self.pixels is None:
import neopixel
self.pixels = neopixel.NeoPixel(
self.pixel_pin,
self.num_pixels,
pixel_order=self.rgb_order,
auto_write=not self.disable_auto_write,
)
# PixelBuffer are already iterable, can't do the usual `try: iter(...)`
if issubclass(self.pixels.__class__, PixelBuf):
self.pixels = (self.pixels,)
if self.num_pixels == 0:
for pixels in self.pixels:
self.num_pixels += len(pixels)
if debug.enabled:
for n, pixels in enumerate(self.pixels):
debug(f'pixels[{n}] = {pixels.__class__}[{len(pixels)}]')
self._timer = PeriodicTimer(1000 // self.refresh_rate) self._timer = PeriodicTimer(1000 // self.refresh_rate)
def before_matrix_scan(self, sandbox): def before_matrix_scan(self, sandbox):