Compare commits

...

60 commits

Author SHA1 Message Date
2a1ba8fa47 _PM_stop: Don't HardFault when _PM_begin failed
When _PM_begin fails, it leaves the object in a partially-uninitialized
state.  To recover any allocated storage, we need to call _PM_free;
but if the allocation of core->screenData failed, then other internal
pointers such as core->oe.setReg are not set, and the actions in
_PM_stop will cause a HardFault.

This is a partial fix for adafruit/circuitpython#3184.
2020-08-28 11:03:43 -05:00
Lucian Copeland
761d6437e8 Fix NRF compile warning issue 2020-07-16 12:03:04 -04:00
hierophect
4c8bed2303
Merge branch 'master' into cpy-timer-allocator 2020-07-13 17:25:47 -04:00
Lucian Copeland
07015d5cb5 cpy-timer-allocator 2020-07-13 17:24:37 -04:00
Phillip Burgess
00e00ee8ac Teensy4: change one delayMicroseconds() to _PM_delayMicroseconds() 2020-07-13 10:16:01 -07:00
Paint Your Dragon
0651691425
Merge pull request #12 from adafruit/teensy4
Initial Teensy 4.0/4.1 support
2020-05-23 15:40:40 -07:00
Phillip Burgess
af5c045b6b Bump version # for initial Teensy 4 support 2020-05-23 14:18:11 -07:00
Phillip Burgess
017ba00ab4 Teensy 4 adjustments
See recent issue (roadmap) about dealing with timing better in the future
2020-05-22 19:38:00 -07:00
Phillip Burgess
8c53b2515c Teensy 4.1 WIP (works, but broke other boards) 2020-05-21 18:19:39 -07:00
Phillip Burgess
7daa236e41 Add Teensy4 pinout to doublebuffer example 2020-05-20 11:40:31 -07:00
Phillip Burgess
2b4489d809 clang-format let's try that again 2020-05-19 18:19:22 -07:00
Phillip Burgess
0bb0dea200 clang-format fix 2020-05-19 18:14:35 -07:00
Phillip Burgess
9b015cecd6 Add 2- and 4-way PEW unrolling 2020-05-19 17:52:31 -07:00
Phillip Burgess
5a8428975c Change nRF pinout for new FeatherWing 2020-05-18 16:28:02 -07:00
Phillip Burgess
f0ea03cecd Inexplicable delay for Teensy 4 2020-05-15 20:14:30 -07:00
Phillip Burgess
a3efbfbfdc Moar Teensy 4 WIP 2020-05-15 20:08:34 -07:00
Phillip Burgess
60414a4d0d Teensy 4 getting closer 2020-05-15 17:35:10 -07:00
Phillip Burgess
3e64c1e127 Teensy 4 WIP (timer runs, IO needs work) 2020-05-15 13:30:27 -07:00
Phillip Burgess
8c8d096f15 Teensy 4 timer WIP (compiles, doesn't work yet) 2020-05-15 13:24:24 -07:00
Phillip Burgess
b135ae26e5 Teensy bit of Teensy progress, WIP 2020-05-14 17:21:17 -07:00
Phillip Burgess
2ad6f03357 Some very early initial i.MX work 2020-05-14 15:23:37 -07:00
Limor "Ladyada" Fried
f27da0d358
Merge pull request #9 from adafruit/actionsci
Switch to Actions CI
2020-05-11 19:29:22 -04:00
Phillip Burgess
aa8411cc30 Second try at githubci.yml platforms 2020-05-11 16:20:04 -07:00
Phillip Burgess
e38c872cca Fix(?) build platforms for Actions 2020-05-11 15:38:12 -07:00
Phillip Burgess
e9db308764 Actions conversion 2020-05-11 15:21:34 -07:00
Paint Your Dragon
ac1b8e07b7
Merge pull request #7 from jepler/circuitpython-build-fix
fix circuitpython build error
2020-05-08 17:03:38 -07:00
Paint Your Dragon
63b4df7435
Merge pull request #8 from adafruit/esp32
ESP32 support, tested, works
2020-05-08 17:00:38 -07:00
Phillip Burgess
9f88b5a74c Update doublebuffer demo for ESP32 2020-05-08 16:37:22 -07:00
Phillip Burgess
7dbdf19c1d ESP32 fixes (looks OK on scope, untested on matrix) 2020-05-08 14:04:02 -07:00
Phillip Burgess
d405666d8a ESP32 pin notes 2020-05-08 09:37:55 -07:00
3a817d6057 fix circuitpython build error
In a51676db5e ("clang-format the lot"), headers were re-ordered.
This is not a change that makes no difference, and caused CircuitPython
to stop building:

../../lib/protomatter/arch.h: In function '_PM_convert_565_word':
../../lib/protomatter/arch.h:1114:3: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration]
 1114 |   memset(dest, 0, core->bufferSize);
      |   ^~~~~~
../../lib/protomatter/arch.h:1114:3: error: incompatible implicit declaration of built-in function 'memset' [-Werror]
../../lib/protomatter/arch.h:147:1: note: include '<string.h>' or provide a declaration of 'memset'

However, the real fix is to include in arch.h any header that MUST have its
declarations visible for the header to be self-supporting; do so.
2020-05-07 18:28:55 -05:00
Phillip Burgess
160dd0af4b ESP32 WIP, using higher-level timer funcs 2020-05-07 13:48:15 -07:00
Phillip Burgess
597c56e658 ESP32 WIP continues 2020-05-06 10:44:51 -07:00
Phillip Burgess
78d4c9bb15 ESP32 WIP 2020-05-05 21:23:18 -07:00
Phillip Burgess
4cbf99aa54 Fix clang-format detail 2020-04-30 15:35:13 -07:00
Phillip Burgess
a51676db5e clang-format the lot 2020-04-30 15:30:24 -07:00
Phillip Burgess
40cb6a9cac Use TC3 on SAMD's that lack a TC4 2020-04-30 15:18:18 -07:00
Phillip Burgess
87a95379b5 Create .travis.yml 2020-04-30 15:04:41 -07:00
Phillip Burgess
8968259c14 Doxygenate 2020-04-30 13:53:15 -07:00
Phillip Burgess
fc180e4689 Update README.md for Travis and library.properties for version # 2020-04-30 10:26:21 -07:00
Phillip Burgess
9f71088d2c Update core.c 2020-04-30 10:00:07 -07:00
Paint Your Dragon
973de07bfc
Merge pull request #6 from jepler/port-stm32f405
Port  to stm32f405
2020-04-30 09:49:18 -07:00
1b8f461f64 Port to STM32F405, other stm-series micros likely to follow
Testing performed: With the STM32F405 Feather, all expected pins waggle
on a logic probe.  I didn't hook up an actual matrix yet.
2020-04-30 08:55:53 -05:00
241bf2516c circuitpython: fix nRF, samd byte/word offset macros
Before, these would only work properly with pins from the first
GPIO bank.
2020-04-30 08:55:53 -05:00
41a92d7731 Allow GPIO registers to have a size _other than_ 32 bits, for stm32
stm32's GPIO set/clear registers are effectively 16 bits big,
unlike other platforms encountered so far.

Introduce macros to set/clear registers, and use them.

Later, stm32 will introduce its own definition of the _PM_PORT_TYPE macro
as uint16_t.

Testing performed: compile-tested on nRF.
2020-04-30 08:55:53 -05:00
Phillip Burgess
fac7eea645 Arg fix in .cpp for recent refactor 2020-04-19 10:54:34 -07:00
Paint Your Dragon
3bc6f23541
Merge pull request #2 from jepler/circuitpython
Port to Circuitpython
2020-04-13 10:32:35 -07:00
c411714cbd circuitpython: nrf port 2020-04-01 11:57:16 -05:00
c3a3e35731 Factor out _PM_convert_565, _PM_swapbuffer_maybe 2020-03-20 10:12:32 -05:00
7f448357d0 Merge remote-tracking branch 'origin/master' into circuitpython 2020-03-20 10:04:21 -05:00
969672dff1 Adapt to CircuitPython / samd51 2020-03-20 10:02:57 -05:00
Paint Your Dragon
5a1151db28
Merge pull request #4 from adafruit/nrf52
Initial nRF52 support, tested on 64x32 matrix
2020-03-17 17:38:42 -07:00
Phillip Burgess
e1659f270c nRF52840 tested and WORKING 2020-03-17 17:36:46 -07:00
Phillip Burgess
20c3b67bc3 nRF52 seems to work with some caveats
Plane-zero interval is hardcoded for now. Haven’t connected to matrix yet, just looking on scope.
2020-03-17 15:18:52 -07:00
Phillip Burgess
103ea89935 nRF52: timer oopsie + pin sudoku 2020-03-17 13:12:13 -07:00
Phillip Burgess
51f39d9594 More nRF fiddling (not yet working) 2020-03-17 12:33:12 -07:00
Paint Your Dragon
0958b759a5
Merge pull request #3 from adafruit/nrf52
SAMD21 fixes & cleanup, initial nRF52 attempt (not yet working)
2020-03-16 22:35:32 -07:00
Phillip Burgess
97c2122ba7 nRF timer almost starting to semi-work 2020-03-16 22:31:33 -07:00
Phillip Burgess
250675d2fc Pin changes for nRF52 2020-03-16 16:37:52 -07:00
Phillip Burgess
831a253898 nRF, initial GPIO stuff, very WIP 2020-03-16 15:49:58 -07:00
13 changed files with 2540 additions and 1168 deletions

46
.github/ISSUE_TEMPLATE.md vendored Normal file
View file

