wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start refactoring transmitting

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-25 11:51:55 +01:00
parent 4bae6dce3c
commit 3e31693cf8
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cube/User/Src/mbusComm.c
View File

@ -261,6 +261,8 @@ void mbusCommISR() {
uint32_t isrflags = READ_REG(mbusUart.Instance->SR); uint32_t isrflags = READ_REG(mbusUart.Instance->SR);
uint32_t cr1its = READ_REG(mbusUart.Instance->CR1); uint32_t cr1its = READ_REG(mbusUart.Instance->CR1);
// RXNEIE doesn't need to be considered since it is always on and more over the
// RXNE flag is cleared by reading the DR, which is done in any case
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) {
mbusCommStats.uartOverrunCnt += 1; mbusCommStats.uartOverrunCnt += 1;
@ -275,8 +277,9 @@ void mbusCommISR() {
} }
} }
// TXEIE needs to be considered since TXE is cleared by writing the DR, which isn't done
// after the last octet sent
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) { if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) {
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];
mbusCommHandle.sendBuffer.readIdx += 1; mbusCommHandle.sendBuffer.readIdx += 1;