Merge branch 'hzeller:master' into master

.github/workflows/c-cpp.yml

@@ -1,17 +1,22 @@
 name: C/C++ CI
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [ push, pull_request ]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        cython: [cython3-legacy, cython3]
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2
+    - name: install cython
+      run: |
+        sudo apt-get update && sudo apt-get install -y ${{ matrix.cython }}
+        cython3 --version
+    - name: regenerate python bindings
+      run: make -B -C bindings/python/rgbmatrix
     - name: make
       run: make

README.md

@@ -41,12 +41,16 @@ Check out [utils/ directory for some ready-made tools](./utils) to get started
 using the library, or the [examples-api-use/](./examples-api-use) directory if
 you want to get started programming your own utils.
 
-All Raspberry Pi versions supported
------------------------------------
+Raspberry Pi up to 4 supported
+------------------------------
+
+This library supports the old Raspberry Pi's Version 1 with 26 pin header and
+also the B+ models, the Pi Zero, Raspberry Pi 2 and 3 with 40 pins, as well
+as the Compute Modules which have 44 GPIOs.
+
+The Raspberry Pi 5 still needs some research into the vastly changed peripherals
+and is not yet supported.
 
-This supports the old Raspberry Pi's Version 1 with 26 pin header and also the
-B+ models, the Pi Zero, Raspberry Pi 2 and 3 with 40 pins, as well as the
-Compute Modules which have 44 GPIOs.
 The 26 pin models can drive one chain of RGB panels, the 40 pin models
 **up to three** chains in parallel (each chain 12 or more panels long).
 The Compute Module can drive **up to 6 chains in parallel**.
@@ -380,6 +384,20 @@ Use this also if you want to have a stable baseline refresh rate when using
 the vsync-multiple flag `-V` in the [led-image-viewer] or
 [video-viewer] utility programs.
 
+```
+--led-no-busy-waiting     : Don't use busy waiting when limiting refresh rate.
+```
+
+This allows to switch from busy waiting to sleep waiting when limiting the
+refresh rate (`--led-limit-refresh`).
+
+By default, refresh rate limiting uses busy waiting, which is CPU intensive but
+gives most accurate timings. This is fine for multi-core boards.
+
+On single core boards (e.g.: Raspberry Pi Zero) busy waiting makes the system
+unresponsive for other/background tasks. There, sleep waiting improves the
+system's responsiveness at the cost of slightly less accurate timings.
+
 ```
 --led-scan-mode=<0..1>    : 0 = progressive; 1 = interlaced (Default: 0).
 ```
@@ -445,7 +463,7 @@ to debug if it has something to do with the sound subsystem (see Troubleshooting
 section). This is really only recommended for debugging; typically you actually
 want the hardware pulses as it results in a much more stable picture.
 
-<a name="no-drop-priv"/>
+<a name="no-drop-priv"></a>
 
 ```
 --led-no-drop-privs       : Don't drop privileges from 'root' after initializing the hardware.

bindings/c#/examples/PlayGIF/PlayGIF.csproj

@@ -7,6 +7,6 @@
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\RPiRgbLEDMatrix.csproj" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
     </ItemGroup>
 </Project>

bindings/c#/examples/PlayGIF/Program.cs

@@ -1,6 +1,9 @@
 using RPiRgbLEDMatrix;
 using System.Runtime.InteropServices;
 using Color = RPiRgbLEDMatrix.Color;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 
 Console.Write("GIF path: ");
 var path = Console.ReadLine()!;

bindings/python/Makefile

@@ -1,5 +1,5 @@
 # TODO: This contains a lot of {c|p}ython build boilerplate, this needs cleanup.
-PYTHON     ?= python
+PYTHON     ?= python3
 SETUP      := setup.py
 BUILD_ARGS := build --build-lib .
 INST_ARGS  := install
@@ -64,6 +64,7 @@ clean-python-%:
 	$(PYTHON)$* $(SETUP) $(CLEAN_ARGS)
 else
 build-python: $(RGB_LIBRARY)
+	$(MAKE) -C rgbmatrix
 	$(PYTHON) $(SETUP) $(BUILD_ARGS)
 
 install-python:

bindings/python/README.md

@@ -10,21 +10,12 @@ the hardware in question (see below for setting it via command line argument).
 
 Then, in the root directory for the matrix library simply type:
 
-### Python 2
-
-```shell
-sudo apt-get update && sudo apt-get install python2.7-dev python-pillow -y
-make build-python
-sudo make install-python
-```
-
 ### Python 3
-You can also build for Python 3:
 
 ```shell
-sudo apt-get update && sudo apt-get install python3-dev python3-pillow -y
-make build-python PYTHON=$(command -v python3)
-sudo make install-python PYTHON=$(command -v python3)
+sudo apt-get update && sudo apt-get install python3-dev cython3 -y
+make build-python 
+sudo make install-python 
 ```
 
 ### PyPy

bindings/python/rgbmatrix/.gitignore

@@ -0,0 +1,2 @@
+core.cpp
+graphics.cpp

bindings/python/rgbmatrix/Makefile

@@ -4,7 +4,7 @@
 # Please check in modified *.cpp files with distribution to not require cython
 # to be installed on the users' machine.
 # for python3: make PYTHON=$(which python3) CYTHON=$(which cython3)
-CYTHON ?= cython
+CYTHON ?= cython3
 
 all : core.cpp graphics.cpp