diff --git a/src/Makefile b/src/Makefile index c71ffb5ee..531f80061 100755 --- a/src/Makefile +++ b/src/Makefile @@ -265,6 +265,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\ uart.o \ systick.o \ i2c.o \ + pyb_i2c.o \ spi.o \ can.o \ pin.o \ diff --git a/src/micropython b/src/micropython index 0193a8e15..057a10d29 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 0193a8e152e7dca387a321772a761a2e8282b194 +Subproject commit 057a10d290e4071d93c8478ecf91c40fc7befb0c diff --git a/src/omv/boards/OPENMV2/omv_boardconfig.h b/src/omv/boards/OPENMV2/omv_boardconfig.h index 345763b73..72470bf91 100644 --- a/src/omv/boards/OPENMV2/omv_boardconfig.h +++ b/src/omv/boards/OPENMV2/omv_boardconfig.h @@ -152,7 +152,7 @@ #define WINC_EN_PIN (GPIO_PIN_5) #define WINC_CS_PIN (GPIO_PIN_12) #define WINC_RST_PIN (GPIO_PIN_12) -#define WINC_IRQ_PIN (&pin_D13) +#define WINC_IRQ_PIN (pin_D13) #define WINC_EN_PORT (GPIOA) #define WINC_CS_PORT (GPIOB) diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.h b/src/omv/boards/OPENMV3/omv_boardconfig.h index 0699a8b5a..50b2cd729 100644 --- a/src/omv/boards/OPENMV3/omv_boardconfig.h +++ b/src/omv/boards/OPENMV3/omv_boardconfig.h @@ -150,7 +150,7 @@ #define WINC_EN_PIN (GPIO_PIN_5) #define WINC_CS_PIN (GPIO_PIN_12) #define WINC_RST_PIN (GPIO_PIN_12) -#define WINC_IRQ_PIN (&pin_D13) +#define WINC_IRQ_PIN (pin_D13) #define WINC_EN_PORT (GPIOA) #define WINC_CS_PORT (GPIOB) diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.h b/src/omv/boards/OPENMV4/omv_boardconfig.h index 127d5d9ca..0e16ef1ac 100644 --- a/src/omv/boards/OPENMV4/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4/omv_boardconfig.h @@ -174,7 +174,7 @@ #define WINC_EN_PIN (GPIO_PIN_5) #define WINC_CS_PIN (GPIO_PIN_12) #define WINC_RST_PIN (GPIO_PIN_12) -#define WINC_IRQ_PIN (&pin_D13) +#define WINC_IRQ_PIN (pin_D13) #define WINC_EN_PORT (GPIOA) #define WINC_CS_PORT (GPIOB) diff --git a/src/omv/sensor.c b/src/omv/sensor.c index 2e5c2c16f..a23c5ab72 100644 --- a/src/omv/sensor.c +++ b/src/omv/sensor.c @@ -143,7 +143,7 @@ static int dcmi_config(uint32_t jpeg_mode) } // Configure and enable DCMI IRQ Channel - HAL_NVIC_SetPriority(DCMI_IRQn, IRQ_PRI_DCMI, IRQ_SUBPRI_DCMI); + NVIC_SetPriority(DCMI_IRQn, IRQ_PRI_DCMI); HAL_NVIC_EnableIRQ(DCMI_IRQn); return 0; } @@ -170,7 +170,7 @@ static int dma_config() DMAHandle.Init.PeriphBurst = DMA_PBURST_SINGLE; /* Peripheral burst */ // Configure and disable DMA IRQ Channel - HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, IRQ_PRI_DMA21, IRQ_SUBPRI_DMA21); + NVIC_SetPriority(DMA2_Stream1_IRQn, IRQ_PRI_DMA21); HAL_NVIC_DisableIRQ(DMA2_Stream1_IRQn); // Initialize the DMA stream @@ -702,7 +702,7 @@ int sensor_set_vsync_output(GPIO_TypeDef *gpio, uint32_t pin) sensor.vsync_pin = pin; sensor.vsync_gpio = gpio; // Enable VSYNC EXTI IRQ - HAL_NVIC_SetPriority(DCMI_VSYNC_IRQN, IRQ_PRI_EXTINT, IRQ_SUBPRI_EXTINT); + NVIC_SetPriority(DCMI_VSYNC_IRQN, IRQ_PRI_EXTINT); HAL_NVIC_EnableIRQ(DCMI_VSYNC_IRQN); return 0; }