JoyPi-Advanced-RaspberryPi 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

JoyPi_Advanced_RaspberryPi/LEDMatrix.py

@@ -1,15 +1,8 @@
 import time
 from rpi_ws281x import PixelStrip, Color
 
-
 class LEDMatrix:
-    """
-    The Joy-Pi Advanced 2 is no longer compatible with this library for the LED 
-    matrix. To ensure compatibility with the Raspberry Pi 5, the LED matrix is now 
-    controlled via I²C because of the RP2040 microcontroller chip. The LED matrix 
-    can now be controlled with the Joy-Pi Advanced via this repository
-    http://github.com/joy-it/JoyPi_RGB_Matrix_RaspberryPi
-    """
+
     def __init__(self, pin = 18, brightness = 100):
         # LED strip configuration
         self.LED_COUNT = 64              # Number of pixels

JoyPi_Advanced_RaspberryPi/colour.py

@@ -28,20 +28,60 @@
 # Step 2) sudo apt-get install i2c-tools python3-smbus
 # Step 3) plug it in (don't forget your pull-up resistors) and run this program
 
-import smbus
+import busio
+from adafruit_bus_device import i2c_device
 import time
 import threading
 import numpy as np
 
 class colour:
 
-    def __init__(self, i2c_address = 0x10):
+    REG_CONF = 0x00
+    REG_RED = 0x08
+    REG_GREEN = 0x09
+    REG_BLUE = 0x0A
+    REG_WHITE = 0x0B
+
+    INTEGRATION_TIME_40MS = 0
+    INTEGRATION_TIME_80MS = 1
+    INTEGRATION_TIME_160MS = 2
+    INTEGRATION_TIME_320MS = 3
+    INTEGRATION_TIME_640MS = 4
+    INTEGRATION_TIME_1280MS = 5
+
+    _INTEGRATION_TIME_VALUES = {
+        INTEGRATION_TIME_40MS: 0x00,
+        INTEGRATION_TIME_80MS: 0x10,
+        INTEGRATION_TIME_160MS: 0x20,
+        INTEGRATION_TIME_320MS: 0x30,
+        INTEGRATION_TIME_640MS: 0x40,
+        INTEGRATION_TIME_1280MS: 0x50,
+    }
+
+    _INTEGRATION_TIME_DELAY = {
+        INTEGRATION_TIME_40MS: 0.05,
+        INTEGRATION_TIME_80MS: 0.09,
+        INTEGRATION_TIME_160MS: 0.17,
+        INTEGRATION_TIME_320MS: 0.33,
+        INTEGRATION_TIME_640MS: 0.65,
+        INTEGRATION_TIME_1280MS: 1.29,
+    }
+
+    BIT_SD = 0x01
+    BIT_AF = 0x02
+    BIT_TRIG = 0x04
+    MASK_INTEGRATION_TIME = 0x70
+
+    def __init__(self,  i2c: busio.I2C, integration_time=INTEGRATION_TIME_160MS, i2c_address = 0x10):
         """
         initialize colour sensor
         i2c_address - i2c_address of colour sensor (default 0x10)
         """
         self.address = i2c_address
-        self.bus = smbus.SMBus(1)
+        if integration_time not in self._INTEGRATION_TIME_VALUES:
+            raise ValueError("integration_time is not in range")
+        self.integration_time = integration_time
+        self.device = i2c_device.I2CDevice(i2c, self.address)
         self.enableSensor()
     
     def write(self, cmd, val):
