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

vif parsing

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-17 19:18:33 +01:00
parent 59e6482b3f
commit f27c2327b8
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,30 +164,24 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
for (uint8_t j = 0; j < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; j++) { for (uint8_t j = 0; j < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; j++) {
if ((localMbusCommHandle->device->consideredField[j].index == i) && if ((localMbusCommHandle->device->consideredField[j].index == i) &&
(strlen(localMbusCommHandle->device->consideredField[j].label) > 0)) { (strlen(localMbusCommHandle->device->consideredField[j].label) > 0)) {
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] txt: I:%d, L:%s, VIF: 0x%02x U:%s V:%s",
localMbusCommHandle->requestId,
i,
localMbusCommHandle->device->consideredField[j].label,
record->drh.vib.vif,
mbus_data_record_unit(record),
mbus_data_record_value(record));
for (size_t vifeIdx = 0; vifeIdx < record->drh.vib.nvife; vifeIdx++) {
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] vife %d 0x%02x",
localMbusCommHandle->requestId,
vifeIdx,
record->drh.vib.vife[vifeIdx]);
}
parsedVIB_t parsedVIB = parseVIB(record->drh.vib); parsedVIB_t parsedVIB = parseVIB(record->drh.vib);
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] parsed VIB N: %s, U: %s, E: %d", coloredMsg(LOG_YELLOW, false, "mbc papf [%d] parsed VIB N: %s, U: %s, E: %d",
localMbusCommHandle->requestId, localMbusCommHandle->requestId,
parsedVIB.name, parsedVIB.unit, parsedVIB.exponent); parsedVIB.name, parsedVIB.unit, parsedVIB.exponent);
if (parsedVIB.found) { if (parsedVIB.found) {
uint32_t value = strtol(mbus_data_record_value(record), NULL, 10); uint32_t value = strtol(mbus_data_record_value(record), NULL, 10);
float weightedValue = ((float) value) * powf(10.0, ((float) parsedVIB.exponent)); float weightedValue = ((float) value) * powf(10.0, ((float) parsedVIB.exponent));
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] result: %s is %.1f %s (%d * 10^%d)", coloredMsg(LOG_YELLOW, true, "mbc papf [%d] %s is %.1f %s (%d * 10^%d)",
localMbusCommHandle->requestId, parsedVIB.name, weightedValue, parsedVIB.unit, localMbusCommHandle->requestId, parsedVIB.name, weightedValue, parsedVIB.unit,
value, parsedVIB.exponent); value, parsedVIB.exponent);
} else {
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] L:%s, VIF: 0x%02x U:%s V:%s",
localMbusCommHandle->requestId,
localMbusCommHandle->device->consideredField[j].label,
record->drh.vib.vif,
mbus_data_record_unit(record),
mbus_data_record_value(record));
} }
} }