Merge pull request #9513 from tannewt/rp2350_rgbmatrix

Enable RGBMatrix on RP2350
adafruit · Aug 15, 2024 · dd03d4f · dd03d4f
2 parents 65a40f5 + ee2f7bd
commit dd03d4f
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 16 deletions.
diff --git a/lib/protomatter b/lib/protomatter
diff --git a/lib/tinyusb b/lib/tinyusb
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_FLOPPYIO = 0
 CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY_ALARM = 0
-CIRCUITPY_RGBMATRIX = 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
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO

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
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk
@@ -11,4 +11,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_ALARM = 0
-CIRCUITPY_RGBMATRIX = 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_PICODVI = 1
 
 FROZEN_MPY_DIRS += $(TOP)/ports/raspberrypi/boards/solderparty_rp2040_stamp

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_PICODVI = 1
 
 FROZEN_MPY_DIRS += $(TOP)/ports/raspberrypi/boards/solderparty_rp2040_stamp

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);
+3 −3		.github/workflows/githubci.yml
+7 −0		examples/simple/simple.ino
+26 −13		src/arch/esp32-common.h
+1 −0		src/arch/esp32-s3.h
+8 −2		src/arch/rp2040.h
+6 −7		.github/workflows/build_util.yml
+6 −1		hw/bsp/rp2040/board.h
+8 −0		hw/bsp/rp2040/family.c
+1 −1		src/class/hid/hid_device.c
+2 −2		src/class/hid/hid_device.h
+14 −8		src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+3 −2		src/portable/st/stm32_fsdev/fsdev_type.h
+56 −37		test/hil/hil_test.py
+2 −2		tools/get_deps.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
		EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"

		CIRCUITPY_ALARM = 0
		CIRCUITPY_RGBMATRIX = 0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"

		CIRCUITPY__EVE = 1
		CIRCUITPY_ALARM = 0
		CIRCUITPY_RGBMATRIX = 0