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:06:10 +01:00
parent 354a1670ee
commit 081fe26daf
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,9 @@ void mbusCommISR() {
mbusCommHandle.receiveBuffer.buffer[mbusCommHandle.receiveBuffer.writeIdx] = data; mbusCommHandle.receiveBuffer.buffer[mbusCommHandle.receiveBuffer.writeIdx] = data;
mbusCommHandle.receiveBuffer.writeIdx += 1; mbusCommHandle.receiveBuffer.writeIdx += 1;
} }
} else if ((isrflags & USART_SR_TXE) != RESET) { }
if ((isrflags & USART_SR_TXE) != RESET) {
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;
@ -280,16 +282,19 @@ void mbusCommISR() {
__HAL_UART_ENABLE_IT(&mbusUart, UART_IT_TC); __HAL_UART_ENABLE_IT(&mbusUart, UART_IT_TC);
} }
} }
} else if ((isrflags & USART_SR_TC) != RESET) { }
if ((isrflags & USART_SR_TC) != RESET) {
__HAL_UART_DISABLE_IT(&mbusUart, UART_IT_TC); __HAL_UART_DISABLE_IT(&mbusUart, UART_IT_TC);
mbusCommHandle.state = MBCS_SENDING_DONE; mbusCommHandle.state = MBCS_SENDING_DONE;
} else { }
if ((isrflags & USART_SR_FE) != RESET) {
if ((isrflags & USART_SR_FE) != RESET) {
mbusCommStats.uartFramingErrCnt += 1; mbusCommStats.uartFramingErrCnt += 1;
} }
if ((isrflags & USART_SR_PE) != RESET) {
if ((isrflags & USART_SR_PE) != RESET) {
mbusCommStats.uartParityErrCnt += 1; mbusCommStats.uartParityErrCnt += 1;
}
} }
} }