Update the lookup tables for the rgbmatrix5x5.

Update the example for the rgbmatrix5x5.
Rename the example for the rgbmatrix5x5 - pylint didn't like the capitals in the name.
Tweak some of the other examples to pass pylint.

Author: lesamouraipourpre

adafruit_is31fl3731/rgbmatrix5x5.py

@@ -1,4 +1,8 @@
 # SPDX-FileCopyrightText: Tony DiCola 2017 for Adafruit Industries
+# SPDX-FileCopyrightText: Melissa LeBlanc-Williams 2021 for Adafruit Industries
+# SPDX-FileCopyrightText: David Glaude 2021
+# SPDX-FileCopyrightText: James Carr 2021
+
 #
 # SPDX-License-Identifier: MIT
 
@@ -9,7 +13,7 @@
 CircuitPython driver for the IS31FL3731 charlieplex IC.
 
 
-* Author(s): Tony DiCola, Melissa LeBlanc-Williams, David Glaude
+* Author(s): Tony DiCola, Melissa LeBlanc-Williams, David Glaude, James Carr
 
 Implementation Notes
 --------------------
@@ -37,9 +41,8 @@ class RGBmatrix5x5(IS31FL3731):
     width = 25
     height = 3
 
-    # pylint: disable=too-many-arguments
-
     def pixelrgb(self, x, y, r, g, b, blink=None, frame=None):
+        # pylint: disable=too-many-arguments
         """
         Blink or brightness for x, y-pixel
 
@@ -51,48 +54,40 @@ def pixelrgb(self, x, y, r, g, b, blink=None, frame=None):
         :param blink: True to blink
         :param frame: the frame to set the pixel
         """
-        x = (4 * (3 - x)) + y
+        x += y * 5
 
-        super().pixel(x, 0, g, blink, frame)
-        super().pixel(x, 1, r, blink, frame)
+        super().pixel(x, 0, r, blink, frame)
+        super().pixel(x, 1, g, blink, frame)
         super().pixel(x, 2, b, blink, frame)
 
-        # pylint: disable=inconsistent-return-statements
-        # pylint: disable=too-many-return-statements
-        # pylint: disable=too-many-branches
-
     @staticmethod
     def pixel_addr(x, y):
-        # pylint: disable=duplicate-code
         lookup = [
             (118, 69, 85),
             (117, 68, 101),
             (116, 84, 100),
             (115, 83, 99),
             (114, 82, 98),
-            (113, 81, 97),
-            (112, 80, 96),
-            (134, 21, 37),
-            (133, 20, 36),
             (132, 19, 35),
+            (133, 20, 36),
+            (134, 21, 37),
+            (112, 80, 96),
+            (113, 81, 97),
             (131, 18, 34),
             (130, 17, 50),
             (129, 33, 49),
             (128, 32, 48),
             (127, 47, 63),
-            (121, 41, 57),
-            (122, 25, 58),
-            (123, 26, 42),
-            (124, 27, 43),
             (125, 28, 44),
+            (124, 27, 43),
+            (123, 26, 42),
+            (122, 25, 58),
+            (121, 41, 57),
             (126, 29, 45),
             (15, 95, 111),
             (8, 89, 105),
             (9, 90, 106),
             (10, 91, 107),
-            (11, 92, 108),
-            (12, 76, 109),
-            (13, 77, 93),
         ]
 
         return lookup[x][y]

examples/is31fl3731_keybow_2040_rainbow.py

@@ -19,7 +19,7 @@
 import math
 import board
 
-import adafruit_is31fl3731
+from adafruit_is31fl3731.keybow2040 import Keybow2040 as Display
 
 # pylint: disable=inconsistent-return-statements
 # pylint: disable=too-many-return-statements
@@ -64,7 +64,7 @@ def hsv_to_rgb(hue, sat, val):
 i2c = board.I2C()
 
 # Set up 4x4 RGB matrix of Keybow 2040
-display = adafruit_is31fl3731.Keybow2040(i2c)
+display = Display(i2c)
 
 step = 0
 

examples/is31fl3731_pillow_animated_gif.py

@@ -57,13 +57,10 @@
     loops = 1
 
 # IS31FL3731 only supports 0-7
-if loops > 7:
-    loops = 7
+loops = min(loops, 7)
 
 # Get the frame count (maximum 8 frames)
-frame_count = image.n_frames
-if frame_count > 8:
-    frame_count = 8
+frame_count = min(image.n_frames, 8)
 
 # Load each frame of the gif onto the Matrix
 for frame in range(frame_count):

examples/is31fl3731_rgbmatrix5x5_rainbow.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Sandy Macdonald, David Glaude
+# SPDX-FileCopyrightText: 2021 Sandy Macdonald, David Glaude, James Carr
 # SPDX-License-Identifier: MIT
 
 """
@@ -10,22 +10,19 @@
 
 This example is for use on the Pico Explorer Base or other board that use the same SDA/SCL pin.
 
-Author(s): Sandy Macdonald, David Glaude.
+Author(s): Sandy Macdonald, David Glaude, James Carr
 """
 
 import time
 import math
 import busio
 import board
 