@ -0,0 +1,46 @@
Thank you for opening an issue on an Adafruit Arduino library repository. To
improve the speed of resolution please review the following guidelines and
common troubleshooting steps below before creating the issue:
- **Do not use GitHub issues for troubleshooting projects and issues.** Instead use
the forums at http://forums.adafruit.com to ask questions and troubleshoot why
something isn't working as expected. In many cases the problem is a common issue
that you will more quickly receive help from the forum community. GitHub issues
are meant for known defects in the code. If you don't know if there is a defect
in the code then start with troubleshooting on the forum first.
- **If following a tutorial or guide be sure you didn't miss a step.** Carefully
check all of the steps and commands to run have been followed. Consult the
forum if you're unsure or have questions about steps in a guide/tutorial.
- **For Arduino projects check these very common issues to ensure they don't apply**:
- For uploading sketches or communicating with the board make sure you're using
a **USB data cable** and **not** a **USB charge-only cable**. It is sometimes
very hard to tell the difference between a data and charge cable! Try using the
cable with other devices or swapping to another cable to confirm it is not
the problem.
- **Be sure you are supplying adequate power to the board.** Check the specs of
your board and plug in an external power supply. In many cases just
plugging a board into your computer is not enough to power it and other
peripherals.
- **Double check all soldering joints and connections.** Flakey connections
cause many mysterious problems. See the [guide to excellent soldering](https://learn.adafruit.com/adafruit-guide-excellent-soldering/tools) for examples of good solder joints.
- **Ensure you are using an official Arduino or Adafruit board.** We can't
guarantee a clone board will have the same functionality and work as expected
with this code and don't support them.
If you're sure this issue is a defect in the code and checked the steps above
please fill in the following fields to provide enough troubleshooting information.
You may delete the guideline and text above to just leave the following details:
- Arduino board: **INSERT ARDUINO BOARD NAME/TYPE HERE**
- Arduino IDE version (found in Arduino -> About Arduino menu): **INSERT ARDUINO
VERSION HERE**
- List the steps to reproduce the problem below (if possible attach a sketch or
copy the sketch code in too): **LIST REPRO STEPS BELOW**

26
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View file

@ -0,0 +1,26 @@
Thank you for creating a pull request to contribute to Adafruit's GitHub code!
Before you open the request please review the following guidelines and tips to
help it be more easily integrated:
- **Describe the scope of your change--i.e. what the change does and what parts
of the code were modified.** This will help us understand any risks of integrating
the code.
- **Describe any known limitations with your change.** For example if the change
doesn't apply to a supported platform of the library please mention it.
- **Please run any tests or examples that can exercise your modified code.** We
strive to not break users of the code and running tests/examples helps with this
process.
Thank you again for contributing! We will try to test and integrate the change
as soon as we can, but be aware we have many GitHub repositories to manage and
can't immediately respond to every request. There is no need to bump or check in
on a pull request (it will clutter the discussion of the request).
Also don't be worried if the request is closed or not integrated--sometimes the
priorities of Adafruit's GitHub code (education, ease of use) might not match the
priorities of the pull request. Don't fret, the open source community thrives on
forks and GitHub makes it easy to keep your changes in a forked repo.
After reviewing the guidelines above you can delete this text from the pull request.

37
.github/workflows/githubci.yml vendored Normal file
View file

@ -0,0 +1,37 @@
name: Arduino Library CI
on: [pull_request, push, repository_dispatch]
jobs:
build:
strategy:
fail-fast: false
matrix:
arduino-platform: ["metro_m0", "metro_m4", "nrf52840", "esp32"]
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v1
with:
python-version: '3.x'
- uses: actions/checkout@v2
- uses: actions/checkout@v2
with:
repository: adafruit/ci-arduino
path: ci
- name: pre-install
run: bash ci/actions_install.sh
- name: test platforms
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }}
- name: clang
run: python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
- name: doxygen
env:
GH_REPO_TOKEN: ${{ secrets.GH_REPO_TOKEN }}
PRETTYNAME : "Adafruit Protomatter"
run: bash ci/doxy_gen_and_deploy.sh

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
# Our handy .gitignore for automation ease
Doxyfile*
doxygen_sqlite3.db
html

View file

