diff --git a/src/micropython b/src/micropython index 6bb935d61..33f9bbedf 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 6bb935d61426b0ca8e13476761bf5736fbc43bec +Subproject commit 33f9bbedfb5452301da7824fa013515e1b5287d1 diff --git a/src/omv/boards/OPENMV2/omv_boardconfig.h b/src/omv/boards/OPENMV2/omv_boardconfig.h index 530a80916..fc2c51835 100644 --- a/src/omv/boards/OPENMV2/omv_boardconfig.h +++ b/src/omv/boards/OPENMV2/omv_boardconfig.h @@ -40,8 +40,8 @@ #define OMV_BOOTLDR_LED_PIN (GPIO_PIN_2) #define OMV_BOOTLDR_LED_PORT (GPIOC) -// JPEG buffer size, almost 14000 bytes + headers (~14KBs) -#define OMV_JPEG_BUF_SIZE (14000) +// JPEG buffer size, almost 8000 bytes + headers (~8KBs) +#define OMV_JPEG_BUF_SIZE (8000) /* SCCB/I2C */ #define SCCB_I2C (I2C1) diff --git a/src/omv/stm32fxxx.ld.S b/src/omv/stm32fxxx.ld.S index 183942721..a1ee27460 100755 --- a/src/omv/stm32fxxx.ld.S +++ b/src/omv/stm32fxxx.ld.S @@ -36,15 +36,15 @@ ENTRY(Reset_Handler) // fb alloc memory is dynamic = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp) // Note this overwrites the 2KBs line buf when not reading a frame. - #define FB_ALLOC_SIZE (20K) // minimum fb alloc size + #define FB_ALLOC_SIZE (14K) // minimum fb alloc size // Located in DMA memory #define LINE_BUF_SIZE (2K) // Image line buffer round(320 * 2BPP * 2 buffers). #define MSC_BUF_SIZE (2K) // USB MSC bot data #define VFS_BUF_SIZE (1K) // VFS sturct + FATFS file buffer (624 bytes) - #define FFS_BUF_SIZE (4K) // Flash filesystem cache + #define FFS_BUF_SIZE (16K) // Flash filesystem cache // TODO Set OMV_JPEG_BUF_SIZE if you change this - #define JPEG_BUF_SIZE (14K) // IDE JPEG buffer + #define JPEG_BUF_SIZE (8K) // IDE JPEG buffer #define FLASH_ORIGIN 0x08000000 #define FLASH_LENGTH 1024K @@ -56,10 +56,10 @@ ENTRY(Reset_Handler) #define CCM_LENGTH 64K #define SRAM1_ORIGIN 0x20000000 - #define SRAM1_LENGTH 169K + #define SRAM1_LENGTH 163K - #define SRAM2_ORIGIN 0x2002A400 - #define SRAM2_LENGTH 23K + #define SRAM2_ORIGIN 0x20028C00 + #define SRAM2_LENGTH 29K #elif defined(OPENMV7) #define FB_MEMORY SRAM1 // Framebuffer, fb_alloc