Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e55647d8f7 | |||
| 895a5e5458 | |||
| ee8b718621 |
30 changed files with 596 additions and 24 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
./*.pio.h
|
||||
protodemo
|
||||
./build
|
||||
|
|
|
|||
339
LICENSE
Normal file
339
LICENSE
Normal file
|
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
BIN
examples/blinka64x64.png
Normal file
BIN
examples/blinka64x64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
12
examples/simpletest.py
Normal file
12
examples/simpletest.py
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
import pathlib
|
||||
|
||||
import adafruit_raspberry_pi5_piomatter
|
||||
import numpy as np
|
||||
import PIL.Image as Image
|
||||
|
||||
g = adafruit_raspberry_pi5_piomatter.Geometry(64, 64, 4, rotation=adafruit_raspberry_pi5_piomatter.Orientation.Normal)
|
||||
arr = np.asarray(Image.open(pathlib.Path(__file__).parent / "blinka64x64.png"))
|
||||
m = adafruit_raspberry_pi5_piomatter.AdafruitMatrixBonnetRGB888Packed(arr, g)
|
||||
m.show()
|
||||
|
||||
input("Hit enter to exit")
|
||||
22
pyproject.toml
Normal file
22
pyproject.toml
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[build-system]
|
||||
requires = [
|
||||
"setuptools>=42",
|
||||
"pybind11>=2.10.0",
|
||||
"setuptools_scm[toml]>=6.2",
|
||||
]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[tool.setuptools_scm]
|
||||
|
||||
[tool.ruff]
|
||||
extend-select = [
|
||||
"B", # flake8-bugbear
|
||||
"I", # isort
|
||||
"PGH", # pygrep-hooks
|
||||
"RUF", # Ruff-specific
|
||||
"UP", # pyupgrade
|
||||
]
|
||||
extend-ignore = [
|
||||
"E501", # Line too long
|
||||
]
|
||||
target-version = "py311"
|
||||
39
setup.py
Normal file
39
setup.py
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Available at setup time due to pyproject.toml
|
||||
from pybind11.setup_helpers import Pybind11Extension, build_ext
|
||||
from setuptools import setup
|
||||
from setuptools_scm import get_version
|
||||
|
||||
__version__ = get_version()
|
||||
|
||||
# The main interface is through Pybind11Extension.
|
||||
# * You can add cxx_std=11/14/17, and then build_ext can be removed.
|
||||
# * You can set include_pybind11=false to add the include directory yourself,
|
||||
# say from a submodule.
|
||||
|
||||
ext_modules = [
|
||||
Pybind11Extension("adafruit_raspberry_pi5_piomatter",
|
||||
["src/pymain.cpp", "src/piolib/piolib.c", "src/piolib/pio_rp1.c"],
|
||||
define_macros = [('VERSION_INFO', __version__)],
|
||||
include_dirs = ['./src/include', './src/piolib/include'],
|
||||
cxx_std=20,
|
||||
# use this setting when debugging
|
||||
extra_compile_args = ["-g3", "-Og"],
|
||||
),
|
||||
]
|
||||
|
||||
setup(
|
||||
name="Adafruit-Blinka-Raspberry-Pi5-Neopixel",
|
||||
version=__version__,
|
||||
url="https://github.com/adafruit/Adafruit_Blinka_Raspberry_Pi5_Neopixel",
|
||||
description="HUB75 matrix driver for Raspberry Pi 5 using PIO",
|
||||
long_description="A pio-based driver",
|
||||
ext_modules=ext_modules,
|
||||
# Currently, build_ext only provides an optional "highest supported C++
|
||||
# level" feature, but in the future it may provide more features.
|
||||
cmdclass={"build_ext": build_ext},
|
||||
zip_safe=False,
|
||||
python_requires=">=3.11",
|
||||
extras_require={
|
||||
'docs': ["sphinx", "sphinx-rtd-theme", "sphinxcontrib-jquery"],
|
||||
},
|
||||
)
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
import sys
|
||||
from contextlib import contextmanager
|
||||
import click
|
||||
|
||||
import adafruit_pioasm
|
||||
import click
|
||||
|
||||
|
||||
@contextmanager
|
||||
def temporary_stdout(filename):
|
||||
|
|
@ -7,6 +7,8 @@ namespace piomatter {
|
|||
|
||||
using matrix_map = std::vector<int>;
|
||||
|
||||
enum orientation { normal, r180, ccw, cw };
|
||||
|
||||
int orientation_normal(int width, int height, int x, int y) {
|
||||
return x + width * y;
|
||||
}
|
||||
|
|
@ -41,22 +43,22 @@ void submap(std::vector<int> &result, int width, int height, int start_x,
|
|||
} // namespace
|
||||
|
||||
template <typename Cb>
|
||||
matrix_map make_matrixmap(int width, int height, int n_addr_lines,
|
||||
matrix_map make_matrixmap(size_t width, size_t height, size_t n_addr_lines,
|
||||
bool serpentine, const Cb &cb) {
|
||||
|
||||
int panel_height = 2 << n_addr_lines;
|
||||
size_t panel_height = 2 << n_addr_lines;
|
||||
if (height % panel_height != 0) {
|
||||
throw std::range_error("Height does not evenly divide panel height");
|
||||
}
|
||||
|
||||
int half_panel_height = 1 << n_addr_lines;
|
||||
int v_panels = height / panel_height;
|
||||
int pixels_across = width * v_panels;
|
||||
size_t half_panel_height = 1u << n_addr_lines;
|
||||
size_t v_panels = height / panel_height;
|
||||
size_t pixels_across = width * v_panels;
|
||||
matrix_map result;
|
||||
result.reserve(width * height);
|
||||
|
||||
for (int i = 0; i < half_panel_height; i++) {
|
||||
for (int j = 0; j < pixels_across; j++) {
|
||||
for (size_t i = 0; i < half_panel_height; i++) {
|
||||
for (size_t j = 0; j < pixels_across; j++) {
|
||||
int panel_no = j / width;
|
||||
int panel_idx = j % width;
|
||||
int x, y0, y1;
|
||||
|
|
@ -80,19 +82,21 @@ matrix_map make_matrixmap(int width, int height, int n_addr_lines,
|
|||
|
||||
struct matrix_geometry {
|
||||
template <typename Cb>
|
||||
matrix_geometry(int pixels_across, int n_addr_lines, int n_planes,
|
||||
int width, int height, bool serpentine, const Cb &cb)
|
||||
matrix_geometry(size_t pixels_across, size_t n_addr_lines, int n_planes,
|
||||
size_t width, size_t height, bool serpentine, const Cb &cb)
|
||||
: pixels_across(pixels_across), n_addr_lines(n_addr_lines),
|
||||
n_planes(n_planes), width(width),
|
||||
height(height), map{make_matrixmap(width, height, n_addr_lines,
|
||||
serpentine, cb)} {
|
||||
int pixels_down = 2 << n_addr_lines;
|
||||
size_t pixels_down = 2u << n_addr_lines;
|
||||
if (map.size() != pixels_down * pixels_across) {
|
||||
throw std::range_error(
|
||||
"map size does not match calculated pixel count");
|
||||
}
|
||||
}
|
||||
int pixels_across, n_addr_lines, n_planes, width, height;
|
||||
size_t pixels_across, n_addr_lines;
|
||||
int n_planes;
|
||||
size_t width, height;
|
||||
matrix_map map;
|
||||
};
|
||||
} // namespace piomatter
|
||||
|
|
@ -29,6 +29,10 @@ void pio_sm_xfer_data_large(PIO pio, int sm, int direction, size_t size,
|
|||
}
|
||||
|
||||
struct piomatter_base {
|
||||
piomatter_base() {}
|
||||
piomatter_base(const piomatter_base &) = delete;
|
||||
piomatter_base &operator=(const piomatter_base &) = delete;
|
||||
|
||||
virtual ~piomatter_base() {}
|
||||
virtual void show() = 0;
|
||||
};
|
||||
|
|
@ -32,11 +32,11 @@ struct gamma_lut {
|
|||
void convert_rgb888_packed_to_rgb10(std::vector<uint32_t> &result,
|
||||
std::span<const uint8_t> source) {
|
||||
result.resize(source.size() / 3);
|
||||
for (size_t i = 0; i < source.size(); i += 3) {
|
||||
for (size_t i = 0, j = 0; i < source.size(); i += 3) {
|
||||
uint32_t r = source[i + 0] & 0xff;
|
||||
uint32_t g = source[i + 1] & 0xff;
|
||||
uint32_t b = source[i + 2] & 0xff;
|
||||
result[i] = (convert(r) << 20) | (convert(g) << 10) | convert(b);
|
||||
result[j++] = (convert(r) << 20) | (convert(g) << 10) | convert(b);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -73,6 +73,9 @@ struct gamma_lut {
|
|||
|
||||
struct colorspace_rgb565 {
|
||||
using data_type = uint16_t;
|
||||
static constexpr size_t data_size_in_bytes(size_t n_pixels) {
|
||||
return sizeof(data_type) * n_pixels;
|
||||
}
|
||||
|
||||
colorspace_rgb565(float gamma = 2.2) : lut{gamma} {}
|
||||
gamma_lut lut;
|
||||
|
|
@ -86,6 +89,9 @@ struct colorspace_rgb565 {
|
|||
|
||||
struct colorspace_rgb888 {
|
||||
using data_type = uint32_t;
|
||||
static constexpr size_t data_size_in_bytes(size_t n_pixels) {
|
||||
return sizeof(data_type) * n_pixels;
|
||||
}
|
||||
|
||||
colorspace_rgb888(float gamma = 2.2) : lut{gamma} {}
|
||||
gamma_lut lut;
|
||||
|
|
@ -99,6 +105,9 @@ struct colorspace_rgb888 {
|
|||
|
||||
struct colorspace_rgb888_packed {
|
||||
using data_type = uint8_t;
|
||||
static constexpr size_t data_size_in_bytes(size_t n_pixels) {
|
||||
return sizeof(data_type) * n_pixels * 3;
|
||||
}
|
||||
|
||||
colorspace_rgb888_packed(float gamma = 2.2) : lut{gamma} {}
|
||||
gamma_lut lut;
|
||||
|
|
@ -198,19 +207,22 @@ void protomatter_render_rgb10(std::vector<uint32_t> &result,
|
|||
};
|
||||
|
||||
int last_bit = 0;
|
||||
int prev_addr = 7;
|
||||
// illuminate the right row for data in the shift register (the previous
|
||||
// address)
|
||||
|
||||
const size_t n_addr = 1u << matrixmap.n_addr_lines;
|
||||
const int n_planes = matrixmap.n_planes;
|
||||
constexpr size_t n_bits = 10u;
|
||||
unsigned offset = n_bits - n_planes;
|
||||
const size_t pixels_across = matrixmap.pixels_across;
|
||||
|
||||
size_t prev_addr = n_addr - 1;
|
||||
uint32_t addr_bits = calc_addr_bits(prev_addr);
|
||||
|
||||
const auto n_addr = 1u << matrixmap.n_addr_lines;
|
||||
const auto n_planes = matrixmap.n_planes;
|
||||
constexpr auto n_bits = 10u;
|
||||
unsigned offset = n_bits - n_planes;
|
||||
const auto pixels_across = matrixmap.pixels_across;
|
||||
|
||||
for (int addr = 0; addr < n_addr; addr++) {
|
||||
for (size_t addr = 0; addr < n_addr; addr++) {
|
||||
// printf("addr=%zu/%zu\n", addr, n_addr);
|
||||
for (int bit = n_planes - 1; bit >= 0; bit--) {
|
||||
// printf("bit=%d/%d\n", bit, n_planes);
|
||||
uint32_t r = 1 << (20 + offset + bit);
|
||||
uint32_t g = 1 << (10 + offset + bit);
|
||||
uint32_t b = 1 << (0 + offset + bit);
|
||||
|
|
@ -223,7 +235,7 @@ void protomatter_render_rgb10(std::vector<uint32_t> &result,
|
|||
|
||||
prep_data(2 * pixels_across);
|
||||
auto mapiter = matrixmap.map.begin() + 2 * addr * pixels_across;
|
||||
for (int x = 0; x < pixels_across; x++) {
|
||||
for (size_t x = 0; x < pixels_across; x++) {
|
||||
assert(mapiter != matrixmap.map.end());
|
||||
auto pixel0 = pixels[*mapiter++];
|
||||
auto r0 = pixel0 & r;
|
||||
|
|
@ -794,7 +794,7 @@ static void rp1_gpio_set_drive_strength(PIO pio, uint gpio,
|
|||
|
||||
static void rp1_pio_gpio_init(PIO pio, uint pin) {
|
||||
valid_params_if(PIO, pin < RP1_PIO_GPIO_COUNT);
|
||||
rp1_gpio_set_function(pio, pin, (gpio_function)RP1_GPIO_FUNC_PIO);
|
||||
rp1_gpio_set_function(pio, pin, (enum gpio_function)RP1_GPIO_FUNC_PIO);
|
||||
}
|
||||
|
||||
PIO rp1_create_instance(PIO_CHIP_T *chip, uint index) {
|
||||
137
src/pymain.cpp
Normal file
137
src/pymain.cpp
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
#include <iostream>
|
||||
#include <pybind11/pybind11.h>
|
||||
#include <string>
|
||||
|
||||
#include "piomatter/piomatter.h"
|
||||
|
||||
#define STRINGIFY(x) #x
|
||||
#define MACRO_STRINGIFY(x) STRINGIFY(x)
|
||||
|
||||
namespace py = pybind11;
|
||||
|
||||
namespace {
|
||||
struct PyPiomatter {
|
||||
PyPiomatter(py::buffer buffer,
|
||||
std::unique_ptr<piomatter::piomatter_base> &&matter)
|
||||
: buffer{buffer}, matter{std::move(matter)} {}
|
||||
py::buffer buffer;
|
||||
std::unique_ptr<piomatter::piomatter_base> matter;
|
||||
|
||||
void show() { matter->show(); }
|
||||
};
|
||||
|
||||
template <typename pinout, typename colorspace>
|
||||
std::unique_ptr<PyPiomatter>
|
||||
make_piomatter(py::buffer buffer, const piomatter::matrix_geometry &geometry) {
|
||||
using cls = piomatter::piomatter<pinout, colorspace>;
|
||||
using data_type = colorspace::data_type;
|
||||
|
||||
const auto n_pixels = geometry.width * geometry.height;
|
||||
const auto data_size_in_bytes = colorspace::data_size_in_bytes(n_pixels);
|
||||
const py::buffer_info info = buffer.request();
|
||||
const size_t buffer_size_in_bytes = info.size * info.itemsize;
|
||||
|
||||
if (buffer_size_in_bytes != data_size_in_bytes) {
|
||||
throw std::runtime_error(
|
||||
py::str(
|
||||
"Framebuffer size must be {} bytes, got a buffer of {} bytes")
|
||||
.attr("format")(data_size_in_bytes, buffer_size_in_bytes)
|
||||
.template cast<std::string>());
|
||||
}
|
||||
|
||||
std::span<data_type> framebuffer(reinterpret_cast<data_type *>(info.ptr),
|
||||
data_size_in_bytes / sizeof(data_type));
|
||||
return std::make_unique<PyPiomatter>(
|
||||
buffer, std::move(std::make_unique<cls>(framebuffer, geometry)));
|
||||
}
|
||||
} // namespace
|
||||
|
||||
PYBIND11_MODULE(adafruit_raspberry_pi5_piomatter, m) {
|
||||
m.doc() = R"pbdoc(
|
||||
HUB75 matrix driver for Raspberry Pi 5 using PIO
|
||||
------------------------------------------------
|
||||
|
||||
.. currentmodule:: adafruit_raspberry_pi5_piomatter
|
||||
|
||||
.. autosummary::
|
||||
:toctree: _generate
|
||||
|
||||
Piomatter
|
||||
)pbdoc";
|
||||
|
||||
py::enum_<piomatter::orientation>(m, "Orientation")
|
||||
.value("Normal", piomatter::orientation::normal)
|
||||
.value("R180", piomatter::orientation::r180)
|
||||
.value("CCW", piomatter::orientation::ccw)
|
||||
.value("CW", piomatter::orientation::cw)
|
||||
//.doc() = "Describes the orientation of a panel"
|
||||
;
|
||||
|
||||
py::class_<piomatter::matrix_geometry>(m, "Geometry")
|
||||
.def(py::init([](size_t width, size_t height, size_t n_addr_lines,
|
||||
bool serpentine, piomatter::orientation rotation,
|
||||
size_t n_planes) {
|
||||
size_t n_lines = 2 << n_addr_lines;
|
||||
size_t pixels_across = width * height / n_lines;
|
||||
size_t odd = (width * height) % n_lines;
|
||||
if (odd) {
|
||||
throw std::runtime_error(
|
||||
py::str(
|
||||
"Total pixel count {} must be a multiple of {}, "
|
||||
"the number of distinct row addresses for {}")
|
||||
.attr("format")(width * height, n_lines,
|
||||
n_addr_lines)
|
||||
.cast<std::string>());
|
||||
}
|
||||
switch (rotation) {
|
||||
case piomatter::orientation::normal:
|
||||
return piomatter::matrix_geometry(
|
||||
pixels_across, n_addr_lines, n_planes, width, height,
|
||||
serpentine, piomatter::orientation_normal);
|
||||
|
||||
case piomatter::orientation::r180:
|
||||
return piomatter::matrix_geometry(
|
||||
pixels_across, n_addr_lines, n_planes, width, height,
|
||||
serpentine, piomatter::orientation_r180);
|
||||
|
||||
case piomatter::orientation::ccw:
|
||||
return piomatter::matrix_geometry(
|
||||
pixels_across, n_addr_lines, n_planes, width, height,
|
||||
serpentine, piomatter::orientation_ccw);
|
||||
|
||||
case piomatter::orientation::cw:
|
||||
return piomatter::matrix_geometry(
|
||||
pixels_across, n_addr_lines, n_planes, width, height,
|
||||
serpentine, piomatter::orientation_cw);
|
||||
}
|
||||
throw std::runtime_error("invalid rotation");
|
||||
}),
|
||||
py::arg("width"), py::arg("height"), py::arg("n_addr_lines"),
|
||||
py::arg("serpentine") = true,
|
||||
py::arg("rotation") = piomatter::orientation::normal,
|
||||
py::arg("n_planes") = 10u)
|
||||
.def_readonly("width", &piomatter::matrix_geometry::width)
|
||||
.def_readonly("hieght", &piomatter::matrix_geometry::height)
|
||||
//.doc() = "Describes the geometry of a panel"
|
||||
;
|
||||
|
||||
py::class_<PyPiomatter>(m, "PioMatter").def("show", &PyPiomatter::show)
|
||||
//.doc() = "HUB75 matrix driver for Raspberry Pi 5 using PIO"
|
||||
;
|
||||
|
||||
m.def("AdafruitMatrixBonnetRGB888",
|
||||
make_piomatter<piomatter::adafruit_matrix_bonnet_pinout,
|
||||
piomatter::colorspace_rgb888>,
|
||||
py::arg("buffer"), py::arg("geometry"))
|
||||
//.doc() = "Drive panels connected to an Adafruit Matrix Bonnet using
|
||||
// the RGB888 memory layout (4 bytes per pixel)"
|
||||
;
|
||||
|
||||
m.def("AdafruitMatrixBonnetRGB888Packed",
|
||||
make_piomatter<piomatter::adafruit_matrix_bonnet_pinout,
|
||||
piomatter::colorspace_rgb888_packed>,
|
||||
py::arg("buffer"), py::arg("geometry"))
|
||||
// .doc() = "Drive panels connected to an Adafruit Matrix Bonnet using
|
||||
// the RGB888 packed memory layout (3 bytes per pixel)"
|
||||
;
|
||||
}
|
||||
Loading…
Reference in a new issue