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

oled stuff

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-11-19 20:03:37 +01:00
parent 5605a3d1d5
commit 33fcf6c080
6 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include <wizHelper.h>
#include <mbusParserExt.h>
#include <mqttComm.h>
#include <oled.h>
#include <mbus/mbus-protocol.h>
@ -116,6 +117,7 @@ static void printError(t_mbusCommHandle *localMbusCommHandle) {
mqttPublishf(MBUS_TOPIC, "{\"Status\":\"Error\", \"RequestId\":\"%d\", \"Device\":\"%s\", \"Errors\":\"%d\", \"Requests\":\"%d\", \"ErrorRatio\":\"%.2f\"}",
localMbusCommHandle->requestId, localMbusCommHandle->device->deviceName,
localMbusCommHandle->device->failures, localMbusCommHandle->device->requests, errorRatio);
oledPrint("Error");
}
@ -235,6 +237,7 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
localMbusCommHandle->device->failures, localMbusCommHandle->device->requests, errorRatio,
keys[0], values[0], keys[1], values[1], keys[2], values[2], keys[3], values[3]);
}
oledPrint("Ok");
mbus_data_record_free(data_var->record);
} else {
coloredMsg(LOG_RED, true, "mbc papf [%d] err: unable to parse frame", localMbusCommHandle->requestId);
@ -520,6 +523,7 @@ static e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
mbusCommStats.requestCnt,
mbusCommStats.errorCnt);
oledPrint(mbusDevice->deviceName);
schAdd(handleRequestEngine, (void*) &mbusCommHandle, 0, 0);
res = MBCRR_TRIGGERED;