4
0
mirror of https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32.git synced 2025-02-27 19:27:26 +08:00

修改串口中断bug

This commit is contained in:
XmanAZC 2022-02-13 17:28:46 +08:00
parent 74b45b22e6
commit 8d8b5f8c45
2 changed files with 0 additions and 8 deletions

View File

@ -208,12 +208,10 @@ void USART1_IRQHandler(void)
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET)) if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
{ {
mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack); mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack);
return;
} }
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
{ {
mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack); mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack);
return;
} }
/* USER CODE END USART1_IRQn 0 */ /* USER CODE END USART1_IRQn 0 */
HAL_UART_IRQHandler(&huart1); HAL_UART_IRQHandler(&huart1);
@ -236,12 +234,10 @@ void USART2_IRQHandler(void)
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET)) if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
{ {
mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack); mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack);
return;
} }
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
{ {
mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack); mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack);
return;
} }
/* USER CODE END USART2_IRQn 0 */ /* USER CODE END USART2_IRQn 0 */

View File

@ -94,12 +94,10 @@ void USART1_IRQHandler(void)
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET)) if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
{ {
mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack); mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack);
return;
} }
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
{ {
mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack); mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack);
return;
} }
/* USER CODE END USART1_IRQn 0 */ /* USER CODE END USART1_IRQn 0 */
@ -127,12 +125,10 @@ void USART2_IRQHandler(void)
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET)) if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
{ {
mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack); mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack);
return;
} }
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
{ {
mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack); mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack);
return;
} }
/* USER CODE END USART2_IRQn 0 */ /* USER CODE END USART2_IRQn 0 */