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 12:04:27 +01:00
parent 802fec74e2
commit 02c093723e
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ static void parseAndPrintFrame() {
if (r == 0) { if (r == 0) {
mbus_data_variable *data_var = &(frame_data.data_var); mbus_data_variable *data_var = &(frame_data.data_var);
if (data_var->header.status) { if (data_var->header.status) {
coloredMsg(LOG_YELLOW, false, "mbc papf [%d] sts: %02x", mbusCommHandle.requestId, data_var->header.status); coloredMsg(LOG_RED, true, "mbc papf [%d] sts: %02x", mbusCommHandle.requestId, data_var->header.status);
} }
if ((data_var->header.status & 0x01)) { if ((data_var->header.status & 0x01)) {
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Application Busy", mbusCommHandle.requestId); coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Application Busy", mbusCommHandle.requestId);
@ -497,7 +497,7 @@ void mbusCommExec() {
break; break;
case MBCS_ERROR: case MBCS_ERROR:
coloredMsg(LOG_RED, false, "mbc hre [%d] state ERROR", mbusCommHandle.requestId); // coloredMsg(LOG_RED, false, "mbc hre [%d] state ERROR", mbusCommHandle.requestId);
show(LED_RED, ON); show(LED_RED, ON);
mbusCommHandle.state = MBCS_ERROR_CONTINUED; mbusCommHandle.state = MBCS_ERROR_CONTINUED;
// no break // no break
@ -507,7 +507,8 @@ void mbusCommExec() {
break; break;
case MBCS_TIMEOUT: case MBCS_TIMEOUT:
coloredMsg(LOG_RED, false, "mbc hre [%d] state TIMEOUT", mbusCommHandle.requestId); // coloredMsg(LOG_RED, false, "mbc hre [%d] state TIMEOUT", mbusCommHandle.requestId);
coloredMsg(LOG_RED, true, "mbc hre [%d] timeout", mbusCommHandle.requestId);
mbusCommStats.mbusErrorCnt += 1; mbusCommStats.mbusErrorCnt += 1;
mbusCommHandle.device->failures += 1; mbusCommHandle.device->failures += 1;
mbusCommHandle.startTime = 0; // disable timeout mbusCommHandle.startTime = 0; // disable timeout