djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5744 from jepler/update-protomatter 

Update protomatter & re-enable rgbmatrix on esp32s2
This commit is contained in:
Scott Shawcroft 2021-12-20 12:34:02 -08:00 committed by GitHub
parent 7f189b3e30 60c2018262
commit 1ec3e023d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/protomatter

@ -1 +1 @@
Subproject commit 7fe6406affb1376193102cf76ded06e61316d7e6
Subproject commit d0a07e14adcd71a7c22bcceb16c55aadb5e0d104

5
ports/espressif/mpconfigport.mk
View File

@ -26,7 +26,6 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
CIRCUITPY_FREQUENCYIO ?= 1
CIRCUITPY_IMAGECAPTURE ?= 1
CIRCUITPY_I2CPERIPHERAL ?= 1
CIRCUITPY_RGBMATRIX ?= 0
CIRCUITPY_ROTARYIO ?= 1
CIRCUITPY_NVM ?= 1
CIRCUITPY_PS2IO ?= 1
@ -49,9 +48,13 @@ CIRCUITPY_IMAGECAPTURE = 0
CIRCUITPY_PARALLELDISPLAY = 0
CIRCUITPY_TOUCHIO ?= 1
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
CIRCUITPY_RGBMATRIX ?= 0
else ifeq ($(IDF_TARGET),esp32s3)
CIRCUITPY_IMAGECAPTURE = 0
CIRCUITPY_PARALLELDISPLAY = 0
CIRCUITPY_RGBMATRIX ?= 0
else
CIRCUITPY_RGBMATRIX ?= 1
endif
# From ESP32-S2/S3 Technical Reference Manual: