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

Compare commits

base: wn:working-until-20221016
Branches Tags
wn:master wn:fix_power_export_issue wn:add_vif_volume wn:configuration_by_command wn:transmit_by_interrupt wn:refactor_meterbus_comm wn:oled_multiple_screens wn:mbusTxCplt
wn:negative_power_values_are_correct_now wn:works_with_gas_now wn:working-until-20221016
...
compare: wn:fix_power_export_issue
Branches Tags
wn:master wn:fix_power_export_issue wn:add_vif_volume wn:configuration_by_command wn:transmit_by_interrupt wn:refactor_meterbus_comm wn:oled_multiple_screens wn:mbusTxCplt
wn:negative_power_values_are_correct_now wn:works_with_gas_now wn:working-until-20221016

2 Commits
working-un ... fix_power_

Author SHA1 Message Date
Wolfgang Hottgenroth
13c8344276 allow negative values from mbus 2023-03-15 22:55:37 +01:00
Wolfgang Hottgenroth
b7071379b9 add volume 2022-10-16 19:40:34 +02:00
2 changed files with 8 additions and 1 deletions
Expand all files Collapse all files

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

@ -218,7 +218,7 @@ static void parseAndPrintFrame() {
// mbusCommHandle.requestId, // mbusCommHandle.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); int32_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, false, "mbc papf [%d] %s is %.1f %s (%d * 10^%d)", coloredMsg(LOG_YELLOW, false, "mbc papf [%d] %s is %.1f %s (%d * 10^%d)",
mbusCommHandle.requestId, parsedVIB.name, weightedValue, parsedVIB.unit, mbusCommHandle.requestId, parsedVIB.name, weightedValue, parsedVIB.unit,

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

@ -12,12 +12,14 @@ static const char NAME_VOLTAGE[] = "Voltage";
static const char NAME_CURRENT[] = "Current"; static const char NAME_CURRENT[] = "Current";
static const char NAME_POWER[] = "Power"; static const char NAME_POWER[] = "Power";
static const char NAME_ENERGY[] = "Energy"; static const char NAME_ENERGY[] = "Energy";
static const char NAME_VOLUME[] = "Volume";
static const char NAME_UNKNOWN[] = "unknown"; static const char NAME_UNKNOWN[] = "unknown";
static const char UNIT_VOLT[] = "V"; static const char UNIT_VOLT[] = "V";
static const char UNIT_AMPERE[] = "A"; static const char UNIT_AMPERE[] = "A";
static const char UNIT_WATT[] = "W"; static const char UNIT_WATT[] = "W";
static const char UNIT_WATTHOUR[] = "Wh"; static const char UNIT_WATTHOUR[] = "Wh";
static const char UNIT_QUBICMETER[] = "m3";
static const char UNIT_UNKNOWN[] = "?"; static const char UNIT_UNKNOWN[] = "?";
static parsedVIB_t parseVIB_FB(mbus_value_information_block vib) { static parsedVIB_t parseVIB_FB(mbus_value_information_block vib) {
@ -61,6 +63,11 @@ static parsedVIB_t parseVIB_default(mbus_value_information_block vib) {
parsedVIB.unit = UNIT_WATT; parsedVIB.unit = UNIT_WATT;
parsedVIB.exponent = (vib.vif & 0b0111) - 3; parsedVIB.exponent = (vib.vif & 0b0111) - 3;
parsedVIB.found = true; parsedVIB.found = true;
} else if ((vib.vif & 0b01111000) == 0b00010000) {
parsedVIB.name = NAME_VOLUME;
parsedVIB.unit = UNIT_QUBICMETER;
parsedVIB.exponent = (vib.vif & 0b0111) - 3;
parsedVIB.found = true;
} else { } else {
coloredMsg(LOG_RED, true, "mpe pvd unknown vif 0x%02x", vib.vif); coloredMsg(LOG_RED, true, "mpe pvd unknown vif 0x%02x", vib.vif);
} }