From c8f386c9fd03d2ee90d41c6f270c6ec525e89b04 Mon Sep 17 00:00:00 2001 From: kaihs Date: Tue, 17 Feb 2015 20:39:46 +0000 Subject: [PATCH] WMBus: added some missing VIFs git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8025 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/WMBus.pm | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/fhem/FHEM/WMBus.pm b/fhem/FHEM/WMBus.pm index 0ae3545ab..b0649928f 100644 --- a/fhem/FHEM/WMBus.pm +++ b/fhem/FHEM/WMBus.pm @@ -381,6 +381,14 @@ my %VIFInfo = ( unit => '°C', calcFunc => \&valueCalcNumeric, }, + VIF_PRESSURE => { # 10(nn-3) bar 1mbar to 1000mbar + typeMask => 0b01111100, + expMask => 0b00000011, + type => 0b01101000, + bias => -3, + unit => 'bar', + calcFunc => \&valueCalcNumeric, + }, VIF_TIME_POINT_DATE => { # data type G typeMask => 0b01111111, expMask => 0b00000000, @@ -405,6 +413,74 @@ my %VIFInfo = ( unit => '', calcFunc => \&valueCalcNumeric, }, + VIF_FABRICATION_NO => { # Fabrication No + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01111000, + bias => 0, + unit => '', + calcFunc => \&valueCalcNumeric, + }, + VIF_AVERAGING_DURATION_SEC => { # seconds + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110000, + bias => 0, + unit => 'sec', + calcFunc => \&valueCalcNumeric, + }, + VIF_AVERAGING_DURATION_MIN => { # minutes + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110001, + bias => 0, + unit => 'min', + calcFunc => \&valueCalcNumeric, + }, + VIF_AVERAGING_DURATION_HOURS => { # hours + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110010, + bias => 0, + unit => 'hours', + }, + VIF_AVERAGING_DURATION_DAYS => { # days + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110011, + bias => 0, + unit => 'days', + }, + VIF_ACTUALITY_DURATION_SEC => { # seconds + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110100, + bias => 0, + unit => 'sec', + calcFunc => \&valueCalcNumeric, + }, + VIF_ACTUALITY_DURATION_MIN => { # minutes + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110101, + bias => 0, + unit => 'min', + calcFunc => \&valueCalcNumeric, + }, + VIF_ACTUALITY_DURATION_HOURS => { # hours + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110110, + bias => 0, + unit => 'hours', + }, + VIF_ACTUALITY_DURATION_DAYS => { # days + typeMask => 0b01111111, + expMask => 0b00000000, + type => 0b01110111, + bias => 0, + unit => 'days', + }, ); # Codes used with extension indicator $FD, see 8.4.4 on page 80