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

refactoring meterbus

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-24 14:31:37 +01:00
parent a1c602a021
commit 0397d61e56
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,13 +253,16 @@ 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); // uint32_t cr1its = READ_REG(mbusUart.Instance->CR1);
// uint32_t cr3its = READ_REG(mbusUart.Instance->CR3); // uint32_t cr3its = READ_REG(mbusUart.Instance->CR3);
if (((isrflags & USART_SR_RXNE) != RESET) && ((cr1its & USART_CR1_RXNEIE) != RESET)) {
if (((isrflags & USART_SR_RXNE) != RESET) || ((isrflags & USART_SR_ORE) != RESET)) {
uint8_t data = (uint8_t)(mbusUart.Instance->DR & (uint8_t)0x00FF); uint8_t data = (uint8_t)(mbusUart.Instance->DR & (uint8_t)0x00FF);
coloredMsg(LOG_RED, false, "mbc isr 0x%02x", data); coloredMsg(LOG_RED, false, "mbc isr 0x%02x", data);
return; return;
} else {
coloredMsg(LOG_RED, false, "mbc isr error 0x%02x", isrflags);
} }
} }