@@ -50,74 +90,143 @@ class colour:
         cmd - register
         val - value to be written
         """
-        self.bus.write_word_data(self.address, cmd, val)
+        data = bytes([
+            cmd & 0xFF,
+            val & 0xFF,
+            (val >> 8) & 0xFF,
+        ])
+        with self.device as bus_device:
+            bus_device.write(data)
     
     def read(self, cmd):
         """
         read value from register on the colour sensor
         cmd - register
         """
-        return self.bus.read_word_data(self.address, cmd)
-        
+        register = bytes([cmd & 0xFF])
+        data = bytearray(2)
+        last_error = None
+        for _ in range(3):
+            try:
+                with self.device as bus_device:
+                    bus_device.write_then_readinto(register, data)
+                return data[0] | (data[1] << 8)
+            except OSError as error:
+                last_error = error
+                time.sleep(0.02)
+        raise last_error
+
     def enableSensor(self):
         """
         activate Sensor
         """
-        conf = self.read(0x00) & 0x00FE
-        self.write(0x00, conf)
+        config = self._INTEGRATION_TIME_VALUES[self.integration_time]
+        config &= ~self.BIT_SD
+        config &= ~self.BIT_AF
+        config &= ~self.BIT_TRIG
+        self.write(self.REG_CONF, config)
+        time.sleep(self._INTEGRATION_TIME_DELAY[self.integration_time])
         
     def disableSensor(self):
         """
         deactivate Sensor
         """
-        conf = (self.read(0x00) & 0x00FE) | 0x000
-        self.write(0x00, conf)
-        time.sleep(.001)
+        config = self.read(self.REG_CONF)
+        config |= self.BIT_SD
+        self.write(self.REG_CONF, config)
+        
+    def setIntegrationTime(self, integration_time):
+        """
+        set integration time with variable integration_time
+        integration_time - _INTEGRATION_TIME_VALUES 
+            INTEGRATION_TIME_40MS = 40 ms
+            INTEGRATION_TIME_80MS = 80 ms
+            INTEGRATION_TIME_160MS = 160 ms
+            INTEGRATION_TIME_320MS = 320 ms
+            INTEGRATION_TIME_640MS = 640 ms
+            INTEGRATION_TIME_1280MS = 1280 ms
+        """
+        if integration_time not in self._INTEGRATION_TIME_VALUES:
+            raise ValueError("integration_time is not in range")
+        config = self.read(self.REG_CONF)
+        config &= ~self.MASK_INTEGRATION_TIME
+        config |= self._INTEGRATION_TIME_VALUES[integration_time]
+        config &= ~self.BIT_SD
+        self.integration_time = integration_time
+        self.write(self.REG_CONF, config)
+        time.sleep(self._INTEGRATION_TIME_DELAY[self.integration_time])
+        
+    def getRed(self):
+        """
+        returns measured value for colour red
+        """
+        return self.read(self.REG_RED)
+
+    def getBlue(self):
+        """
+        returns measured value for colour blue
+        """
+        return self.read(self.REG_BLUE)
+
+    def getGreen(self):
+        """
+        returns measured value for colour green
+        """
+        return self.read(self.REG_GREEN)
+    
+    def getWhite(self):
+        """
+        returns measured value for colour white
+        """
+        return self.read(self.REG_WHITE)
     
     def getRGBW(self):
         """
         returns colour values from colour sensor - red, green, blue, white
         """
-        return self.read(0x08), self.read(0x09), int(self.read(0x0A) * 1.5), self.read(0x0B)
-        
-    def setIntegrationTime(self, int_time):
-        """
-        set integration time with variable int_time
-        int_time - integration time 
-            0 = 40 ms
-            1 = 80 ms
-            2 = 160 ms
-            3 = 320 ms
-            4 = 640 ms
-            5 = 1280 ms
-        """
-        if int_time < 0 or int_time > 5:
-            raise ValueError('int_time is not in range')
-        conf = self.read(0x00) & 0x0003
-        self.write(0x00, (conf | (int_time << 4)))
-        
+        red = self.getRed()
+        time.sleep(0.005)
+        green = self.getGreen()
+        time.sleep(0.005)
+        blue = self.getBlue()
+        time.sleep(0.005)
+        white = self.getWhite()
+        return red, green, blue, white
+
     def forceMode(self):
         """
         forces measurement mode - triggers to start
         """
-        conf = (self.read(0x00) & 0x0072) | 0x0002
-        self.write(0x00, conf)
+        config = self.read(self.REG_CONF)
+        config &= self.MASK_INTEGRATION_TIME
+        config |= self.BIT_AF
+        config |= self.BIT_TRIG
+        config &= ~self.BIT_SD
+        self.write(self.REG_CONF, config)
+        time.sleep(self._INTEGRATION_TIME_DELAY[self.integration_time])
         
     def autoMode(self):
         """
         automatic measurement mode
         """
-        conf = self.read(0x00) & 0x0070
-        self.write(0x00, conf)
+        config = self.read(self.REG_CONF)
+        config &= self.MASK_INTEGRATION_TIME
+        config &= ~self.BIT_AF
+        config &= ~self.BIT_TRIG
+        config &= ~self.BIT_SD
+        self.write(self.REG_CONF, config)
+        time.sleep(self._INTEGRATION_TIME_DELAY[self.integration_time])
     
     def readAll(self):
         """
         returns most recognized colour and raw values
         """
-        r, g, b, w = self.getRGBW()
-        raw_val = [r, g, b, w]
-        dominant_col, dominant_val = "red", r
-        if g > dominant_val: dominant_col, dominant_val = "green", g
-        if b > dominant_val: dominant_col, dominant_val = "blue", b
-        
-        return dominant_col, raw_val
+        red, green, blue, white = self.getRGBW()
+        values = {
+            "red": red,
+            "green": green,
+            "blue": blue,
+        }
+
+        dominant_color = max(values, key=values.get)
+        return dominant_color, [red, green, blue, white]

{joypi_advanced_raspberrypi-2.0.0.dist-info → joypi_advanced_raspberrypi-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: JoyPi_Advanced_RaspberryPi
-Version: 2.0.0
+Version: 2.0.2
 Summary: This library enables usage of some sensors and actors of the Joy-Pi Advanced on the Raspberry Pi.
 Project-URL: Homepage, https://github.com/joy-it/JoyPi_Advanced_RaspberryPi
 Project-URL: Issues, https://github.com/joy-it/JoyPi_Advanced_RaspberryPi/issues
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 This library is a collection for the Raspberry Pi for several modules on the Joy-Pi Advanced. See [here](https://www.joy-pi.net) for more information.
 
 ## Included modules
+
 This library includes the following modules:
 - ADC
 - Gyroscope
@@ -25,9 +26,6 @@ This library includes the following modules:
 - Servo Motor
 - Stepper Motor
 
-> [!WARNING]
-> The Joy-Pi Advanced 2 is no longer compatible with this library for the LED Matrix. To ensure compatibility with the Raspberry Pi 5, the LED matrix is now controlled via I²C because of the RP2040 microcontroller chip. The LED matrix can now be controlled with the Joy-Pi Advanced via [this repository](http://github.com/joy-it/JoyPi_RGB_Matrix_RaspberryPi).
-
 ## Dependencies
 This library has some dependencies which are used to control the modules of the Joy Pi Advanced. To use this library, you will need to install the following dependencies:
 
@@ -36,8 +34,8 @@ This library has some dependencies which are used to control the modules of the
 - [`Adafruit_CircuitPython_MCP230xx`](https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx) - for the button matrix - with `pip install adafruit-circuitpython-mcp230xx` 
 
 ## Installation
-```
-pip install JoyPi_Advanced_RaspberryPi
+```bash
+pip install JoyPi-Advanced-RaspberryPi
 ```
 ## Library Guide
 ### ADC

{joypi_advanced_raspberrypi-2.0.0.dist-info → joypi_advanced_raspberrypi-2.0.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
-JoyPi_Advanced_RaspberryPi/LEDMatrix.py,sha256=8JNh0ohQopWtbCIX28R5eOXBPeopK0b0lDJQfMOjaM4,5386
+JoyPi_Advanced_RaspberryPi/LEDMatrix.py,sha256=6788XNV3Hj5aoUmYjdk9uF-ItiE3oTjyR4bVg3UIQQs,4985
 JoyPi_Advanced_RaspberryPi/__init__.py,sha256=f3EEO5VotY0d15Cr35XwMq7iQ1SSwYId-gf-qrCba_o,339
 JoyPi_Advanced_RaspberryPi/adc.py,sha256=uD8kx5AQzXrzkqTWWQsznt6Tmp--rxhD1XrmmlfizoQ,2851
 JoyPi_Advanced_RaspberryPi/barometer.py,sha256=Pvhtg77Fi9LMMIrnrmDk9MBdnho93kzy574HNbbt698,3503
 JoyPi_Advanced_RaspberryPi/buttonmatrix.py,sha256=REaGy0q2C0iYvoDr2WidsITNT67dp49il6u9eVNkSCY,4369
-JoyPi_Advanced_RaspberryPi/colour.py,sha256=ExkvKWuBeBnu344YoJhFYRoDhq1hK0wMzKkZkJ7WZBM,3987
+JoyPi_Advanced_RaspberryPi/colour.py,sha256=lQbBE5dASpuz6TQVqJX8uIYBowYPOD1opcnIKJrN0uE,7575
 JoyPi_Advanced_RaspberryPi/gyroscope.py,sha256=pP6V2upAqPfajaKcJBPrgQSSpUFVUSDId0k8uli7abw,3516
 JoyPi_Advanced_RaspberryPi/servomotor.py,sha256=H-soLiQqiyvR6gNu0LffV19QIBWAiokwg2Kc9WYzblM,3169
 JoyPi_Advanced_RaspberryPi/stepmotor.py,sha256=YpggJICaSLzTvSDpGDJK8kC2VDP6aM__I-phwGiP6dA,2957
-joypi_advanced_raspberrypi-2.0.0.dist-info/METADATA,sha256=GyP76-xTNSkhb9f-z66YJks5wykuM1Dsy44vuJBZkXc,5393
-joypi_advanced_raspberrypi-2.0.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-joypi_advanced_raspberrypi-2.0.0.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-joypi_advanced_raspberrypi-2.0.0.dist-info/RECORD,,
+joypi_advanced_raspberrypi-2.0.2.dist-info/METADATA,sha256=LxP3yzXW7sSHM8EIe6ZYcpHk_I1-Ev6iP0MHtxnWstk,5023
+joypi_advanced_raspberrypi-2.0.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+joypi_advanced_raspberrypi-2.0.2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+joypi_advanced_raspberrypi-2.0.2.dist-info/RECORD,,

{joypi_advanced_raspberrypi-2.0.0.dist-info → joypi_advanced_raspberrypi-2.0.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any