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

working now?

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-11-25 10:08:20 +01:00
parent edf1942ad3
commit c14d4fe892
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,14 +97,13 @@ typedef struct {
uint32_t startTime; uint32_t startTime;
uint8_t receiveCnt; uint8_t receiveCnt;
bool waitForOctet; bool waitForOctet;
bool receiving;
e_mbusCommResult result; e_mbusCommResult result;
t_longframe frame; t_longframe frame;
t_mbusDevice *device; t_mbusDevice *device;
} t_mbusCommHandle; } t_mbusCommHandle;
static t_mbusCommHandle mbusCommHandle = { .requestId = 0, .state = MBCS_IDLE, .retryCnt = 0, .cmd = 0, .addr = 0, .startTime = 0, .receiveCnt = 0, .waitForOctet = false, .receiving = false }; static t_mbusCommHandle mbusCommHandle = { .requestId = 0, .state = MBCS_IDLE, .retryCnt = 0, .cmd = 0, .addr = 0, .startTime = 0, .receiveCnt = 0, .waitForOctet = false };
static t_mbusCommStats mbusCommStats = { .mbusRequestCnt = 0, .mbusErrorCnt = 0, .uartOverrunCnt = 0, .uartFramingErrCnt = 0, .uartParityErrCnt = 0 }; static t_mbusCommStats mbusCommStats = { .mbusRequestCnt = 0, .mbusErrorCnt = 0, .uartOverrunCnt = 0, .uartFramingErrCnt = 0, .uartParityErrCnt = 0 };
@ -298,10 +297,8 @@ void mbusCommExec() {
if (mbusCommHandle.receiveBuffer.readIdx >= mbusCommHandle.receiveBuffer.writeIdx) { if (mbusCommHandle.receiveBuffer.readIdx >= mbusCommHandle.receiveBuffer.writeIdx) {
return; return;
} }
receivedOctet = mbusCommHandle.receiveBuffer.buffer[mbusCommHandle.receiveBuffer.readIdx]; receivedOctet = mbusCommHandle.receiveBuffer.buffer[mbusCommHandle.receiveBuffer.readIdx];
mbusCommHandle.receiveBuffer.readIdx += 1; mbusCommHandle.receiveBuffer.readIdx += 1;
mbusCommHandle.waitForOctet = false; mbusCommHandle.waitForOctet = false;
} }
@ -499,7 +496,6 @@ void mbusCommExec() {
mbusCommHandle.startTime = 0; // disable timeout mbusCommHandle.startTime = 0; // disable timeout
mbusCommHandle.waitForOctet = false; // disable receiver mbusCommHandle.waitForOctet = false; // disable receiver
printError(); printError();
mbusCommHandle.receiving = false;
if (mbusCommHandle.frame.userdata != NULL) { if (mbusCommHandle.frame.userdata != NULL) {
free(mbusCommHandle.frame.userdata); free(mbusCommHandle.frame.userdata);
mbusCommHandle.frame.userdata = NULL; mbusCommHandle.frame.userdata = NULL;