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

works better now

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-24 22:57:33 +01:00
parent 950c7b07d2
commit a05598d89a
No known key found for this signature in database
GPG Key ID: 656C88C7C1734267
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,9 +280,10 @@ void mbusCommExec() {
static uint8_t calculatedChksum = 0; static uint8_t calculatedChksum = 0;
uint8_t receivedOctet = 0; uint8_t receivedOctet = 0;
if ((mbusCommHandle.startTime != 0) && (mbusCommHandle.startTime + 2500 < HAL_GetTick())) { if ((mbusCommHandle.startTime != 0) && ((mbusCommHandle.startTime + 2500) < HAL_GetTick())) {
mbusCommHandle.state = MBCS_TIMEOUT;
coloredMsg(LOG_RED, false, "TIMEOUT!!"); coloredMsg(LOG_RED, false, "TIMEOUT!!");
mbusCommHandle.startTime = 0;
mbusCommHandle.state = MBCS_TIMEOUT;
} else if (mbusCommHandle.waitForOctet) { } else if (mbusCommHandle.waitForOctet) {
if (mbusCommHandle.receiveBuffer.readIdx >= mbusCommHandle.receiveBuffer.writeIdx) { if (mbusCommHandle.receiveBuffer.readIdx >= mbusCommHandle.receiveBuffer.writeIdx) {
return; return;
@ -297,7 +298,6 @@ void mbusCommExec() {
switch (mbusCommHandle.state) { switch (mbusCommHandle.state) {
case MBCS_IDLE: case MBCS_IDLE:
// coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state IDLE", mbusCommHandle.requestId); // coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state IDLE", mbusCommHandle.requestId);
mbusCommHandle.startTime = 0;
break; break;
case MBCS_SEND: case MBCS_SEND:
@ -484,7 +484,6 @@ void mbusCommExec() {
coloredMsg(LOG_RED, false, "mbc hre [%d] state TIMEOUT", mbusCommHandle.requestId); coloredMsg(LOG_RED, false, "mbc hre [%d] state TIMEOUT", mbusCommHandle.requestId);
mbusCommStats.errorCnt += 1; mbusCommStats.errorCnt += 1;
mbusCommHandle.device->failures += 1; mbusCommHandle.device->failures += 1;
mbusCommHandle.startTime = 0;
printError(); printError();
mbusCommHandle.receiving = false; mbusCommHandle.receiving = false;
if (mbusCommHandle.frame.userdata != NULL) { if (mbusCommHandle.frame.userdata != NULL) {