JoyPi-RGB-Matrix-RaspberryPi 1.0.0__tar.gz → 1.0.1__tar.gz

joypi_rgb_matrix_raspberrypi-1.0.1/.gitignore

@@ -0,0 +1,2 @@
+.gitignore
+dist/*

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JoyPi_RGB_Matrix_RaspberryPi
-Version: 1.0.0
+Version: 1.0.1
 Summary: This library enables usage of RGB matrix with RP2040 microcontroller chip on the Raspberry Pi.
 Project-URL: Homepage, https://github.com/joy-it/JoyPi_RGB_Matrix_RaspberryPi
 Project-URL: Issues, https://github.com/joy-it/JoyPi_RGB_Matrix_RaspberryPi/issues
@@ -20,13 +20,15 @@ This library enables usage of RGB matrix with RP2040 microcontroller chip on the
 ## Installation
 You can install this library from PyPI.
 To install it for the current user on your Raspberry Pi, use the following command:
-```
+```bash
 pip install JoyPi_RGB_Matrix_RaspberryPi
 ```
 
 ## Library Guide
 - `LEDMatrix( count = 64, brightness = 10, right_border = [7,15,23,31,39,47,55,63], left_border = [0,8,16,24,32,40,48,56])`- initialize LED matrix with default values for Joy-Pi
 - `clean()` - clears the LED matrix
+- `setBrightness(brightness)` - set brightness to a certain level (0-255)
+- `getPixelNum()` - returns number of pixel of led matrix
 - `setPixel(position, colour)` - sets specific pixel to a selected colour
 - `RGB_on(colour)` - sets the complete matrix to one selected colour
 - `RGB_off()` - turns the complete matrix off

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/README.md

@@ -1,25 +1,27 @@
-# JoyPi_RGB_Matrix_RaspberryPi
-This library enables usage of RGB matrix with RP2040 microcontroller chip on the Raspberry Pi.
-
->[!WARNING]
-> This library was written for the usage of the LED matrix of the Joy-Pi Advanced 2 and Joy-Pi Note 2. Both Joy-Pis have the RP2040 microcontroller chip to control the LED matrix. This is to ensure compatibility with the Raspberry Pi 5 because the library which was used beforehand is not compatible up to this date.
-
-## Installation
-You can install this library from PyPI.
-To install it for the current user on your Raspberry Pi, use the following command:
-```
-pip install JoyPi_RGB_Matrix_RaspberryPi
-```
-
-## Library Guide
-- `LEDMatrix( count = 64, brightness = 10, right_border = [7,15,23,31,39,47,55,63], left_border = [0,8,16,24,32,40,48,56])`- initialize LED matrix with default values for Joy-Pi
-- `clean()` - clears the LED matrix
-- `setPixel(position, colour)` - sets specific pixel to a selected colour
-- `RGB_on(colour)` - sets the complete matrix to one selected colour
-- `RGB_off()` - turns the complete matrix off
-- `rainbow(wait_ms=20, iterations=1)` - rainbow effect on the whole matrix with default values
-- `colourWipe(colour, wait_ms=50)` - Move selected colour pixel by pixel onto the matrix with default speed
-- `theaterChase( colour, wait_ms=50, iterations=10)` - chaser animation with a selected colour with deafult speed
-- `show()` - displays set pixels
-- `demo1()` - demo program version 1
+# JoyPi_RGB_Matrix_RaspberryPi
+This library enables usage of RGB matrix with RP2040 microcontroller chip on the Raspberry Pi.
+
+>[!WARNING]
+> This library was written for the usage of the LED matrix of the Joy-Pi Advanced 2 and Joy-Pi Note 2. Both Joy-Pis have the RP2040 microcontroller chip to control the LED matrix. This is to ensure compatibility with the Raspberry Pi 5 because the library which was used beforehand is not compatible up to this date.
+
+## Installation
+You can install this library from PyPI.
+To install it for the current user on your Raspberry Pi, use the following command:
+```bash
+pip install JoyPi_RGB_Matrix_RaspberryPi
+```
+
+## Library Guide
+- `LEDMatrix( count = 64, brightness = 10, right_border = [7,15,23,31,39,47,55,63], left_border = [0,8,16,24,32,40,48,56])`- initialize LED matrix with default values for Joy-Pi
+- `clean()` - clears the LED matrix
+- `setBrightness(brightness)` - set brightness to a certain level (0-255)
+- `getPixelNum()` - returns number of pixel of led matrix
+- `setPixel(position, colour)` - sets specific pixel to a selected colour
+- `RGB_on(colour)` - sets the complete matrix to one selected colour
+- `RGB_off()` - turns the complete matrix off
+- `rainbow(wait_ms=20, iterations=1)` - rainbow effect on the whole matrix with default values
+- `colourWipe(colour, wait_ms=50)` - Move selected colour pixel by pixel onto the matrix with default speed
+- `theaterChase( colour, wait_ms=50, iterations=10)` - chaser animation with a selected colour with deafult speed
+- `show()` - displays set pixels
+- `demo1()` - demo program version 1
 - `demo2()` - demo program version 2 

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/examples/rgbmatrix.py

@@ -1,12 +1,16 @@
 # Required modules are inserted and configured
 from JoyPi_RGB_Matrix_RaspberryPi import RGB_Matrix
 import time
-import smbus2
+import busio
+import board
 
 # open I2C connection
-bus = smbus2.SMBus(1)
+i2c = busio.I2C(board.SCL, board.SDA)
 # Create object matrix
-matrix = RGB_Matrix(bus)
+matrix = RGB_Matrix(i2c)
+
+# set brightness to 100 (0-255)
+matrix.setBrightness(100)
 
 # colourWipe animation with different colors
 print("colourWipe animation")
@@ -47,4 +51,4 @@ time.sleep(5)
 
 # Clear matrix
 print("Clear LEDs")
-matrix.clean()
+matrix.clean()

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "JoyPi_RGB_Matrix_RaspberryPi"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
   { name="Joy-IT", email="service@joy-it.net" },
 ]

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/src/JoyPi_RGB_Matrix_RaspberryPi/RGB_Matrix.py

@@ -1,13 +1,14 @@
 from ._RGBW import RGBW
 from ._PixelStrip import PixelStrip
 import time
+import busio
 
 class RGB_Matrix:
     """
     New version using the I2C-based PixelStrip instead of rpi_ws281x.
     """
 
-    def __init__(self, bus = None, bus_id = 1, i2c_adress = 0x66, count = 64, brightness = 10, 
+    def __init__(self, i2c: busio.I2C, i2c_adress = 0x66, count = 64, brightness = 10, 
                  right_border = [7,15,23,31,39,47,55,63], left_border = [0,8,16,24,32,40,48,56]):
         """
         initiliaze LED matrix
@@ -26,8 +27,7 @@ class RGB_Matrix:
         self.LEFT_BORDER  = left_border
 
         # Create the I2C-based PixelStrip instance
-        self.strip = PixelStrip(num=self.LED_COUNT, brightness=self.LED_BRIGHTNESS,
-                                bus = bus, bus_id = bus_id, i2c_adress=i2c_adress)
+        self.strip = PixelStrip(num=self.LED_COUNT, i2c=i2c, brightness=self.LED_BRIGHTNESS, i2c_adress=i2c_adress)
         self.strip.begin()
 
     def clean(self):
@@ -51,7 +51,7 @@ class RGB_Matrix:
         
         :param colour: RGBW value 32 bit integer
         """
-        for i in range(self.strip.numPixels()):
+        for i in range(self.strip.getNumPixels()):
             self.strip.setPixelColor(i, colour)
         self.strip.show()
 
@@ -59,7 +59,7 @@ class RGB_Matrix:
         """
         turn all LEDs in matrix off
         """
-        for i in range(self.strip.numPixels()):
+        for i in range(self.strip.getNumPixels()):
             self.strip.setPixelColor(i, RGBW(0, 0, 0, 0))
         self.strip.show()
 
@@ -86,7 +86,7 @@ class RGB_Matrix:
         :param iterations: iterations of animation
         """
         for j in range(256 * iterations):
-            for i in range(self.strip.numPixels()):
+            for i in range(self.strip.getNumPixels()):
                 self.strip.setPixelColor(i, self.wheel((i + j) & 255))
             self.strip.show()
             time.sleep(wait_ms / 1000.0)
@@ -98,7 +98,7 @@ class RGB_Matrix:
         :param color: RGB value to set pixels to
         :param wait_ms: time between each pixel
         """
-        for i in range(self.strip.numPixels()):
+        for i in range(self.strip.getNumPixels()):
             self.strip.setPixelColor(i, color)
             self.strip.show()
             time.sleep(wait_ms / 1000.0)
@@ -113,11 +113,11 @@ class RGB_Matrix:
         """
         for j in range(iterations):
             for q in range(3):
-                for i in range(0, self.strip.numPixels(), 3):
+                for i in range(0, self.strip.getNumPixels(), 3):
                     self.strip.setPixelColor(i + q, color)
                 self.strip.show()
                 time.sleep(wait_ms / 1000.0)
-                for i in range(0, self.strip.numPixels(), 3):
+                for i in range(0, self.strip.getNumPixels(), 3):
                     self.strip.setPixelColor(i + q, 0)
 
     def demo1(self):
@@ -151,4 +151,19 @@ class RGB_Matrix:
                     self.strip.setPixelColor(i, RGBW(255, 0, 0, 0))
                 self.strip.show()
         except KeyboardInterrupt:
-            self.clean()
+            self.clean()
+    
+    def setBrightness(self, brightness):
+        """
+        Set brightness of all pixels
+
+        :param brightness: brightness level (0-255)
+        """
+        self.strip.setBrightness(brightness)
+        self.strip.show()
+    
+    def getPixelNum(self):
+        """
+        Get number of pixels in matrix
+        """
+        return self.strip.getNumPixels()

{joypi_rgb_matrix_raspberrypi-1.0.0 → joypi_rgb_matrix_raspberrypi-1.0.1}/src/JoyPi_RGB_Matrix_RaspberryPi/_PixelStrip.py

@@ -1,6 +1,7 @@
 from ._LEDTransferData import LEDTransferData
 from enum import Enum
-import smbus2
+import busio
+from adafruit_bus_device import i2c_device
 import time
 
 class FunctionEnum(Enum):
@@ -16,26 +17,25 @@ class FunctionEnum(Enum):
     SETPIXELCOLOR       = 1
     FILL                = 2
     SETBRIGHTNESS       = 3
-    WHITEOVERRAINBOW    = 4
-    GAMMA8              = 5
-    GAMMA32             = 6
-    NUMPIXEL            = 7
-    COLORHSV            = 8
-    CLEAR               = 9
-    SENDDATA2SHOW       = 10
-    SENDALLPIXRGB0      = 11
-    SENDALLPIXRGB1      = 12
-    SENDALLPIXRGB2      = 13
-    SENDALLPIXRGB3      = 14
-    SENDALLPIXRGB4      = 15
-    SENDALLPIXRGB5      = 16
+    GAMMA8              = 4
+    GAMMA32             = 5
+    NUMPIXEL            = 6
+    COLORHSV            = 7
+    CLEAR               = 8
+    SENDDATA2SHOW       = 9
+    SENDALLPIXRGB0      = 10
+    SENDALLPIXRGB1      = 11
+    SENDALLPIXRGB2      = 12
+    SENDALLPIXRGB3      = 13
+    SENDALLPIXRGB4      = 14
+    SENDALLPIXRGB5      = 15
 
 class PixelStrip:
     """
     Controls a strip of LEDs (WS281x / SK6812) via I2C.
     """
 
-    def __init__(self, num, brightness=255, bus = None, bus_id = 1, i2c_adress = 0x66):
+    def __init__(self, num, i2c: busio.I2C, brightness=255, i2c_adress = 0x66):
         """
         initilize LED controll class
         
@@ -43,8 +43,8 @@ class PixelStrip:
         :param brightness: brightness of all pixels
         """
         self.num = num
-        self.bus = bus if bus is not None else smbus2.SMBus(bus_id)
-        self.Address = i2c_adress
+        self.address = i2c_adress
+        self.device = i2c_device.I2CDevice(i2c, self.address)
         self.transfer_data = LEDTransferData()
         self.transfer_data.setBright(brightness)
 
@@ -61,25 +61,45 @@ class PixelStrip:
 
         :param cmd: block of data to send
         """
-        self.bus.write_block_data(
-            self.Address, cmd, [
-                self.transfer_data.func,
-                self.transfer_data.pos,
-                self.transfer_data.r,
-                self.transfer_data.g,
-                self.transfer_data.b,
-                self.transfer_data.w,
-                self.transfer_data.c,
-                self.transfer_data.bright,
-                self.transfer_data.first,
-                self.transfer_data.count,
-                self.transfer_data.data,
-                self.transfer_data.data1
-            ]
-        )
+        data = bytes([
+            cmd & 0xFF,
+            0x0C,
+            self.transfer_data.func & 0xFF,
+            self.transfer_data.pos & 0xFF,
+            self.transfer_data.r & 0xFF,
+            self.transfer_data.g & 0xFF,
+            self.transfer_data.b & 0xFF,
+            self.transfer_data.w & 0xFF,
+            self.transfer_data.c & 0xFF,
+            self.transfer_data.bright & 0xFF,
+            self.transfer_data.first & 0xFF,
+            self.transfer_data.count & 0xFF,
+            self.transfer_data.data & 0xFF,
+            self.transfer_data.data1 & 0xFF,
+        ])
+        with self.device as bus_device:
+            bus_device.write(data)
         time.sleep(0.003)  # Hardware timing delay
         self.transfer_data.clean()
 
+    def _write(self, cmd, data):
+        """
+        Send a command byte followed by a data block
+        """
+        buffer = bytes([cmd & 0xFF, len(data) & 0xFF] + [value & 0xFF for value in data])
+        with self.device as bus_device:
+            bus_device.write(buffer)
+        time.sleep(0.003)
+
+    def _read(self):
+        """
+        Read one byte from the I2C device
+        """
+        data = bytearray(1)
+        with self.device as bus_device:
+            bus_device.readinto(data)
+        return data[0]
+    
     def __len__(self):
         """
         Return the total number of pixels
@@ -205,11 +225,7 @@ class PixelStrip:
         for i in range(6):
             start = 32 * i
             end = start + 32
-            self.bus.write_block_data(
-                self.Address,
-                FunctionEnum.SENDALLPIXRGB0.value + i,
-                rgb[start:end]
-            )
+            self._write( FunctionEnum.SENDALLPIXRGB0.value + i, rgb[start:end])
 
     def fill(self, r=0, g=0, b=0, w=0, first=0, end=64):
         """
@@ -252,7 +268,7 @@ class PixelStrip:
         self.transfer_data.setFunc(FunctionEnum.SETBRIGHTNESS.value)
         self.send(0x00)
 
-    def numPixels(self):
+    def getNumPixels(self):
         """
         Return the number of pixels in this strip
         """
@@ -267,7 +283,7 @@ class PixelStrip:
         self.transfer_data.setFunc(FunctionEnum.GAMMA8.value)
         self.transfer_data.setData(x)
         self.send(0x01)
-        return self.bus.read_byte(self.Address)
+        return self._read()
 
     def getGamma32(self, x):
         """
@@ -278,9 +294,9 @@ class PixelStrip:
         self.transfer_data.setFunc(FunctionEnum.GAMMA32.value)
         self.transfer_data.setData(x)
         self.send(0x01)
-        return self.bus.read_byte(self.Address)
+        return self._read()
 
-    def ColorHSV(self, x):
+    def getColorHSV(self, x):
         """
         Converts an HSV color value into the device-specific RGB format.
 
@@ -289,4 +305,4 @@ class PixelStrip:
         self.transfer_data.setFunc(FunctionEnum.COLORHSV.value)
         self.transfer_data.setData(x)
         self.send(0x01)
-        return self.bus.read_byte(self.Address)
+        return self._read()