mirror of
https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32.git
synced 2025-02-28 03:47:00 +08:00
更改移植说明
This commit is contained in:
parent
64db971a7e
commit
74b45b22e6
50
README.md
50
README.md
@ -90,23 +90,18 @@ void USART1_IRQHandler(void)
|
|||||||
uint32_t isrflags = READ_REG(huart1.Instance->SR);
|
uint32_t isrflags = READ_REG(huart1.Instance->SR);
|
||||||
uint32_t cr1its = READ_REG(huart1.Instance->CR1);
|
uint32_t cr1its = READ_REG(huart1.Instance->CR1);
|
||||||
|
|
||||||
uint32_t errorflags = 0x00U;
|
/* UART in mode Receiver -------------------------------------------------*/
|
||||||
/* If no error occurs */
|
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
|
||||||
errorflags = (isrflags & (uint32_t)(USART_SR_PE | USART_SR_FE | USART_SR_ORE | USART_SR_NE));
|
|
||||||
if (errorflags == RESET)
|
|
||||||
{
|
{
|
||||||
/* UART in mode Receiver -------------------------------------------------*/
|
mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack);
|
||||||
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
|
return;
|
||||||
{
|
|
||||||
mbMasterStack.peMBMasterFrameCBByteReceivedCur((void *)&mbMasterStack);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
|
|
||||||
{
|
|
||||||
mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
|
||||||
|
{
|
||||||
|
mbMasterStack.peMBMasterFrameCBTransmitterEmptyCur((void *)&mbMasterStack);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* USER CODE END USART1_IRQn 0 */
|
/* USER CODE END USART1_IRQn 0 */
|
||||||
HAL_UART_IRQHandler(&huart1);
|
HAL_UART_IRQHandler(&huart1);
|
||||||
/* USER CODE BEGIN USART1_IRQn 1 */
|
/* USER CODE BEGIN USART1_IRQn 1 */
|
||||||
@ -128,23 +123,18 @@ void USART2_IRQHandler(void)
|
|||||||
uint32_t isrflags = READ_REG(huart2.Instance->SR);
|
uint32_t isrflags = READ_REG(huart2.Instance->SR);
|
||||||
uint32_t cr1its = READ_REG(huart2.Instance->CR1);
|
uint32_t cr1its = READ_REG(huart2.Instance->CR1);
|
||||||
|
|
||||||
uint32_t errorflags = 0x00U;
|
/* UART in mode Receiver -------------------------------------------------*/
|
||||||
/* If no error occurs */
|
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
|
||||||
errorflags = (isrflags & (uint32_t)(USART_SR_PE | USART_SR_FE | USART_SR_ORE | USART_SR_NE));
|
|
||||||
if (errorflags == RESET)
|
|
||||||
{
|
{
|
||||||
/* UART in mode Receiver -------------------------------------------------*/
|
mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack);
|
||||||
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET))
|
return;
|
||||||
{
|
|
||||||
mbStack.peMBFrameCBByteReceivedCur((void *)&mbStack);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
|
|
||||||
{
|
|
||||||
mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET))
|
||||||
|
{
|
||||||
|
mbStack.peMBFrameCBTransmitterEmptyCur((void *)&mbStack);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* USER CODE END USART2_IRQn 0 */
|
/* USER CODE END USART2_IRQn 0 */
|
||||||
HAL_UART_IRQHandler(&huart2);
|
HAL_UART_IRQHandler(&huart2);
|
||||||
/* USER CODE BEGIN USART2_IRQn 1 */
|
/* USER CODE BEGIN USART2_IRQn 1 */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user