diff --git a/Power_Pico/Core/Src/stm32f4xx_it.c b/Power_Pico/Core/Src/stm32f4xx_it.c index 3940eea..363f633 100644 --- a/Power_Pico/Core/Src/stm32f4xx_it.c +++ b/Power_Pico/Core/Src/stm32f4xx_it.c @@ -22,7 +22,6 @@ #include "stm32f4xx_it.h" /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ -#include "usart.h" #include "adc.h" #include "gate.h" /* USER CODE END Includes */ @@ -58,12 +57,10 @@ /* USER CODE END 0 */ /* External variables --------------------------------------------------------*/ +extern PCD_HandleTypeDef hpcd_USB_OTG_FS; extern DMA_HandleTypeDef hdma_adc1; extern DMA_HandleTypeDef hdma_spi2_tx; extern TIM_HandleTypeDef htim1; -extern DMA_HandleTypeDef hdma_usart6_rx; -extern DMA_HandleTypeDef hdma_usart6_tx; -extern UART_HandleTypeDef huart6; extern TIM_HandleTypeDef htim11; /* USER CODE BEGIN EV */ @@ -203,10 +200,7 @@ void TIM1_TRG_COM_TIM11_IRQHandler(void) void DMA2_Stream0_IRQHandler(void) { /* USER CODE BEGIN DMA2_Stream0_IRQn 0 */ - if(__HAL_DMA_GET_FLAG(&hdma_adc1, DMA_FLAG_TCIF0_4)) { - __HAL_DMA_CLEAR_FLAG(&hdma_adc1, DMA_FLAG_TCIF0_4); - Gate_Swich_and_UART_Send(adc_packet); - } + /* USER CODE END DMA2_Stream0_IRQn 0 */ HAL_DMA_IRQHandler(&hdma_adc1); /* USER CODE BEGIN DMA2_Stream0_IRQn 1 */ @@ -215,52 +209,17 @@ void DMA2_Stream0_IRQHandler(void) } /** - * @brief This function handles DMA2 stream1 global interrupt. + * @brief This function handles USB On The Go FS global interrupt. */ -void DMA2_Stream1_IRQHandler(void) +void OTG_FS_IRQHandler(void) { - /* USER CODE BEGIN DMA2_Stream1_IRQn 0 */ + /* USER CODE BEGIN OTG_FS_IRQn 0 */ - /* USER CODE END DMA2_Stream1_IRQn 0 */ - HAL_DMA_IRQHandler(&hdma_usart6_rx); - /* USER CODE BEGIN DMA2_Stream1_IRQn 1 */ + /* USER CODE END OTG_FS_IRQn 0 */ + HAL_PCD_IRQHandler(&hpcd_USB_OTG_FS); + /* USER CODE BEGIN OTG_FS_IRQn 1 */ - /* USER CODE END DMA2_Stream1_IRQn 1 */ -} - -/** - * @brief This function handles DMA2 stream6 global interrupt. - */ -void DMA2_Stream6_IRQHandler(void) -{ - /* USER CODE BEGIN DMA2_Stream6_IRQn 0 */ - - /* USER CODE END DMA2_Stream6_IRQn 0 */ - HAL_DMA_IRQHandler(&hdma_usart6_tx); - /* USER CODE BEGIN DMA2_Stream6_IRQn 1 */ - - /* USER CODE END DMA2_Stream6_IRQn 1 */ -} - -/** - * @brief This function handles USART6 global interrupt. - */ -void USART6_IRQHandler(void) -{ - /* USER CODE BEGIN USART6_IRQn 0 */ - if(__HAL_UART_GET_FLAG(&huart6, UART_FLAG_IDLE) != RESET) - { - uart_receive_flag = 1; - __HAL_UART_CLEAR_FLAG(&huart6, UART_FLAG_IDLE); - HAL_UART_DMAStop(&huart6); - HAL_UART_Receive_DMA(&huart6, uart_receive_buf, USART_RX_BUFFER_SIZE); - } - - /* USER CODE END USART6_IRQn 0 */ - HAL_UART_IRQHandler(&huart6); - /* USER CODE BEGIN USART6_IRQn 1 */ - - /* USER CODE END USART6_IRQn 1 */ + /* USER CODE END OTG_FS_IRQn 1 */ } /* USER CODE BEGIN 1 */