mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
MP: Update to MP 1.9.4
This commit is contained in:
parent
deadb0980d
commit
9b08e91557
@ -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 \
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 0193a8e152e7dca387a321772a761a2e8282b194
|
||||
Subproject commit 057a10d290e4071d93c8478ecf91c40fc7befb0c
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user