-from adafruit_is31fl3731.RGBmatrix5x5 import RGBmatrix5x5 as Display
-
-# pylint: disable=inconsistent-return-statements
-# pylint: disable=too-many-return-statements
-# pylint: disable=invalid-name
+from adafruit_is31fl3731.rgbmatrix5x5 import RGBmatrix5x5 as Display
 
 
 def hsv_to_rgb(hue, sat, val):
+    # pylint: disable=too-many-return-statements
     """
     Convert HSV colour to RGB
 
@@ -35,7 +32,7 @@ def hsv_to_rgb(hue, sat, val):
     """
 
     if sat == 0.0:
-        return (val, val, val)
+        return val, val, val
 
     i = int(hue * 6.0)
 
@@ -47,61 +44,91 @@ def hsv_to_rgb(hue, sat, val):
     i %= 6
 
     if i == 0:
-        return (val, t, p)
+        return val, t, p
     if i == 1:
-        return (q, val, p)
+        return q, val, p
     if i == 2:
-        return (p, val, t)
+        return p, val, t
     if i == 3:
-        return (p, q, val)
+        return p, q, val
     if i == 4:
-        return (t, p, val)
+        return t, p, val
     if i == 5:
-        return (val, p, q)
+        return val, p, q
+
+    # Will never reach here but it keeps pylint happier
+    return val, val, val
 
 
 # Create the I2C bus on a Pico Explorer Base
-i2c = busio.I2C(board.GP21, board.GP20)
+i2c = busio.I2C(board.GP5, board.GP4)
 
 # Set up 5x5 RGB matrix Breakout
 display = Display(i2c)
 
-for y in range(0, 5):
-    for x in range(0, 5):
-        display.pixelrgb(x, y, 255, 0, 0)
-        time.sleep(0.1)
 
-time.sleep(0.5)
+def test_pixels(r, g, b):
+    # Draw each row from left to right, top to bottom
+    for y in range(0, 5):
+        for x in range(0, 5):
+            display.fill(0)  # Clear display
+            display.pixelrgb(x, y, r, g, b)
+            time.sleep(0.05)
 
-for y in range(0, 5):
-    for x in range(0, 5):
-        display.pixelrgb(x, y, 0, 255, 0)
-        time.sleep(0.1)
 
-time.sleep(0.5)
+def test_rows(r, g, b):
+    # Draw full rows from top to bottom
+    for y in range(0, 5):
+        display.fill(0)  # Clear display
+        for x in range(0, 5):
+            display.pixelrgb(x, y, r, g, b)
+        time.sleep(0.2)
 
-for y in range(0, 5):
+
+def test_columns(r, g, b):
+    # Draw full columns from left to right
     for x in range(0, 5):
-        display.pixelrgb(x, y, 0, 0, 255)
-        time.sleep(0.1)
+        display.fill(0)  # Clear display
+        for y in range(0, 5):
+            display.pixelrgb(x, y, r, g, b)
+        time.sleep(0.2)
 
-time.sleep(0.5)
 
-step = 0
+def test_rainbow_sweep():
+    step = 0
 
-while True:
-    step += 1
-    for y in range(0, 5):
-        for x in range(0, 5):
-            pixel_hue = (x + y + (step / 20)) / 8
-            pixel_hue = pixel_hue - int(pixel_hue)
-            pixel_hue += 0
-            pixel_hue = pixel_hue - math.floor(pixel_hue)
+    for _ in range(100):
+        for y in range(0, 5):
+            for x in range(0, 5):
+                pixel_hue = (x + y + (step / 20)) / 8
+                pixel_hue = pixel_hue - int(pixel_hue)
+                pixel_hue += 0
+                pixel_hue = pixel_hue - math.floor(pixel_hue)
 
-            rgb = hsv_to_rgb(pixel_hue, 1, 1)
+                rgb = hsv_to_rgb(pixel_hue, 1, 1)
 
-            display.pixelrgb(
-                x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255)
-            )
+                display.pixelrgb(
+                    x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255)
+                )
 
-    time.sleep(0.01)
+        time.sleep(0.01)
+        step += 3
+
+
+while True:
+    test_pixels(64, 0, 0)  # RED
+    test_pixels(0, 64, 0)  # GREEN
+    test_pixels(0, 0, 64)  # BLUE
+    test_pixels(64, 64, 64)  # WHITE
+
+    test_rows(64, 0, 0)  # RED
+    test_rows(0, 64, 0)  # GREEN
+    test_rows(0, 0, 64)  # BLUE
+    test_rows(64, 64, 64)  # WHITE
+
+    test_columns(64, 0, 0)  # RED
+    test_columns(0, 64, 0)  # GREEN
+    test_columns(0, 0, 64)  # BLUE
+    test_columns(64, 64, 64)  # WHITE
+
+    test_rainbow_sweep()