From 0014eac9066c3783cb236c9a947413fe03ad9085 Mon Sep 17 00:00:00 2001 From: Tom Mount Date: Wed, 4 Oct 2023 10:40:43 -0400 Subject: [PATCH] drivers/led/neopixel: Continue lint fixes. Signed-off-by: Tom Mount --- micropython/drivers/led/neopixel/neopixel.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/micropython/drivers/led/neopixel/neopixel.py b/micropython/drivers/led/neopixel/neopixel.py index b9a0fddf..853f71ef 100644 --- a/micropython/drivers/led/neopixel/neopixel.py +++ b/micropython/drivers/led/neopixel/neopixel.py @@ -8,13 +8,16 @@ class NeoPixel: # G R B W ORDER = (1, 0, 2, 3) + def _clamp(self, v, c_min, c_max): + return min(max(v, c_min), c_max) + def __init__(self, pin, n, bpp=3, timing=1, brightness=None): self.pin = pin self.n = n self.bpp = bpp - self.brightness = ( - min(max(float(brightness), 0.0), 1.0) if brightness is not None else None - ) + self.brightness = None + if brightness is not None: + self.brightness = self._clamp(float(brightness), 0.0, 1.0) self.buf = bytearray(n * bpp) self.pin.init(pin.OUT) # Timing arg can either be 1 for 800kHz or 0 for 400kHz, @@ -56,7 +59,7 @@ class NeoPixel: j += bpp def set_brightness(self, b: float): - self.brightness = min(max(b, 0.0), 1.0) + self.brightness = self._clamp(b, 0.0, 1.0) # This may look odd but because __getitem__ and __setitem__ handle all the # brightness logic already, we can offload the work to those methods. for i in range(self.n):