From b55d03889995ef771b9a7ee006871da8302d4f26 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 15 Sep 2012 02:06:08 +0200 Subject: [PATCH 1/2] fixed typo in vif list --- mbus/mbus-protocol-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c index 41fd3b0..52f11e9 100755 --- a/mbus/mbus-protocol-aux.c +++ b/mbus/mbus-protocol-aux.c @@ -188,7 +188,7 @@ mbus_variable_vif vif_table[] = { { 0x6E, 1.0e0, "Units for H.C.A.", "H.C.A." }, /* E110 1111 Reserved */ - { 0x6E, 0.0, "Reserved", "Reserved" }, + { 0x6F, 0.0, "Reserved", "Reserved" }, /* E111 00nn Averaging Duration s */ { 0x70, 1.0, "s", "Averaging Duration" }, /* seconds */ From 564483e0925c4055c92b544a3e6e826b8e55063f Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 15 Sep 2012 02:11:14 +0200 Subject: [PATCH 2/2] new error message in case of unknown vif --- mbus/mbus-protocol-aux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c index 52f11e9..57758eb 100755 --- a/mbus/mbus-protocol-aux.c +++ b/mbus/mbus-protocol-aux.c @@ -974,7 +974,8 @@ mbus_vif_unit_normalize(int vif, double value, char **unit_out, double *value_ou } } - *unit_out = strdup("Unknown (VIF=0x%.2X)"); + MBUS_ERROR("%s: Unknown VIF 0x%03X\n", __PRETTY_FUNCTION__, newVif); + *unit_out = strdup("Unknown (VIF=0x%.02X)"); *quantity_out = strdup("Unknown"); exponent = 0.0; *value_out = 0.0;