start refactoring transmitting

This commit is contained in:
Wolfgang Hottgenroth 2020-11-25 11:43:27 +01:00
parent f5d33445d9
commit 4bae6dce3c
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F

View File

@ -259,6 +259,7 @@ void mbusCommISR() {
show(DEBUG_1, TOGGLE); show(DEBUG_1, TOGGLE);
uint32_t isrflags = READ_REG(mbusUart.Instance->SR); uint32_t isrflags = READ_REG(mbusUart.Instance->SR);
uint32_t cr1its = READ_REG(mbusUart.Instance->CR1);
if (((isrflags & USART_SR_RXNE) != RESET) || ((isrflags & USART_SR_ORE) != RESET)) { if (((isrflags & USART_SR_RXNE) != RESET) || ((isrflags & USART_SR_ORE) != RESET)) {
if ((isrflags & USART_SR_ORE) != RESET) { if ((isrflags & USART_SR_ORE) != RESET) {
@ -274,7 +275,7 @@ void mbusCommISR() {
} }
} }
if ((isrflags & USART_SR_TXE) != RESET) { if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) {
coloredMsg(LOG_RED, false, "TXE"); coloredMsg(LOG_RED, false, "TXE");
if (mbusCommHandle.sendBuffer.readIdx < mbusCommHandle.sendBuffer.writeIdx) { if (mbusCommHandle.sendBuffer.readIdx < mbusCommHandle.sendBuffer.writeIdx) {
mbusUart.Instance->DR = mbusCommHandle.sendBuffer.buffer[mbusCommHandle.sendBuffer.readIdx]; mbusUart.Instance->DR = mbusCommHandle.sendBuffer.buffer[mbusCommHandle.sendBuffer.readIdx];