mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #2466 from openmv/update_micropython_1.24
micropython: Update to MicroPython 1.24.
This commit is contained in:
commit
bddbbdec25
@ -1 +1 @@
|
|||||||
Subproject commit 5452a286cb6491e7879cb664c5fa142b83b7f672
|
Subproject commit e2299613283189142c2ec54d90ccceaf57d88767
|
||||||
@ -134,7 +134,7 @@
|
|||||||
#define OMV_FB_SIZE (3M) // FB memory: header + VGA/GS image
|
#define OMV_FB_SIZE (3M) // FB memory: header + VGA/GS image
|
||||||
#define OMV_FB_ALLOC_SIZE (1M) // minimum fb alloc size
|
#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_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_MEMORY DRAM // JPEG buffer memory buffer.
|
||||||
#define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data).
|
#define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data).
|
||||||
#define OMV_VOSPI_MEMORY DTCM // VoSPI buffer memory.
|
#define OMV_VOSPI_MEMORY DTCM // VoSPI buffer memory.
|
||||||
|
|||||||
@ -333,6 +333,8 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/shared/,\
|
|||||||
runtime/softtimer.o \
|
runtime/softtimer.o \
|
||||||
timeutils/timeutils.o \
|
timeutils/timeutils.o \
|
||||||
readline/readline.o \
|
readline/readline.o \
|
||||||
|
tinyusb/mp_usbd.o \
|
||||||
|
tinyusb/mp_usbd_cdc.o \
|
||||||
)
|
)
|
||||||
|
|
||||||
FIRM_OBJ += $(wildcard $(BUILD)/$(MICROPY_DIR)/lib/mbedtls/library/*.o)
|
FIRM_OBJ += $(wildcard $(BUILD)/$(MICROPY_DIR)/lib/mbedtls/library/*.o)
|
||||||
|
|||||||
@ -238,7 +238,6 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\
|
|||||||
drivers/bluetooth/ble_drv.o \
|
drivers/bluetooth/ble_drv.o \
|
||||||
drivers/bluetooth/ble_uart.o \
|
drivers/bluetooth/ble_uart.o \
|
||||||
drivers/usb/usb_cdc.o \
|
drivers/usb/usb_cdc.o \
|
||||||
drivers/usb/usb_descriptors.o \
|
|
||||||
frozen_content.o \
|
frozen_content.o \
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -292,11 +291,15 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/shared/,\
|
|||||||
libc/printf.o \
|
libc/printf.o \
|
||||||
libc/string0.o \
|
libc/string0.o \
|
||||||
runtime/pyexec.o \
|
runtime/pyexec.o \
|
||||||
|
runtime/mpirq.o \
|
||||||
runtime/interrupt_char.o \
|
runtime/interrupt_char.o \
|
||||||
runtime/sys_stdio_mphal.o \
|
runtime/sys_stdio_mphal.o \
|
||||||
runtime/stdout_helpers.o \
|
runtime/stdout_helpers.o \
|
||||||
timeutils/timeutils.o \
|
timeutils/timeutils.o \
|
||||||
readline/readline.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/,\
|
FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/libm/,\
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user