@ -1,3 +1,38 @@
/*!
* @file Adafruit_Protomatter.cpp
*
* @mainpage Adafruit Protomatter RGB LED matrix library.
*
* @section intro_sec Introduction
*
* This is documentation for Adafruit's protomatter library for HUB75-style
* RGB LED matrices. It is designed to work with various matrices sold by
* Adafruit ("HUB75" is a vague term and other similar matrices are not
* guaranteed to work). This file is the Arduino-specific calls; the
* underlying C code is more platform-neutral.
*
* Adafruit invests time and resources providing this open source code,
* please support Adafruit and open-source hardware by purchasing products
* from Adafruit!
*
* @section dependencies Dependencies
*
* This library depends on
* <a href="https://github.com/adafruit/Adafruit-GFX-Library">Adafruit_GFX</a>
* being present on your system. Please make sure you have installed the
* latest version before using this library.
*
* @section author Author
*
* Written by Phil "Paint Your Dragon" Burgess and Jeff Epler for
* Adafruit Industries, with contributions from the open source community.
*
* @section license License
*
* BSD license, all text here must be included in any redistribution.
*
*/
// Arduino-specific wrapper for the Protomatter C library (provides
// constructor and so forth, builds on Adafruit_GFX). There should
// not be any device-specific #ifdefs here. See notes in core.c and
@ -5,7 +40,7 @@
#include "Adafruit_Protomatter.h" // Also includes core.h & Adafruit_GFX.h
extern Protomatter_core *_PM_protoPtr; // In core.c (via arch.h)
extern Protomatter_core *_PM_protoPtr; ///< In core.c (via arch.h)
// Overall matrix refresh rate (frames/second) is a function of matrix width
// and chain length, number of address lines, number of bit planes, CPU speed
@ -21,31 +56,32 @@ extern Protomatter_core *_PM_protoPtr; // In core.c (via arch.h)
// refresh slower than this, and in many cases will...just need to set an
// upper limit to avoid excessive CPU load). An incredibly long comment block
// for a single constant, thank you for coming to my TED talk!
#define _PM_MAX_REFRESH_HZ 250
#define _PM_MAX_REFRESH_HZ 250 ///< Upper limit (ish) to matrix refresh rate
// Time (in milliseconds) to pause following any change in address lines
// (individually or collectively). Some matrices respond slowly there...
// must pause on change for matrix to catch up. Defined here (rather than
// arch.h) because it's not architecture-specific.
#define _PM_ROW_DELAY 8
#define _PM_ROW_DELAY 8 ///< Delay time between row address line changes (ms)
Adafruit_Protomatter::Adafruit_Protomatter(
uint16_t bitWidth, uint8_t bitDepth,
Adafruit_Protomatter::Adafruit_Protomatter(uint16_t bitWidth, uint8_t bitDepth,
uint8_t rgbCount, uint8_t *rgbList,
uint8_t addrCount, uint8_t *addrList,
uint8_t clockPin, uint8_t latchPin, uint8_t oePin,
bool doubleBuffer, void *timer) :
GFXcanvas16(bitWidth, (2 << min(addrCount, 5)) * min(rgbCount, 5)) {
if(bitDepth > 6) bitDepth = 6; // GFXcanvas16 color limit (565)
uint8_t clockPin, uint8_t latchPin,
uint8_t oePin, bool doubleBuffer,
void *timer)
: GFXcanvas16(bitWidth,
(2 << min((int)addrCount, 5)) * min((int)rgbCount, 5)) {
if (bitDepth > 6)
bitDepth = 6; // GFXcanvas16 color limit (565)
// Arguments are passed through to the C _PM_init() function which does
// some input validation and minor allocation. Return value is ignored
// because we can't really do anything about it in a C++ constructor.
// The class begin() function checks rgbPins for NULL to determine
// whether to proceed or indicate an error.
(void)_PM_init(&core, bitWidth, bitDepth, rgbCount, rgbList,
addrCount, addrList, clockPin, latchPin, oePin, doubleBuffer, timer);
(void)_PM_init(&core, bitWidth, bitDepth, rgbCount, rgbList, addrCount,
addrList, clockPin, latchPin, oePin, doubleBuffer, timer);
}
Adafruit_Protomatter::~Adafruit_Protomatter(void) {
@ -55,33 +91,15 @@ Adafruit_Protomatter::~Adafruit_Protomatter(void) {
ProtomatterStatus Adafruit_Protomatter::begin(void) {
_PM_protoPtr = &core;
_PM_begin(&core);
return PROTOMATTER_OK;
return _PM_begin(&core);
}
// Transfer data from GFXcanvas16 to the matrix framebuffer's weird
// internal format. The actual conversion functions referenced below
// are in core.c, reasoning is explained there.
void Adafruit_Protomatter::show(void) {
// Destination address is computed in convert function
// (based on active buffer value, if double-buffering),
// just need to pass in the canvas buffer address and
// width in pixels.
if(core.bytesPerElement == 1) {
_PM_convert_565_byte(&core, getBuffer(), WIDTH);
} else if(core.bytesPerElement == 2) {
_PM_convert_565_word(&core, getBuffer(), WIDTH);
} else {
_PM_convert_565_long(&core, getBuffer(), WIDTH);
}
if(core.doubleBuffer) {
core.swapBuffers = 1;
// To avoid overwriting data on the matrix, don't return
// until the timer ISR has performed the swap at the right time.
while(core.swapBuffers);
}
_PM_convert_565(&core, getBuffer(), WIDTH);
_PM_swapbuffer_maybe(&core);
}
// Returns current value of frame counter and resets its value to zero.

View file

@ -7,17 +7,94 @@
#include "core.h"
#include <Adafruit_GFX.h>
/*!
@brief Class representing the Arduino-facing side of the Protomatter
library. Subclass of Adafruit_GFX's GFXcanvas16 to allow all
the drawing operations.
*/
class Adafruit_Protomatter : public GFXcanvas16 {
public:
Adafruit_Protomatter(uint16_t bitWidth, uint8_t bitDepth,
uint8_t rgbCount, uint8_t *rgbList,
uint8_t addrCount, uint8_t *addrList,
/*!
@brief Adafruit_Protomatter constructor.
@param bitWidth Total width of RGB matrix chain, in pixels.
Usu. some multiple of 32, but maybe exceptions.
@param bitDepth Color "depth" in bitplanes, determines range of
shades of red, green and blue. e.g. passing 4
bits = 16 shades ea. R,G,B = 16x16x16 = 4096
colors. Max is 6, since the GFX library works
with "565" RGB colors (6 bits green, 5 red/blue).
@param rgbCount Number of "sets" of RGB data pins, each set
containing 6 pins (2 ea. R,G,B). Typically 1,
indicating a single matrix (or matrix chain).
In theory (but not yet extensively tested),
multiple sets of pins can be driven in parallel,
up to 5 on some devices (if the hardware design
provides all those bits on one PORT).
@param rgbList A uint8_t array of pins (Arduino pin numbering),
6X the prior rgbCount value, corresponding to
the 6 output color bits for a matrix (or chain).
Order is upper-half red, green, blue, lower-half
red, green blue (repeat for each add'l chain).
All the RGB pins (plus the clock pin below on
some architectures) MUST be on the same PORT
register. It's recommended (but not required)
that all RGB pins (and clock depending on arch)
be within the same byte of a PORT (but do not
need to be sequential or contiguous within that
byte) for more efficient RAM utilization. For
two concurrent chains, same principle but 16-bit
word instead of byte.
@param addrCount Number of row address lines required of matrix.
Total pixel height is then 2 x 2^addrCount, e.g.
32-pixel-tall matrices have 4 row address lines.
@param addrList A uint8_t array of pins (Arduino pin numbering),
one per row address line.
@param clockPin RGB clock pin (Arduino pin #).
@param latchPin RGB data latch pin (Arduino pin #).
@param oePin Output enable pin (Arduino pin #), active low.
@param doubleBuffer If true, two matrix buffers are allocated,
so changing display contents doesn't introduce
artifacts mid-conversion. Requires ~2X RAM.
@param timer Pointer to timer peripheral or timer-related
struct (architecture-dependent), or NULL to
use a default timer ID (also arch-dependent).
*/
Adafruit_Protomatter(uint16_t bitWidth, uint8_t bitDepth, uint8_t rgbCount,
uint8_t *rgbList, uint8_t addrCount, uint8_t *addrList,
uint8_t clockPin, uint8_t latchPin, uint8_t oePin,
bool doubleBuffer, void *timer = NULL);
~Adafruit_Protomatter(void);
/*!
@brief Start a Protomatter matrix display running -- initialize
pins, timer and interrupt into existence.
@return A ProtomatterStatus status, one of:
PROTOMATTER_OK if everything is good.
PROTOMATTER_ERR_PINS if data and/or clock pins are split
across different PORTs.
PROTOMATTER_ERR_MALLOC if insufficient RAM to allocate
display memory.
PROTOMATTER_ERR_ARG if a bad value was passed to the
constructor.
*/
ProtomatterStatus begin(void);
/*!
@brief Process data from GFXcanvas16 to the matrix framebuffer's
internal format for display.
*/
void show(void);
/*!
@brief Returns current value of frame counter and resets its value
to zero. Two calls to this, timed one second apart (or use
math with other intervals), can be used to get a rough
frames-per-second value for the matrix (since this is
difficult to estimate beforehand).
@return Frame count since previous call to function, as a uint32_t.
*/
uint32_t getFrameCount(void);
private:
Protomatter_core core; // Underlying C struct
void convert_byte(uint8_t *dest); // GFXcanvas16-to-matrix

View file

@ -1,4 +1,4 @@
# Adafruit_Protomatter
# Adafruit_Protomatter [![Build Status](https://github.com/adafruit/Adafruit_Protomatter/workflows/Arduino%20Library%20CI/badge.svg)](https://github.com/adafruit/Adafruit_Protomatter/actions)
"I used protomatter in the Genesis matrix." - David Marcus, Star Trek III
@ -6,8 +6,6 @@ Code for driving HUB75-style RGB LED matrices, targeted at 32-bit MCUs
using brute-force GPIO (that is, not relying on DMA or other specialized
peripherals beyond a timer interrupt, goal being portability).
Name might change as it's nondescriptive and tedious to type in code.
# Matrix Concepts and Jargon
HUB75 RGB LED matrices are basically a set of six concurrent shift register

945
arch.h

File diff suppressed because it is too large Load diff

350
core.c
View file

@ -1,3 +1,19 @@
/*!
* @file core.c
*
* Part of Adafruit's Protomatter library for HUB75-style RGB LED matrices.
*
* Adafruit invests time and resources providing this open source code,
* please support Adafruit and open-source hardware by purchasing
* products from Adafruit!
*
* Written by Phil "Paint Your Dragon" Burgess and Jeff Epler for
* Adafruit Industries, with contributions from the open source community.
*
* BSD license, all text here must be included in any redistribution.
*
*/
// Device- and environment-neutral core matrix-driving functionality.
// See notes near top of arch.h regarding assumptions of hardware
// "common ground." If you find yourself doing an "#ifdef ARDUINO" or
@ -15,6 +31,8 @@
#include "core.h" // enums and structs
#include "arch.h" // Do NOT include this in any other source files
#include <stddef.h>
#include <string.h>
// Overall matrix refresh rate (frames/second) is a function of matrix width
// and chain length, number of address lines, number of bit planes, CPU speed
@ -30,13 +48,13 @@
// refresh slower than this, and in many cases will...just need to set an
// upper limit to avoid excessive CPU load). An incredibly long comment block
// for a single constant, thank you for coming to my TED talk!
#define _PM_MAX_REFRESH_HZ 250
#define _PM_MAX_REFRESH_HZ 250 ///< Max matrix refresh rate
// Time (in microseconds) to pause following any change in address lines
// (individually or collectively). Some matrices respond slowly there...
// must pause on change for matrix to catch up. Defined here (rather than
// arch.h) because it's not architecture-specific.
#define _PM_ROW_DELAY 8
#define _PM_ROW_DELAY 8 ///< Delay time between row address line changes (ms)
// These are the lowest-level functions for issing data to matrices.
// There are three versions because it depends on how the six RGB data bits
@ -54,27 +72,42 @@ static void blast_byte(Protomatter_core *core, uint8_t *data);
static void blast_word(Protomatter_core *core, uint16_t *data);
static void blast_long(Protomatter_core *core, uint32_t *data);
#define _PM_clearReg(x) \
(*(volatile _PM_PORT_TYPE *)((x).clearReg) = \
((x).bit)) ///< Clear non-RGB-data-or-clock control line (_PM_pin type)
#define _PM_setReg(x) \
(*(volatile _PM_PORT_TYPE *)((x).setReg) = \
((x).bit)) ///< Set non-RGB-data-or-clock control line (_PM_pin type)
// Validate and populate vital elements of core structure.
// Does NOT allocate core struct -- calling function must provide that.
// (In the Arduino C++ library, its part of the Protomatter class.)
ProtomatterStatus _PM_init(Protomatter_core *core,
uint16_t bitWidth, uint8_t bitDepth,
uint8_t rgbCount, uint8_t *rgbList,
ProtomatterStatus _PM_init(Protomatter_core *core, uint16_t bitWidth,
uint8_t bitDepth, uint8_t rgbCount, uint8_t *rgbList,
uint8_t addrCount, uint8_t *addrList,
uint8_t clockPin, uint8_t latchPin, uint8_t oePin,
bool doubleBuffer, void *timer) {
if(!core) return PROTOMATTER_ERR_ARG;
if (!core)
return PROTOMATTER_ERR_ARG;
if(rgbCount > 5) rgbCount = 5; // Max 5 in parallel (32-bit PORT)
if(addrCount > 5) addrCount = 5; // Max 5 address lines (A-E)
if (rgbCount > 5)
rgbCount = 5; // Max 5 in parallel (32-bit PORT)
if (addrCount > 5)
addrCount = 5; // Max 5 address lines (A-E)
// bitDepth is NOT constrained here, handle in calling function
// (varies with implementation, e.g. GFX lib is max 6 bitplanes,
// but might be more or less elsewhere)
#if defined(_PM_TIMER_DEFAULT)
// If NULL timer was passed in (the default case for the constructor),
// use default value from arch.h. For example, in the Arduino case it's
// tied to TC4 specifically.
if(timer == NULL) timer = _PM_TIMER_DEFAULT;
if (timer == NULL)
timer = _PM_TIMER_DEFAULT;
#else
if (timer == NULL)
return PROTOMATTER_ERR_ARG;
#endif
core->timer = timer;
core->width = bitWidth; // Total matrix chain length in bits
@ -95,15 +128,15 @@ ProtomatterStatus _PM_init(Protomatter_core *core,
// the pin bitmasks.
rgbCount *= 6; // Convert parallel count to pin count
if((core->rgbPins = (uint8_t *)malloc(rgbCount * sizeof(uint8_t)))) {
if((core->addr = (_PM_pin *)malloc(addrCount * sizeof(_PM_pin)))) {
if ((core->rgbPins = (uint8_t *)_PM_ALLOCATOR(rgbCount * sizeof(uint8_t)))) {
if ((core->addr = (_PM_pin *)_PM_ALLOCATOR(addrCount * sizeof(_PM_pin)))) {
memcpy(core->rgbPins, rgbList, rgbCount * sizeof(uint8_t));
for (uint8_t i = 0; i < addrCount; i++) {
core->addr[i].pin = addrList[i];
}
return PROTOMATTER_OK;
}
free(core->rgbPins);
_PM_FREE(core->rgbPins);
core->rgbPins = NULL;
}
return PROTOMATTER_ERR_MALLOC;
@ -111,7 +144,8 @@ ProtomatterStatus _PM_init(Protomatter_core *core,
// Allocate display buffers and populate additional elements.
ProtomatterStatus _PM_begin(Protomatter_core *core) {
if(!core) return PROTOMATTER_ERR_ARG;
if (!core)
return PROTOMATTER_ERR_ARG;
if (!core->rgbPins) { // NULL if copy failed to allocate
return PROTOMATTER_ERR_MALLOC;
@ -148,10 +182,14 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
// register is present) are in the same byte, this can be stored more
// compact than if they're spread across a word or long.
uint8_t byteMask = 0;
if(bitMask & 0xFF000000) byteMask |= 0b1000;
if(bitMask & 0x00FF0000) byteMask |= 0b0100;
if(bitMask & 0x0000FF00) byteMask |= 0b0010;
if(bitMask & 0x000000FF) byteMask |= 0b0001;
if (bitMask & 0xFF000000)
byteMask |= 0b1000;
if (bitMask & 0x00FF0000)
byteMask |= 0b0100;
if (bitMask & 0x0000FF00)
byteMask |= 0b0010;
if (bitMask & 0x000000FF)
byteMask |= 0b0001;
switch (byteMask) {
case 0b0001: // If all PORT bits are in the same byte...
case 0b0010:
@ -175,17 +213,19 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
core->numRowPairs = 1 << core->numAddressLines;
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
uint16_t columns = chunks * _PM_chunkSize; // Padded matrix width
uint32_t screenBytes = columns * core->numRowPairs * core->numPlanes *
core->bytesPerElement;
uint32_t screenBytes =
columns * core->numRowPairs * core->numPlanes * core->bytesPerElement;
core->bufferSize = screenBytes; // Bytes per matrix buffer (1 or 2)
if(core->doubleBuffer) screenBytes *= 2; // Total for matrix buffer(s)
if (core->doubleBuffer)
screenBytes *= 2; // Total for matrix buffer(s)
uint32_t rgbMaskBytes = core->parallel * 6 * core->bytesPerElement;
// Allocate matrix buffer(s). Don't worry about the return type...
// though we might be using words or longs for certain pin configs,
// malloc() by definition always aligns to the longest type.
if(!(core->screenData = (uint8_t *)malloc(screenBytes + rgbMaskBytes))) {
// _PM_ALLOCATOR() by definition always aligns to the longest type.
if (!(core->screenData =
(uint8_t *)_PM_ALLOCATOR(screenBytes + rgbMaskBytes))) {
return PROTOMATTER_ERR_MALLOC;
}
@ -201,12 +241,11 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
// Figure out clockMask and rgbAndClockMask, clear matrix buffers
if (core->bytesPerElement == 1) {
core->portOffset = _PM_byteOffset(core->rgbPins[0]);
#if defined(_PM_portToggleRegister)
#if defined(_PM_portToggleRegister) && !defined(_PM_STRICT_32BIT_IO)
// Clock and rgbAndClockMask are 8-bit values
core->clockMask = _PM_portBitMask(core->clockPin) >>
(core->portOffset * 8);
core->rgbAndClockMask = (bitMask >> (core->portOffset * 8)) |
core->clockMask;
core->clockMask = _PM_portBitMask(core->clockPin) >> (core->portOffset * 8);
core->rgbAndClockMask =
(bitMask >> (core->portOffset * 8)) | core->clockMask;
memset(core->screenData, core->clockMask, screenBytes);
#else
// Clock and rgbAndClockMask are 32-bit values
@ -219,12 +258,12 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
}
} else if (core->bytesPerElement == 2) {
core->portOffset = _PM_wordOffset(core->rgbPins[0]);
#if defined(_PM_portToggleRegister)
#if defined(_PM_portToggleRegister) && !defined(_PM_STRICT_32BIT_IO)
// Clock and rgbAndClockMask are 16-bit values
core->clockMask = _PM_portBitMask(core->clockPin) >>
(core->portOffset * 16);
core->rgbAndClockMask = (bitMask >> (core->portOffset * 16)) |
core->clockMask;
core->clockMask =
_PM_portBitMask(core->clockPin) >> (core->portOffset * 16);
core->rgbAndClockMask =
(bitMask >> (core->portOffset * 16)) | core->clockMask;
uint32_t elements = screenBytes / 2;
for (uint32_t i = 0; i < elements; i++) {
((uint16_t *)core->screenData)[i] = core->clockMask;
@ -233,6 +272,16 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
// Clock and rgbAndClockMask are 32-bit values
core->clockMask = _PM_portBitMask(core->clockPin);
core->rgbAndClockMask = bitMask | core->clockMask;
#if defined(_PM_portToggleRegister)
// TO DO: this ifdef and the one above can probably be wrapped up
// in a more cohesive case. Think something similar will be needed
// for the byte case. Will need Teensy 4.1 to test.
uint32_t elements = screenBytes / 2;
uint16_t mask = core->clockMask >> (core->portOffset * 16);
for (uint32_t i = 0; i < elements; i++) {
((uint16_t *)core->screenData)[i] = mask;
}
#endif
#endif
for (uint8_t i = 0; i < core->parallel * 6; i++) {
((uint16_t *)core->rgbMask)[i] = // Pin bitmasks are 16-bit
@ -296,13 +345,12 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
core->addrPortToggle = _PM_portToggleRegister(core->addr[0].pin);
core->singleAddrPort = 1;
#endif
for(uint8_t line=0,bit=1; line<core->numAddressLines; line++, bit<<=1) {
core->addr[line].setReg =
_PM_portSetRegister(core->addr[line].pin);
core->addr[line].clearReg =
_PM_portClearRegister(core->addr[line].pin);
core->addr[line].bit =
_PM_portBitMask(core->addr[line].pin);
core->prevRow = (1 << core->numAddressLines) - 2;
for (uint8_t line = 0, bit = 1; line < core->numAddressLines;
line++, bit <<= 1) {
core->addr[line].setReg = _PM_portSetRegister(core->addr[line].pin);
core->addr[line].clearReg = _PM_portClearRegister(core->addr[line].pin);
core->addr[line].bit = _PM_portBitMask(core->addr[line].pin);
_PM_pinOutput(core->addr[line].pin);
if (core->prevRow & bit) {
_PM_pinHigh(core->addr[line].pin);
@ -311,8 +359,7 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
}
#if defined(_PM_portToggleRegister)
// If address pin on different port than addr 0, no singleAddrPort.
if(_PM_portToggleRegister(core->addr[line].pin) !=
core->addrPortToggle) {
if (_PM_portToggleRegister(core->addr[line].pin) != core->addrPortToggle) {
core->singleAddrPort = 0;
}
#endif
@ -336,9 +383,15 @@ ProtomatterStatus _PM_begin(Protomatter_core *core) {
// so it won't halt with lit LEDs.
void _PM_stop(Protomatter_core *core) {
if ((core)) {
while(core->swapBuffers); // Wait for any pending buffer swap
// If _PM_begin failed, this will be a NULL pointer. Stop early,
// none of the other "stop" operations make sense
if (!core->screenData) {
return;
}
while (core->swapBuffers)
; // Wait for any pending buffer swap
_PM_timerStop(core->timer); // Halt timer
*core->oe.setReg = core->oe.bit; // Set OE HIGH (disable output)
_PM_setReg(core->oe); // Set OE HIGH (disable output)
// So, in PRINCIPLE, setting OE high would be sufficient...
// but in case that pin is shared with another function such
// as the onloard LED (which pulses during bootloading) let's
@ -355,8 +408,8 @@ void _PM_stop(Protomatter_core *core) {
_PM_clockHoldLow;
}
// Latch data
*core->latch.setReg = core->latch.bit;
*core->latch.clearReg = core->latch.bit;
_PM_setReg(core->latch);
_PM_clearReg(core->latch);
}
}
@ -379,26 +432,46 @@ void _PM_free(Protomatter_core *core) {
if ((core)) {
_PM_stop(core);
// TO DO: Set all pins back to inputs here?
if(core->screenData) free(core->screenData);
if(core->addr) free(core->addr);
if (core->screenData)
_PM_FREE(core->screenData);
if (core->addr)
_PM_FREE(core->addr);
if (core->rgbPins) {
free(core->rgbPins);
_PM_FREE(core->rgbPins);
core->rgbPins = NULL;
}
}
}
// ISR function (in arch.h) calls this function which it extern'd.
void _PM_row_handler(Protomatter_core *core) {
// Profuse apologies for the ESP32-specific IRAM_ATTR here -- the goal was
// for all architecture-specific detauls to be in arch.h -- but the need
// for one here caught me off guard. So, in arch.h, for all non-ESP32
// devices, IRAM_ATTR is defined to nothing and is ignored here. If any
// future architectures have their own attribute for making a function
// RAM-resident, #define IRAM_ATTR to that in the corresponding device-
// specific section of arch.h. Sorry. :/
// Any functions called by this function should also be IRAM_ATTR'd.
IRAM_ATTR void _PM_row_handler(Protomatter_core *core) {
*core->oe.setReg = core->oe.bit; // Disable LED output
_PM_setReg(core->oe); // Disable LED output
*core->latch.setReg = core->latch.bit; // Latch data from PRIOR pass
// ESP32 requires this next line, but not wanting to put arch-specific
// ifdefs in this code...it's a trivial operation so just do it.
// Latch is already clear at this point, but we go through the motions
// to clear it again in order to sync up the setReg(OE) above with the
// setReg(latch) that follows. Reason being, bit set/clear operations
// on ESP32 aren't truly atomic, and if those two pins are on the same
// port (quite common) the second setReg will be ignored. The nonsense
// clearReg is used to sync up the two setReg operations. See also the
// ESP32-specific PEW define in arch.h, same deal.
_PM_clearReg(core->latch);
_PM_setReg(core->latch);
// Stop timer, save count value at stop
uint32_t elapsed = _PM_timerStop(core->timer);
uint8_t prevPlane = core->plane; // Save that plane # for later timing
*core->latch.clearReg = core->latch.bit; // (split to add a few cycles)
_PM_clearReg(core->latch); // (split to add a few cycles)
// If plane 0 just finished being displayed (plane 1 was loaded on prior
// pass, or there's only one plane...I know, it's confusing), take note
@ -430,7 +503,7 @@ void _PM_row_handler(Protomatter_core *core) {
priorBits |= core->addr[line].bit;
}
}
*core->addrPortToggle = newBits ^ priorBits;
*(volatile _PM_PORT_TYPE *)core->addrPortToggle = newBits ^ priorBits;
_PM_delayMicroseconds(_PM_ROW_DELAY);
} else {
#endif
@ -440,9 +513,9 @@ void _PM_row_handler(Protomatter_core *core) {
line++, bit <<= 1) {
if ((core->row & bit) != (core->prevRow & bit)) {
if (core->row & bit) { // Set addr line high
*core->addr[line].setReg = core->addr[line].bit;
_PM_setReg(core->addr[line]);
} else { // Set addr line low
*core->addr[line].clearReg = core->addr[line].bit;
_PM_clearReg(core->addr[line]);
}
_PM_delayMicroseconds(_PM_ROW_DELAY);
}
@ -473,12 +546,14 @@ void _PM_row_handler(Protomatter_core *core) {
// Set timer and enable LED output for data loaded on PRIOR pass:
_PM_timerStart(core->timer, core->bitZeroPeriod << prevPlane);
*core->oe.clearReg = core->oe.bit; // Enable LED output
_PM_delayMicroseconds(1); // Appease Teensy4
_PM_clearReg(core->oe); // Enable LED output
uint32_t elementsPerLine = _PM_chunkSize *
((core->width + (_PM_chunkSize - 1)) / _PM_chunkSize);
uint32_t elementsPerLine =
_PM_chunkSize * ((core->width + (_PM_chunkSize - 1)) / _PM_chunkSize);
uint32_t srcOffset = elementsPerLine *
(core->numPlanes * core->row + core->plane) * core->bytesPerElement;
(core->numPlanes * core->row + core->plane) *
core->bytesPerElement;
if (core->doubleBuffer) {
srcOffset += core->bufferSize * core->activeBuffer;
}
@ -504,6 +579,10 @@ void _PM_row_handler(Protomatter_core *core) {
// after data is placed on the PORT. _PM_clockHoldHigh is code for delay
// before setting the clock back low. If undefined, nothing goes there.
#if !defined(PEW) // arch.h can define a custom PEW if needed (e.g. ESP32)
#if !defined(_PM_STRICT_32BIT_IO) // Partial access to 32-bit GPIO OK
#if defined(_PM_portToggleRegister)
#define PEW \
*toggle = *data++; /* Toggle in new data + toggle clock low */ \
@ -514,28 +593,55 @@ void _PM_row_handler(Protomatter_core *core) {
#define PEW \
*set = *data++; /* Set RGB data high */ \
_PM_clockHoldLow; \
*set32 = clock; /* Set clock high */ \
*set_full = clock; /* Set clock high */ \
_PM_clockHoldHigh; \
*clear32 = rgbclock; /* Clear RGB data + clock */
*clear_full = rgbclock; /* Clear RGB data + clock */ \
///< Bitbang one set of RGB data bits to matrix
#endif
#else // ONLY 32-bit GPIO
#if defined(_PM_portToggleRegister)
#define PEW \
*toggle = *data++ << shift; /* Toggle in new data + toggle clock low */ \
_PM_clockHoldLow; \
*toggle = clock; /* Toggle clock high */ \
_PM_clockHoldHigh;
#else
#define PEW \
*set = *data++ << shift; /* Set RGB data high */ \
_PM_clockHoldLow; \
*set = clock; /* Set clock high */ \
_PM_clockHoldHigh; \
*clear = rgbclock; /* Clear RGB data + clock */ \
///< Bitbang one set of RGB data bits to matrix
#endif
#endif // end 32-bit GPIO
#endif // end PEW
#if _PM_chunkSize == 1
#define PEW_UNROLL PEW
#elif _PM_chunkSize == 2
#define PEW_UNROLL PEW PEW ///< 2-way PEW unroll
#elif _PM_chunkSize == 4
#define PEW_UNROLL PEW PEW PEW PEW ///< 4-way PEW unroll
#elif _PM_chunkSize == 8
#define PEW_UNROLL PEW PEW PEW PEW PEW PEW PEW PEW
#define PEW_UNROLL PEW PEW PEW PEW PEW PEW PEW PEW ///< 8-way PEW unroll
#elif _PM_chunkSize == 16
#define PEW_UNROLL \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW
#elif _PM_chunkSize == 32
#define PEW_UNROLL \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW
#elif _PM_chunkSize == 64
#define PEW_UNROLL \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW \
PEW PEW PEW PEW PEW PEW PEW PEW PEW PEW
#else
#error "Unimplemented _PM_chunkSize value"
#endif
@ -546,26 +652,28 @@ void _PM_row_handler(Protomatter_core *core) {
// function, too often ends in disaster...but must be vigilant in the
// three-function maintenance then.)
static void blast_byte(Protomatter_core *core, uint8_t *data) {
IRAM_ATTR static void blast_byte(Protomatter_core *core, uint8_t *data) {
#if !defined(_PM_STRICT_32BIT_IO) // Partial access to 32-bit GPIO OK
#if defined(_PM_portToggleRegister)
// If here, it was established in begin() that the RGB data bits and
// clock are all within the same byte of a PORT register, else we'd be
// in the word- or long-blasting functions now. So we just need an
// 8-bit pointer to the PORT.
volatile uint8_t *toggle = (volatile uint8_t *)core->toggleReg +
core->portOffset;
volatile uint8_t *toggle =
(volatile uint8_t *)core->toggleReg + core->portOffset;
#else
// No-toggle version is a little different. If here, RGB data is all
// in one byte of PORT register, clock can be any bit in 32-bit PORT.
volatile uint8_t *set; // For RGB data set
volatile uint32_t *set32; // For clock set
volatile uint32_t *clear32; // For RGB data + clock clear
set = (volatile uint8_t *)core->setReg + portOffset;
set32 = (volatile uint32_t *)core->setReg;
clear32 = (volatile uint32_t *)core->clearReg;
uint32_t rgbclock = core->rgbAndClockMask; // RGB + clock bit
volatile _PM_PORT_TYPE *set_full; // For clock set
volatile _PM_PORT_TYPE *clear_full; // For RGB data + clock clear
set = (volatile uint8_t *)core->setReg + core->portOffset;
set_full = (volatile _PM_PORT_TYPE *)core->setReg;
clear_full = (volatile _PM_PORT_TYPE *)core->clearReg;
_PM_PORT_TYPE rgbclock = core->rgbAndClockMask; // RGB + clock bit
#endif
uint32_t clock = core->clockMask; // Clock bit
_PM_PORT_TYPE clock = core->clockMask; // Clock bit
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
// PORT has already been initialized with RGB data + clock bits
@ -584,23 +692,51 @@ static void blast_byte(Protomatter_core *core, uint8_t *data) {
*((volatile uint8_t *)core->clearReg + core->portOffset) =
core->rgbAndClockMask;
#endif
#else // ONLY 32-bit GPIO
#if defined(_PM_portToggleRegister)
volatile _PM_PORT_TYPE *toggle = (volatile _PM_PORT_TYPE *)core->toggleReg;
#else
volatile _PM_PORT_TYPE *set = (volatile _PM_PORT_TYPE *)core->setReg;
volatile _PM_PORT_TYPE *clear = (volatile _PM_PORT_TYPE *)core->clearReg;
_PM_PORT_TYPE rgbclock = core->rgbAndClockMask; // RGB + clock bit
#endif
_PM_PORT_TYPE clock = core->clockMask; // Clock bit
uint8_t shift = core->portOffset * 8;
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
// PORT has already been initialized with RGB data + clock bits
// all LOW, so we don't need to initialize that state here.
while (chunks--) {
PEW_UNROLL // _PM_chunkSize RGB+clock writes
}
static void blast_word(Protomatter_core *core, uint16_t *data) {
#if defined(_PM_portToggleRegister)
*((volatile uint32_t *)core->clearReg) = core->rgbAndClockMask;
#endif
#endif // 32-bit GPIO
}
IRAM_ATTR static void blast_word(Protomatter_core *core, uint16_t *data) {
#if !defined(_PM_STRICT_32BIT_IO) // Partial access to 32-bit GPIO OK
#if defined(_PM_portToggleRegister)
// See notes above -- except now 16-bit word in PORT.
volatile uint16_t *toggle = (volatile uint16_t *)core->toggleReg +
core->portOffset;
volatile uint16_t *toggle =
(volatile uint16_t *)core->toggleReg + core->portOffset;
#else
volatile uint16_t *set; // For RGB data set
volatile uint32_t *set32; // For clock set
volatile uint32_t *clear32; // For RGB data + clock clear
volatile _PM_PORT_TYPE *set_full; // For clock set
volatile _PM_PORT_TYPE *clear_full; // For RGB data + clock clear
set = (volatile uint16_t *)core->setReg + core->portOffset;
set32 = (volatile uint32_t *)core->setReg;
clear32 = (volatile uint32_t *)core->clearReg;
uint32_t rgbclock = core->rgbAndClockMask; // RGB + clock bit
set_full = (volatile _PM_PORT_TYPE *)core->setReg;
clear_full = (volatile _PM_PORT_TYPE *)core->clearReg;
_PM_PORT_TYPE rgbclock = core->rgbAndClockMask; // RGB + clock bit
#endif
uint32_t clock = core->clockMask; // Clock bit
_PM_PORT_TYPE clock = core->clockMask; // Clock bit
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
while (chunks--) {
PEW_UNROLL // _PM_chunkSize RGB+clock writes
@ -610,9 +746,30 @@ static void blast_word(Protomatter_core *core, uint16_t *data) {
*((volatile uint16_t *)core->clearReg + core->portOffset) =
core->rgbAndClockMask;
#endif
#else // ONLY 32-bit GPIO
#if defined(_PM_portToggleRegister)
volatile _PM_PORT_TYPE *toggle = (volatile _PM_PORT_TYPE *)core->toggleReg;
#else
volatile _PM_PORT_TYPE *set = (volatile _PM_PORT_TYPE *)core->setReg;
volatile _PM_PORT_TYPE *clear = (volatile _PM_PORT_TYPE *)core->clearReg;
_PM_PORT_TYPE rgbclock = core->rgbAndClockMask; // RGB + clock bit
#endif
_PM_PORT_TYPE clock = core->clockMask; // Clock bit
uint8_t shift = core->portOffset * 16;
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
while (chunks--) {
PEW_UNROLL // _PM_chunkSize RGB+clock writes
}
#if defined(_PM_portToggleRegister)
*((volatile _PM_PORT_TYPE *)core->clearReg) = core->rgbAndClockMask;
#endif
#endif // 32-bit GPIO
}
static void blast_long(Protomatter_core *core, uint32_t *data) {
IRAM_ATTR static void blast_long(Protomatter_core *core, uint32_t *data) {
#if defined(_PM_portToggleRegister)
// See notes above -- except now full 32-bit PORT.
volatile uint32_t *toggle = (volatile uint32_t *)core->toggleReg;
@ -621,14 +778,17 @@ static void blast_long(Protomatter_core *core, uint32_t *data) {
// The optimizer will most likely simplify this; leaving as-is, not
// wanting a special case of the PEW macro due to divergence risk.
volatile uint32_t *set; // For RGB data set
volatile uint32_t *set32; // For clock set
volatile uint32_t *clear32; // For RGB data + clock clear
volatile _PM_PORT_TYPE *set_full; // For clock set
volatile _PM_PORT_TYPE *clear_full; // For RGB data + clock clear
set = (volatile uint32_t *)core->setReg;
set32 = (volatile uint32_t *)core->setReg;
clear32 = (volatile uint32_t *)core->clearReg;
uint32_t rgbclock = core->rgbAndClockMask; // RGB + clock bit
set_full = (volatile _PM_PORT_TYPE *)core->setReg;
clear_full = (volatile _PM_PORT_TYPE *)core->clearReg;
_PM_PORT_TYPE rgbclock = core->rgbAndClockMask; // RGB + clock bit
#endif
_PM_PORT_TYPE clock = core->clockMask; // Clock bit
#if defined(_PM_STRICT_32BIT_IO)
uint8_t shift = 0;
#endif
uint32_t clock = core->clockMask; // Clock bit
uint8_t chunks = (core->width + (_PM_chunkSize - 1)) / _PM_chunkSize;
while (chunks--) {
PEW_UNROLL // _PM_chunkSize RGB+clock writes

287
core.h
View file

@ -1,3 +1,19 @@
/*!
* @file core.h
*
* Part of Adafruit's Protomatter library for HUB75-style RGB LED matrices.
*
* Adafruit invests time and resources providing this open source code,
* please support Adafruit and open-source hardware by purchasing
* products from Adafruit!
*
* Written by Phil "Paint Your Dragon" Burgess and Jeff Epler for
* Adafruit Industries, with contributions from the open source community.
*
* BSD license, all text here must be included in any redistribution.
*
*/
#ifndef _PROTOMATTER_CORE_H_
#define _PROTOMATTER_CORE_H_
@ -5,10 +21,10 @@
extern "C" {
#endif
#include <stdint.h>
#include <stdbool.h>
#include <stdint.h>
// Status type returned by some functions.
/** Status type returned by some functions. */
typedef enum {
PROTOMATTER_OK, // Everything is hunky-dory!
PROTOMATTER_ERR_PINS, // Clock and/or data pins on different PORTs
@ -16,92 +32,229 @@ typedef enum {
PROTOMATTER_ERR_ARG, // Bad input to function
} ProtomatterStatus;
// Struct for matrix control lines NOT related to RGB data or clock, i.e.
// latch, OE and address lines. RGB data and clock ("RGBC") are handled
// differently as they have specific requirements (and might use a toggle
// register if present). The data conversion functions need bitmasks for
// RGB data but do NOT need the set or clear registers, so those items
// are also declared as separate things in the core structure that follows.
/** Struct for matrix control lines NOT related to RGB data or clock, i.e.
latch, OE and address lines. RGB data and clock ("RGBC") are handled
differently as they have specific requirements (and might use a toggle
register if present). The data conversion functions need bitmasks for
RGB data but do NOT need the set or clear registers, so those items are
also declared as separate things in the core structure that follows. */
typedef struct {
volatile uint32_t *setReg; // GPIO bit set register
volatile uint32_t *clearReg; // GPIO bit clear register
uint32_t bit; // GPIO bitmask
uint8_t pin; // Some identifier, e.g. Arduino pin #
volatile void *setReg; ///< GPIO bit set register
volatile void *clearReg; ///< GPIO bit clear register
uint32_t bit; ///< GPIO bitmask
uint8_t pin; ///< Some unique ID, e.g. Arduino pin #
} _PM_pin;
// Struct with info about an RGB matrix chain and lots of state and buffer
// details for the library. Toggle-related items in this structure MUST be
// declared even if the device lacks GPIO bit-toggle registers (i.e. don't
// do an ifdef check around these). All hardware-specific details (including
// the presence or lack of toggle registers) are isolated to a single
// file -- arch.h -- which should ONLY be included by core.c, and ifdef'ing
// them would result in differing representations of this structure which
// must be shared between the library and calling code. (An alternative is
// to put any toggle-specific stuff at the end of the struct with an ifdef
// check, but that's just dirty pool and asking for trouble.)
/** Struct with info about an RGB matrix chain and lots of state and buffer
details for the library. Toggle-related items in this structure MUST be
declared even if the device lacks GPIO bit-toggle registers (i.e. don't
do an ifdef check around these). All hardware-specific details (including
the presence or lack of toggle registers) are isolated to a single
file -- arch.h -- which should ONLY be included by core.c, and ifdef'ing
them would result in differing representations of this structure which
must be shared between the library and calling code. (An alternative is
to put any toggle-specific stuff at the end of the struct with an ifdef
check, but that's just dirty pool and asking for trouble.) */
typedef struct {
void *timer; // Arch-specific timer/counter info
void *setReg; // RGBC bit set register (cast to use)
void *clearReg; // RGBC bit clear register "
void *toggleReg; // RGBC bit toggle register "
uint8_t *rgbPins; // Array of RGB data pins (mult of 6)
void *rgbMask; // PORT bit mask for each RGB pin
uint32_t clockMask; // PORT bit mask for RGB clock
uint32_t rgbAndClockMask; // PORT bit mask for RGB data + clock
volatile uint32_t *addrPortToggle; // See singleAddrPort below
void *screenData; // Per-bitplane RGB data for matrix
_PM_pin latch; // RGB data latch
_PM_pin oe; // !OE (LOW out enable)
_PM_pin *addr; // Array of address pins
uint32_t bufferSize; // Bytes per matrix buffer
uint32_t bitZeroPeriod; // Bitplane 0 timer period
uint32_t minPeriod; // Plane 0 timer period for ~250Hz
volatile uint32_t frameCount; // For estimating refresh rate
uint16_t width; // Matrix chain width in bits
uint8_t bytesPerElement; // Using 8, 16 or 32 bits of PORT?
uint8_t clockPin; // RGB clock pin identifier
uint8_t parallel; // Number of concurrent matrix outs
uint8_t numAddressLines; // Number of address line pins
uint8_t portOffset; // Active 8- or 16-bit pos. in PORT
uint8_t numPlanes; // Display bitplanes (1 to 6)
uint8_t numRowPairs; // Addressable row pairs
bool doubleBuffer; // 2X buffers for clean switchover
bool singleAddrPort; // If 1, all addr lines on same PORT
volatile uint8_t activeBuffer; // Index of currently-displayed buf
volatile uint8_t plane; // Current bitplane (changes in ISR)
volatile uint8_t row; // Current scanline (changes in ISR)
volatile uint8_t prevRow; // Scanline from prior ISR
volatile bool swapBuffers; // If 1, awaiting double-buf switch
void *timer; ///< Arch-specific timer/counter info
void *setReg; ///< RGBC bit set register (cast to use)
void *clearReg; ///< RGBC bit clear register "
void *toggleReg; ///< RGBC bit toggle register "
uint8_t *rgbPins; ///< Array of RGB data pins (mult of 6)
void *rgbMask; ///< PORT bit mask for each RGB pin
uint32_t clockMask; ///< PORT bit mask for RGB clock
uint32_t rgbAndClockMask; ///< PORT bit mask for RGB data + clock
volatile void *addrPortToggle; ///< See singleAddrPort below
void *screenData; ///< Per-bitplane RGB data for matrix
_PM_pin latch; ///< RGB data latch
_PM_pin oe; ///< !OE (LOW out enable)
_PM_pin *addr; ///< Array of address pins
uint32_t bufferSize; ///< Bytes per matrix buffer
uint32_t bitZeroPeriod; ///< Bitplane 0 timer period
uint32_t minPeriod; ///< Plane 0 timer period for ~250Hz
volatile uint32_t frameCount; ///< For estimating refresh rate
uint16_t width; ///< Matrix chain width in bits
uint8_t bytesPerElement; ///< Using 8, 16 or 32 bits of PORT?
uint8_t clockPin; ///< RGB clock pin identifier
uint8_t parallel; ///< Number of concurrent matrix outs
uint8_t numAddressLines; ///< Number of address line pins
uint8_t portOffset; ///< Active 8- or 16-bit pos. in PORT
uint8_t numPlanes; ///< Display bitplanes (1 to 6)
uint8_t numRowPairs; ///< Addressable row pairs
bool doubleBuffer; ///< 2X buffers for clean switchover
bool singleAddrPort; ///< If 1, all addr lines on same PORT
volatile uint8_t activeBuffer; ///< Index of currently-displayed buf
volatile uint8_t plane; ///< Current bitplane (changes in ISR)
volatile uint8_t row; ///< Current scanline (changes in ISR)
volatile uint8_t prevRow; ///< Scanline from prior ISR
volatile bool swapBuffers; ///< If 1, awaiting double-buf switch
} Protomatter_core;
// Protomatter core function prototypes. Environment-specific code (like the
// Adafruit_Protomatter class for Arduino) calls on these underlying things,
// and has to provide a few extras of its own (interrupt handlers and such).
// User code shouldn't need to invoke any of them directly.
extern ProtomatterStatus _PM_init(Protomatter_core *core,
uint16_t bitWidth, uint8_t bitDepth,
uint8_t rgbCount, uint8_t *rgbList,
uint8_t addrCount, uint8_t *addrList,
uint8_t clockPin, uint8_t latchPin, uint8_t oePin,
/*!
@brief Initialize values in Protomatter_core structure.
@param core Pointer to Protomatter_core structure.
@param bitWidth Total width of RGB matrix chain, in pixels.
Usu. some multiple of 32, but maybe exceptions.
@param bitDepth Color "depth" in bitplanes, determines range of
shades of red, green and blue. e.g. passing 4
bits = 16 shades ea. R,G,B = 16x16x16 = 4096
colors.
@param rgbCount Number of "sets" of RGB data pins, each set
containing 6 pins (2 ea. R,G,B). Typically 1,
indicating a single matrix (or matrix chain).
In theory (but not yet extensively tested),
multiple sets of pins can be driven in parallel,
up to 5 on some devices (if the hardware design
provides all those bits on one PORT).
@param rgbList A uint8_t array of pins (values are platform-
dependent), 6X the prior rgbCount value,
corresponding to the 6 output color bits for a
matrix (or chain). Order is upper-half red, green,
blue, lower-half red, green blue (repeat for each
add'l chain). All the RGB pins (plus the clock pin
below on some architectures) MUST be on the same
PORT register. It's recommended (but not required)
that all RGB pins (and clock depending on arch) be
within the same byte of a PORT (but do not need to
be sequential or contiguous within that byte) for
more efficient RAM utilization. For two concurrent
chains, same principle but 16-bit word.
@param addrCount Number of row address lines required of matrix.
Total pixel height is then 2 x 2^addrCount, e.g.
32-pixel-tall matrices have 4 row address lines.
@param addrList A uint8_t array of pins (platform-dependent pin
numbering), one per row address line.
@param clockPin RGB clock pin (platform-dependent pin #).
@param latchPin RGB data latch pin (platform-dependent pin #).
@param oePin Output enable pin (platform-dependent pin #),
active low.
@param doubleBuffer If true, two matrix buffers are allocated,
so changing display contents doesn't introduce
artifacts mid-conversion. Requires ~2X RAM.
@param timer Pointer to timer peripheral or timer-related
struct (architecture-dependent), or NULL to
use a default timer ID (also arch-dependent).
@return A ProtomatterStatus status, one of:
PROTOMATTER_OK if everything is good.
PROTOMATTER_ERR_PINS if data and/or clock pins are split across
different PORTs.
PROTOMATTER_ERR_MALLOC if insufficient RAM to allocate display
memory.
PROTOMATTER_ERR_ARG if a bad value (core or timer pointer) was
passed in.
*/
extern ProtomatterStatus _PM_init(Protomatter_core *core, uint16_t bitWidth,
uint8_t bitDepth, uint8_t rgbCount,
uint8_t *rgbList, uint8_t addrCount,
uint8_t *addrList, uint8_t clockPin,
uint8_t latchPin, uint8_t oePin,
bool doubleBuffer, void *timer);
/*!
@brief Allocate display buffers and populate additional elements of a
Protomatter matrix.
@param core Pointer to Protomatter_core structure.
@return A ProtomatterStatus status, one of:
PROTOMATTER_OK if everything is good.
PROTOMATTER_ERR_PINS if data and/or clock pins are split across
different PORTs.
PROTOMATTER_ERR_MALLOC if insufficient RAM to allocate display
memory.
PROTOMATTER_ERR_ARG if a bad value.
*/
extern ProtomatterStatus _PM_begin(Protomatter_core *core);
/*!
@brief Disable (but do not deallocate) a Protomatter matrix. Disables
matrix by setting OE pin HIGH and writing all-zero data to
matrix shift registers, so it won't halt with lit LEDs.
@param core Pointer to Protomatter_core structure.
*/
extern void _PM_stop(Protomatter_core *core);
/*!
@brief Start or restart a matrix. Initialize counters, configure and
start timer.
@param core Pointer to Protomatter_core structure.
*/
extern void _PM_resume(Protomatter_core *core);
/*!
@brief Deallocate memory associated with Protomatter_core structure
(e.g. screen data, pin lists for data and rows). Does not
deallocate the structure itself.
@param core Pointer to Protomatter_core structure.
*/
extern void _PM_free(Protomatter_core *core);
/*!
@brief Matrix "row handler" that's called by the timer interrupt.
Handles row address lines and issuing data to matrix.
@param core Pointer to Protomatter_core structure.
*/
extern void _PM_row_handler(Protomatter_core *core);
/*!
@brief Returns current value of frame counter and resets its value to
zero. Two calls to this, timed one second apart (or use math with
other intervals), can be used to get a rough frames-per-second
value for the matrix (since this is difficult to estimate
beforehand).
@param core Pointer to Protomatter_core structure.
@return Frame count since previous call to function, as a uint32_t.
*/
extern uint32_t _PM_getFrameCount(Protomatter_core *core);
/*!
@brief Start (or restart) a timer/counter peripheral.
@param tptr Pointer to timer/counter peripheral OR a struct
encapsulating information about a timer/counter
periph (architecture-dependent).
@param period Timer 'top' / rollover value.
*/
extern void _PM_timerStart(void *tptr, uint32_t period);
/*!
@brief Stop timer/counter peripheral.
@param tptr Pointer to timer/counter peripheral OR a struct
encapsulating information about a timer/counter
periph (architecture-dependent).
@return Counter value when timer was stopped.
*/
extern uint32_t _PM_timerStop(void *tptr);
/*!
@brief Query a timer/counter peripheral's current count.
@param tptr Pointer to timer/counter peripheral OR a struct
encapsulating information about a timer/counter
periph (architecture-dependent).
@return Counter value.
*/
extern uint32_t _PM_timerGetCount(void *tptr);
#if defined(ARDUINO)
extern void _PM_convert_565_byte(Protomatter_core *core,
uint16_t *source, uint16_t width);
extern void _PM_convert_565_word(Protomatter_core *core,
uint16_t *source, uint16_t width);
extern void _PM_convert_565_long(Protomatter_core *core,
uint16_t *source, uint16_t width);
#endif // ARDUINO
/*!
@brief Converts image data from GFX16 canvas to the matrices weird
internal format.
@param core Pointer to Protomatter_core structure.
@param source Pointer to source image data (see Adafruit_GFX 16-bit
canvas type for format).
@param width Width of canvas in pixels, as this may be different than
the matrix pixel width due to row padding.
*/
extern void _PM_convert_565(Protomatter_core *core, uint16_t *source,
uint16_t width);
/*!
@brief Pauses until the next vertical blank to avoid 'tearing' animation
(if display is double-buffered). If single-buffered, has no effect.
@param core Pointer to Protomatter_core structure.
*/
extern void _PM_swapbuffer_maybe(Protomatter_core *core);
#ifdef __cplusplus
} // extern "C"

View file

@ -41,6 +41,26 @@ PA05 A4 PA13 PA21 D7 PB05 PB13
PA06 PA14 PA22 SDA PB06 PB14
PA07 D9 PA15 D5 PA23 SCL PB07 PB15
FEATHER nRF52840:
P0.00 P0.08 D12 P0.24 RXD P1.08 D5
P0.01 P0.09 P0.25 TXD P1.09 D13
P0.02 A4 P0.10 D2 (NFC) P0.26 D9 P1.10
P0.03 A5 P0.11 SCL P0.27 D10 P1.11
P0.04 A0 P0.12 SDA P0.28 A3 P1.12
P0.05 A1 P0.13 MOSI P0.29 P1.13
P0.06 D11 P0.14 SCK P0.30 A2 P1.14
P0.07 D6 P0.15 MISO P0.31 P1.15
FEATHER ESP32:
P0.00 P0.08 P0.16 16/RX P0.24 P1.00 32/A7
P0.01 P0.09 P0.17 17/TX P0.25 25/A1 P1.01 33/A9/SS
P0.02 P0.10 P0.18 18/MOSI P0.26 26/A0 P1.02 34/A2 (in)
P0.03 P0.11 P0.19 19/MISO P0.27 27/A10 P1.03
P0.04 4/A5 P0.12 12/A11 P0.20 P0.28 P1.04 36/A4 (in)
P0.05 5/SCK P0.13 13/A12 P0.21 21 P0.29 P1.05
P0.06 P0.14 14/A6 P0.22 22/SCL P0.30 P1.06
P0.07 P0.15 15/A8 P0.23 23/SDA P0.31 P1.07 39/A3 (in)
RGB Matrix FeatherWing:
R1 D6 A A5
G1 D5 B A4
@ -55,6 +75,7 @@ the code could run there (with some work to be done in the convert_*
functions), but would be super RAM-inefficient. Should be fine on other
M0 devices like a Metro, if wiring manually so one can pick a contiguous
byte of PORT bits.
RGB+clock are on different PORTs on nRF52840.
*/
#if defined(__SAMD51__)
@ -64,12 +85,41 @@ byte of PORT bits.
uint8_t clockPin = 13;
uint8_t latchPin = 0;
uint8_t oePin = 1;
#else // SAMD21
#elif defined(_SAMD21_)
uint8_t rgbPins[] = {6, 7, 10, 11, 12, 13};
uint8_t addrPins[] = {0, 1, 2, 3};
uint8_t clockPin = SDA;
uint8_t latchPin = 4;
uint8_t oePin = 5;
#elif defined(NRF52_SERIES)
// Special nRF52840 FeatherWing pinout
uint8_t rgbPins[] = {6, A5, A1, A0, A4, 11};
uint8_t addrPins[] = {10, 5, 13, 9};
uint8_t clockPin = 12;
uint8_t latchPin = PIN_SERIAL1_RX;
uint8_t oePin = PIN_SERIAL1_TX;
#elif defined(ESP32)
// 'Safe' pins (not overlapping any peripherals):
// GPIO.out: 4, 12, 13, 14, 15, 21, 27, GPIO.out1: 32, 33
// Peripheral-overlapping pins, sorted from 'most expendible':
// 16, 17 (RX, TX), 25, 26 (A0, A1), 18, 5, 9 (MOSI, SCK, MISO), 22, 23 (SCL, SDA)
uint8_t rgbPins[] = {4, 12, 13, 14, 15, 21};
uint8_t addrPins[] = {16, 17, 25, 26};
uint8_t clockPin = 27; // Must be on same port as rgbPins
uint8_t latchPin = 32;
uint8_t oePin = 33;
#elif defined(ARDUINO_TEENSY40)
uint8_t rgbPins[] = {15, 16, 17, 20, 21, 22}; // A1-A3, A6-A8, skips SDA,SCL
uint8_t addrPins[] = {2, 3, 4, 5};
uint8_t clockPin = 23; // A9
uint8_t latchPin = 6;
uint8_t oePin = 9;
#elif defined(ARDUINO_TEENSY41)
uint8_t rgbPins[] = {26, 27, 38, 20, 21, 22}; // A12-14, A6-A8 (yes that's a 38, NOT 28!)
uint8_t addrPins[] = {2, 3, 4, 5};
uint8_t clockPin = 23; // A9
uint8_t latchPin = 6;
uint8_t oePin = 9;
#endif
// Last arg here enables double-buffering

View file

@ -41,6 +41,26 @@ PA05 A4 PA13 PA21 D7 PB05 PB13
PA06 PA14 PA22 SDA PB06 PB14
PA07 D9 PA15 D5 PA23 SCL PB07 PB15
FEATHER nRF52840:
P0.00 P0.08 D12 P0.24 RXD P1.08 D5
P0.01 P0.09 P0.25 TXD P1.09 D13
P0.02 A4 P0.10 D2 (NFC) P0.26 D9 P1.10
P0.03 A5 P0.11 SCL P0.27 D10 P1.11
P0.04 A0 P0.12 SDA P0.28 A3 P1.12
P0.05 A1 P0.13 MOSI P0.29 P1.13
P0.06 D11 P0.14 SCK P0.30 A2 P1.14
P0.07 D6 P0.15 MISO P0.31 P1.15
FEATHER ESP32:
P0.00 P0.08 P0.16 16/RX P0.24 P1.00 32/A7
P0.01 P0.09 P0.17 17/TX P0.25 25/A1 P1.01 33/A9/SS
P0.02 P0.10 P0.18 18/MOSI P0.26 26/A0 P1.02 34/A2 (in)
P0.03 P0.11 P0.19 19/MISO P0.27 27/A10 P1.03
P0.04 4/A5 P0.12 12/A11 P0.20 P0.28 P1.04 36/A4 (in)
P0.05 5/SCK P0.13 13/A12 P0.21 21 P0.29 P1.05
P0.06 P0.14 14/A6 P0.22 22/SCL P0.30 P1.06
P0.07 P0.15 15/A8 P0.23 23/SDA P0.31 P1.07 39/A3 (in)
RGB Matrix FeatherWing:
R1 D6 A A5
G1 D5 B A4
@ -55,6 +75,7 @@ the code could run there (with some work to be done in the convert_*
functions), but would be super RAM-inefficient. Should be fine on other
M0 devices like a Metro, if wiring manually so one can pick a contiguous
byte of PORT bits.
RGB+clock are on different PORTs on nRF52840.
*/
#if defined(__SAMD51__)
@ -64,12 +85,41 @@ byte of PORT bits.
uint8_t clockPin = 13;
uint8_t latchPin = 0;
uint8_t oePin = 1;
#else // SAMD21
#elif defined(_SAMD21_)
uint8_t rgbPins[] = {6, 7, 10, 11, 12, 13};
uint8_t addrPins[] = {0, 1, 2, 3};
uint8_t clockPin = SDA;
uint8_t latchPin = 4;
uint8_t oePin = 5;
#elif defined(NRF52_SERIES)
// Special nRF52840 FeatherWing pinout
uint8_t rgbPins[] = {6, A5, A1, A0, A4, 11};
uint8_t addrPins[] = {10, 5, 13, 9};
uint8_t clockPin = 12;
uint8_t latchPin = PIN_SERIAL1_RX;
uint8_t oePin = PIN_SERIAL1_TX;
#elif defined(ESP32)
// 'Safe' pins (not overlapping any peripherals):
// GPIO.out: 4, 12, 13, 14, 15, 21, 27, GPIO.out1: 32, 33
// Peripheral-overlapping pins, sorted from 'most expendible':
// 16, 17 (RX, TX), 25, 26 (A0, A1), 18, 5, 9 (MOSI, SCK, MISO), 22, 23 (SCL, SDA)
uint8_t rgbPins[] = {4, 12, 13, 14, 15, 21};
uint8_t addrPins[] = {16, 17, 25, 26};
uint8_t clockPin = 27; // Must be on same port as rgbPins
uint8_t latchPin = 32;
uint8_t oePin = 33;
#elif defined(ARDUINO_TEENSY40)
uint8_t rgbPins[] = {15, 16, 17, 20, 21, 22}; // A1-A3, A6-A8, skips SDA,SCL
uint8_t addrPins[] = {2, 3, 4, 5};
uint8_t clockPin = 23; // A9
uint8_t latchPin = 6;
uint8_t oePin = 9;
#elif defined(ARDUINO_TEENSY41)
uint8_t rgbPins[] = {26, 27, 38, 20, 21, 22}; // A12-14, A6-A8 (yes that's a 38, NOT 28!)
uint8_t addrPins[] = {2, 3, 4, 5};
uint8_t clockPin = 23; // A9
uint8_t latchPin = 6;
uint8_t oePin = 9;
#endif
Adafruit_Protomatter matrix(

View file

@ -1,10 +1,10 @@
name=Adafruit Protomatter
version=0.0.0
version=1.0.3
author=Adafruit
maintainer=Adafruit <info@adafruit.com>
sentence=This is a library for the Adafruit RGB LED matrix.
paragraph=RGB LED matrix.
category=Display
url=https://github.com/adafruit/Adafruit_protomatter
architectures=*
architectures=samd,nrf52,stm32,esp32
depends=Adafruit GFX Library