diff --git a/halport/gins.c b/halport/gins.c index 194224f..f8c2b8f 100644 --- a/halport/gins.c +++ b/halport/gins.c @@ -66,6 +66,8 @@ DEFINE_GLOBAL(SPI_HandleTypeDef, hspi1); DEFINE_GLOBAL(SPI_HandleTypeDef, hspi2); DEFINE_GLOBAL(SPI_HandleTypeDef, hspi3); DEFINE_GLOBAL(ADC_HandleTypeDef, hadc1); +DEFINE_GLOBAL(ADC_HandleTypeDef, hadc2); +DEFINE_GLOBAL(ADC_HandleTypeDef, hadc3); /*********************************************************************************************************************** * PTR * diff --git a/halport/gins.h b/halport/gins.h index 79c29bd..d1109a8 100644 --- a/halport/gins.h +++ b/halport/gins.h @@ -59,6 +59,8 @@ EXTERN_GLOBAL(SPI_HandleTypeDef, hspi2); EXTERN_GLOBAL(SPI_HandleTypeDef, hspi3); EXTERN_GLOBAL(ADC_HandleTypeDef, hadc1); +EXTERN_GLOBAL(ADC_HandleTypeDef, hadc2); +EXTERN_GLOBAL(ADC_HandleTypeDef, hadc3); EXTERN_GLOBAL(IWDG_HandleTypeDef, hiwdg); diff --git a/halport/stm32irq.c b/halport/stm32irq.c index ace8fda..e6b9c83 100644 --- a/halport/stm32irq.c +++ b/halport/stm32irq.c @@ -6,7 +6,6 @@ #define TAG "IRQ" - /*********************************************************************************************************************** * DMAIRQ * ***********************************************************************************************************************/ @@ -49,10 +48,13 @@ void USART2_IRQHandler(void) { HAL_UART_IRQHandler(&huart2); } void USART3_IRQHandler(void) { HAL_UART_IRQHandler(&huart3); } void UART4_IRQHandler(void) { HAL_UART_IRQHandler(&huart4); } -void OTG_FS_IRQHandler(void) { - HAL_HCD_IRQHandler(&hhcd_USB_OTG_FS); -} +void OTG_FS_IRQHandler(void) { HAL_HCD_IRQHandler(&hhcd_USB_OTG_FS); } +void ADC_IRQHandler(void) { + if (hadc1.Instance != NULL) HAL_ADC_IRQHandler(&hadc1); + if (hadc2.Instance != NULL) HAL_ADC_IRQHandler(&hadc2); + if (hadc3.Instance != NULL) HAL_ADC_IRQHandler(&hadc3); +} /*********************************************************************************************************************** * HAL IF * ***********************************************************************************************************************/