Merge pull request #5744 from jepler/update-protomatter

tannewt · web-flow · commit 1ec3e023d71c · 2021-12-20T12:34:02.000-08:00
Update protomatter &amp; re-enable rgbmatrix on esp32s2
diff --git a/lib/protomatter b/lib/protomatter
@@ -1 +1 @@
-Subproject commit 7fe6406affb1376193102cf76ded06e61316d7e6
+Subproject commit d0a07e14adcd71a7c22bcceb16c55aadb5e0d104
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -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:
