PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决modbus demo与hello world共用stm32f4xx_it.c导致的编译问题

Browse Source
This commit is contained in:
David Lin
2021-03-07 21:27:35 +08:00
committed by GitHub
parent 4134ad4f55
commit f8a8655993
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c
View File

@@ -242,7 +242,7 @@ void USART2_IRQHandler(void)
{ {
HAL_UART_Receive(&huart2,&tmp,1,1); HAL_UART_Receive(&huart2,&tmp,1,1);
} }
#ifdef USE_MODBUS
else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE)) else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE))
{ {
prvvUARTRxISR(); prvvUARTRxISR();
@@ -253,6 +253,7 @@ void USART2_IRQHandler(void)
prvvUARTTxReadyISR(); prvvUARTTxReadyISR();
} }
#endif /* USE_MODBUS */
} }
/** /**
@@ -275,7 +276,9 @@ void USART3_IRQHandler(void)
void TIM6_DAC_IRQHandler(void) void TIM6_DAC_IRQHandler(void)
{ {
/* USER CODE BEGIN TIM6_DAC_IRQn 0 */ /* USER CODE BEGIN TIM6_DAC_IRQn 0 */
prvvTIMERExpiredISR(); #ifdef USE_MODBUS
prvvTIMERExpiredISR();
#endif/* USE_MODBUS */
/* USER CODE END TIM6_DAC_IRQn 0 */ /* USER CODE END TIM6_DAC_IRQn 0 */
HAL_TIM_IRQHandler(&htim6); HAL_TIM_IRQHandler(&htim6);
/* USER CODE BEGIN TIM6_DAC_IRQn 1 */ /* USER CODE BEGIN TIM6_DAC_IRQn 1 */