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:54:57 +01:00
parent 6d3b3e12ca
commit 9198753e4b
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,10 +276,12 @@ void mbusCommExec() {
if (mbusCommHandle.waitForOctet) { if (mbusCommHandle.waitForOctet) {
// when data available, take from buffer and put into receivedOctet // when data available, take from buffer and put into receivedOctet
// otherwise return // otherwise return
if (-1 == (receivedOctet = ringbufferGetOne(&(mbusCommHandle.receiveBuffer)))) { int ro = ringbufferGetOne(&(mbusCommHandle.receiveBuffer));
if (-1 == ro) {
return; return;
} }
receivedOctet = (uint8_t) ro;
coloredMsg(LOG_RED, false, "RO: 0x%02x", receivedOctet); coloredMsg(LOG_RED, false, "RO: 0x%02x", receivedOctet);
} }

2
cube/User/Src/ringbuffer.c
View File

@ -74,7 +74,7 @@ uint8_t *ringbufferGet(ringbuffer_t *handle, uint32_t dataLen) {
int ringbufferGetOne(ringbuffer_t *handle) { int ringbufferGetOne(ringbuffer_t *handle) {
int res = -1; int res = -1;
if (! ringbufferEmpty(handle)) { if (handle->bufferReadIdx != handle->bufferWriteIdx) {
uint8_t r = *(handle->buffer + handle->bufferReadIdx); uint8_t r = *(handle->buffer + handle->bufferReadIdx);
handle->bufferReadIdx += 1; handle->bufferReadIdx += 1;
if (handle->bufferReadIdx == handle->bufferSize) { if (handle->bufferReadIdx == handle->bufferSize) {