diff --git a/src/micropython b/src/micropython index 5452a286c..e22996132 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 5452a286cb6491e7879cb664c5fa142b83b7f672 +Subproject commit e2299613283189142c2ec54d90ccceaf57d88767 diff --git a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h index 00d76ac44..3ab8b012d 100644 --- a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h +++ b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h @@ -134,7 +134,7 @@ #define OMV_FB_SIZE (3M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (1M) // minimum fb alloc size #define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. -#define OMV_FB_OVERLAY_SIZE (450K) // Fast fb_alloc memory size. +#define OMV_FB_OVERLAY_SIZE (448K) // Fast fb_alloc memory size. #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). #define OMV_VOSPI_MEMORY DTCM // VoSPI buffer memory. diff --git a/src/omv/ports/mimxrt/omv_portconfig.mk b/src/omv/ports/mimxrt/omv_portconfig.mk index 086d993f0..1200a8417 100644 --- a/src/omv/ports/mimxrt/omv_portconfig.mk +++ b/src/omv/ports/mimxrt/omv_portconfig.mk @@ -333,6 +333,8 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/shared/,\ runtime/softtimer.o \ timeutils/timeutils.o \ readline/readline.o \ + tinyusb/mp_usbd.o \ + tinyusb/mp_usbd_cdc.o \ ) FIRM_OBJ += $(wildcard $(BUILD)/$(MICROPY_DIR)/lib/mbedtls/library/*.o) diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index 84f04cf3f..d601df59f 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -238,7 +238,6 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\ drivers/bluetooth/ble_drv.o \ drivers/bluetooth/ble_uart.o \ drivers/usb/usb_cdc.o \ - drivers/usb/usb_descriptors.o \ frozen_content.o \ ) @@ -292,11 +291,15 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/shared/,\ libc/printf.o \ libc/string0.o \ runtime/pyexec.o \ + runtime/mpirq.o \ runtime/interrupt_char.o \ runtime/sys_stdio_mphal.o \ runtime/stdout_helpers.o \ timeutils/timeutils.o \ readline/readline.o \ + tinyusb/mp_usbd.o \ + tinyusb/mp_usbd_cdc.o \ + tinyusb/mp_usbd_descriptor.o \ ) FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/libm/,\