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 ed4994b88fd9..021e382264ba 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_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 index a1c6b6f7c7b4..d668b709ba0d 100644 --- 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 index 8275f5430fd0..73e6954977e8 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 # 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 index 422a1cd0e79e..35d16884bdf1 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 # 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 index 8e0944dcc192..7a684716674d 100644 --- 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 index 04163b042105..1e98eb99a0bb 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_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 index f7f6cea7b0de..1e9480dcb7a8 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_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 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);