Merge pull request #1657 from openmv/exti_rename

boards/ALL: Rename VSYNC EXTI config.
This commit is contained in:
Ibrahim Abdelkader 2022-06-02 12:52:15 +02:00 committed by GitHub
commit e0529b5c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 35 additions and 19 deletions

View File

@ -297,8 +297,10 @@
#define DCMI_PWDN_HIGH() #define DCMI_PWDN_HIGH()
#endif #endif
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (9) #define DCMI_VSYNC_EXTI_LINE (9)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOG)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define SOFT_I2C_PORT GPIOC #define SOFT_I2C_PORT GPIOC
#define SOFT_I2C_SIOC_PIN GPIO_PIN_10 #define SOFT_I2C_SIOC_PIN GPIO_PIN_10

View File

@ -202,8 +202,10 @@
#define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET) #define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET)
#define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET) #define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET)
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (7) #define DCMI_VSYNC_EXTI_LINE (7)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOB)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define WINC_SPI (SPI2) #define WINC_SPI (SPI2)
#define WINC_SPI_AF (GPIO_AF5_SPI2) #define WINC_SPI_AF (GPIO_AF5_SPI2)

View File

@ -202,8 +202,10 @@
#define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET) #define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET)
#define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET) #define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET)
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (7) #define DCMI_VSYNC_EXTI_LINE (7)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOB)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define WINC_SPI (SPI2) #define WINC_SPI (SPI2)
#define WINC_SPI_AF (GPIO_AF5_SPI2) #define WINC_SPI_AF (GPIO_AF5_SPI2)

View File

@ -295,8 +295,10 @@
#define DCMI_FSYNC_LOW() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_RESET) #define DCMI_FSYNC_LOW() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_RESET)
#define DCMI_FSYNC_HIGH() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_SET) #define DCMI_FSYNC_HIGH() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_SET)
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (7) #define DCMI_VSYNC_EXTI_LINE (7)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOB)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define WINC_SPI (SPI2) #define WINC_SPI (SPI2)
#define WINC_SPI_AF (GPIO_AF5_SPI2) #define WINC_SPI_AF (GPIO_AF5_SPI2)

View File

@ -296,8 +296,10 @@
#define DCMI_FSYNC_LOW() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_RESET) #define DCMI_FSYNC_LOW() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_RESET)
#define DCMI_FSYNC_HIGH() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_SET) #define DCMI_FSYNC_HIGH() HAL_GPIO_WritePin(DCMI_FSYNC_PORT, DCMI_FSYNC_PIN, GPIO_PIN_SET)
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (7) #define DCMI_VSYNC_EXTI_LINE (7)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOB)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define WINC_SPI (SPI2) #define WINC_SPI (SPI2)
#define WINC_SPI_AF (GPIO_AF5_SPI2) #define WINC_SPI_AF (GPIO_AF5_SPI2)

View File

@ -294,8 +294,10 @@
#define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET) #define DCMI_PWDN_LOW() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_RESET)
#define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET) #define DCMI_PWDN_HIGH() HAL_GPIO_WritePin(DCMI_PWDN_PORT, DCMI_PWDN_PIN, GPIO_PIN_SET)
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (7) #define DCMI_VSYNC_EXTI_LINE (7)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOB)
#define DCMI_VSYNC_EXTI_SHARED (0)
#define WINC_SPI (SPI5) #define WINC_SPI (SPI5)
#define WINC_SPI_AF (GPIO_AF5_SPI5) #define WINC_SPI_AF (GPIO_AF5_SPI5)

View File

@ -346,8 +346,10 @@
#define DCMI_FSYNC_HIGH() #define DCMI_FSYNC_HIGH()
#endif #endif
#define DCMI_VSYNC_IRQN EXTI9_5_IRQn #define DCMI_VSYNC_EXTI_IRQN (EXTI9_5_IRQn)
#define DCMI_VSYNC_IRQ_LINE (5) #define DCMI_VSYNC_EXTI_LINE (5)
#define DCMI_VSYNC_EXTI_GPIO (EXTI_GPIOI)
#define DCMI_VSYNC_EXTI_SHARED (1)
#define SOFT_I2C_PORT GPIOB #define SOFT_I2C_PORT GPIOB
#define SOFT_I2C_SIOC_PIN GPIO_PIN_10 #define SOFT_I2C_SIOC_PIN GPIO_PIN_10

View File

@ -334,20 +334,22 @@ int sensor_set_vsync_callback(vsync_cb_t vsync_cb)
{ {
sensor.vsync_callback = vsync_cb; sensor.vsync_callback = vsync_cb;
if (sensor.vsync_callback == NULL) { if (sensor.vsync_callback == NULL) {
#if (DCMI_VSYNC_EXTI_SHARED == 0)
// Disable VSYNC EXTI IRQ // Disable VSYNC EXTI IRQ
HAL_NVIC_DisableIRQ(DCMI_VSYNC_IRQN); HAL_NVIC_DisableIRQ(DCMI_VSYNC_EXTI_IRQN);
#endif
} else { } else {
// Enable VSYNC EXTI IRQ // Enable VSYNC EXTI IRQ
NVIC_SetPriority(DCMI_VSYNC_IRQN, IRQ_PRI_EXTINT); NVIC_SetPriority(DCMI_VSYNC_EXTI_IRQN, IRQ_PRI_EXTINT);
HAL_NVIC_EnableIRQ(DCMI_VSYNC_IRQN); HAL_NVIC_EnableIRQ(DCMI_VSYNC_EXTI_IRQN);
} }
return 0; return 0;
} }
void DCMI_VsyncExtiCallback() void DCMI_VsyncExtiCallback()
{ {
if (__HAL_GPIO_EXTI_GET_FLAG(1 << DCMI_VSYNC_IRQ_LINE)) { if (__HAL_GPIO_EXTI_GET_FLAG(1 << DCMI_VSYNC_EXTI_LINE)) {
__HAL_GPIO_EXTI_CLEAR_FLAG(1 << DCMI_VSYNC_IRQ_LINE); __HAL_GPIO_EXTI_CLEAR_FLAG(1 << DCMI_VSYNC_EXTI_LINE);
if (sensor.vsync_callback != NULL) { if (sensor.vsync_callback != NULL) {
sensor.vsync_callback(HAL_GPIO_ReadPin(DCMI_VSYNC_PORT, DCMI_VSYNC_PIN)); sensor.vsync_callback(HAL_GPIO_ReadPin(DCMI_VSYNC_PORT, DCMI_VSYNC_PIN));
} }