Enable RGBMatrix on RP2350

tannewt · tannewt · commit a802f12a59a4 · 2024-08-12T13:50:31.000-07:00
It just worked after adding a macro check alongside RP2040 check. Also, update TinyUSB. Fixes #9492
diff --git a/lib/protomatter b/lib/protomatter
@@ -1 +1 @@
-Subproject commit eadf2ee8144d2b526f6adef5c9270e2625aee835
+Subproject commit 282920f9ce5948c02e1c803b9c2b6ecee7dc7b66
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
