From a802f12a59a48b92a09bdf2b6ecbb8b9921c6460 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 12 Aug 2024 13:44:07 -0700 Subject: [PATCH] Enable RGBMatrix on RP2350 It just worked after adding a macro check alongside RP2040 check. Also, update TinyUSB. Fixes #9492 --- lib/protomatter | 2 +- lib/tinyusb | 2 +- .../boards/adafruit_feather_rp2350/mpconfigboard.mk | 1 - .../boards/adafruit_metro_rp2350/mpconfigboard.mk | 1 - .../boards/cytron_iriv_io_controller/mpconfigboard.mk | 1 - .../boards/cytron_motion_2350_pro/mpconfigboard.mk | 1 - .../raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk | 1 - .../boards/solderparty_rp2350_stamp/mpconfigboard.mk | 1 - .../boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk | 1 - ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c | 7 ------- 10 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/protomatter b/lib/protomatter index eadf2ee8144d..282920f9ce59 160000 --- a/lib/protomatter +++ b/lib/protomatter @@ -1 +1 @@ -Subproject commit eadf2ee8144d2b526f6adef5c9270e2625aee835 +Subproject commit 282920f9ce5948c02e1c803b9c2b6ecee7dc7b66 diff --git a/lib/tinyusb b/lib/tinyusb index ea64dd499961..ac1fd3266644 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit ea64dd4999618ce14aea90118ee9218b4aefeba6 +Subproject commit ac1fd3266644a2d87e38ef3e353ed9f60a618d50 diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk index f584f94bb693..5e9f9d84f43a 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk +++ b/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk @@ -10,7 +10,6 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 CIRCUITPY_FLOPPYIO = 0 diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk index 6c0f4f7233c6..f77f5a9a7b3d 100644 --- a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk +++ b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk @@ -10,5 +10,4 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ" CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 diff --git a/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk index c793db8a05c2..4c5a8e0a7b87 100644 --- a/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk +++ b/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk @@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 # Include these Python libraries in firmware. diff --git a/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk index fe36ed3b8da6..335c64330fef 100644 --- a/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk +++ b/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk @@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 # Include these Python libraries in firmware. diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk index 34191686b42a..7913fc0ce463 100644 --- a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk +++ b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk @@ -11,5 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 diff --git a/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk index a18c12a25181..98a7d2fa7d52 100644 --- a/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk +++ b/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk @@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 CIRCUITPY_PICODVI = 1 diff --git a/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk index e8d3aaa5d055..278efd40241a 100644 --- a/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk +++ b/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk @@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_ALARM = 0 -CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_USB_HOST = 0 CIRCUITPY_PICODVI = 1 diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c index dacad18fb8f1..3e3804fbc514 100644 --- a/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c +++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c @@ -119,7 +119,6 @@ static void __not_in_flash_func(dma_irq_handler)(void) { if (active_picodvi == NULL) { return; } - // gpio_put(10, 1); uint ch_num = active_picodvi->dma_pixel_channel; dma_channel_hw_t *ch = &dma_hw->ch[ch_num]; dma_hw->intr = 1u << ch_num; @@ -128,7 +127,6 @@ static void __not_in_flash_func(dma_irq_handler)(void) { // will trigger the pixel channel). ch = &dma_hw->ch[active_picodvi->dma_command_channel]; ch->al3_read_addr_trig = (uintptr_t)active_picodvi->dma_commands; - // gpio_put(10, 0); } void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self, @@ -392,11 +390,6 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self, never_reset_pin_number(i); } - // gpio_init(10); - // gpio_put(10, 0); - // gpio_set_dir(10, GPIO_OUT); - // never_reset_pin_number(10); - dma_channel_config c; c = dma_channel_get_default_config(self->dma_command_channel); channel_config_set_transfer_data_size(&c, DMA_SIZE_32);