FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 17:36:39 +00:00
Code Issues Releases Wiki Activity

WMBUS: support for all valid DIFs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6442 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
kaihs 2014-08-22 15:19:18 +00:00
parent 4d5b39114f
commit 080fb0adaf
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/WMBus.pm
View File

@ -38,6 +38,7 @@ use constant {
DIF_NONE => 0x00, DIF_NONE => 0x00,
DIF_INT8 => 0x01, DIF_INT8 => 0x01,
DIF_INT16 => 0x02, DIF_INT16 => 0x02,
DIF_INT24 => 0x03,
DIF_INT32 => 0x04, DIF_INT32 => 0x04,
DIF_FLOAT32 => 0x05, DIF_FLOAT32 => 0x05,
DIF_INT48 => 0x06, DIF_INT48 => 0x06,
@ -642,6 +643,7 @@ sub decodeValueInformationBlock($$$) {
$vif = unpack('C', $vib); $vif = unpack('C', $vib);
$offset = 1; $offset = 1;
#printf("vif: %x\n", $vif);
my $isExtension = $vif & VIF_EXTENSION_BIT; my $isExtension = $vif & VIF_EXTENSION_BIT;
if ($isExtension) { if ($isExtension) {
@ -662,12 +664,13 @@ sub decodeValueInformationBlock($$$) {
$dataBlockRef->{errorcode} = ERR_UNKNOWN_VIFE; $dataBlockRef->{errorcode} = ERR_UNKNOWN_VIFE;
} }
$vif = unpack('C', substr($vib,$offset++,1)); $vif = unpack('C', substr($vib,$offset++,1));
#printf("vife: %x\n", $vif);
} }
$vif &= ~VIF_EXTENSION_BIT; $vif &= ~VIF_EXTENSION_BIT;
#printf("vif: %x\n", $vif); #printf("vif w/o ext: %x\n", $vif);
$dataBlockRef->{type} = ''; $dataBlockRef->{type} = '';
VIFID: foreach my $vifType ( keys $vifInfoRef ) { VIFID: foreach my $vifType ( keys $vifInfoRef ) {
@ -736,6 +739,7 @@ sub decodeDataInformationBlock($$$) {
$storageNo |= ($dif & 0b00001111) << ($difExtNo*4)+1; $storageNo |= ($dif & 0b00001111) << ($difExtNo*4)+1;
$tariff |= (($dif & 0b00110000 >> 4)) << (($difExtNo-1)*2); $tariff |= (($dif & 0b00110000 >> 4)) << (($difExtNo-1)*2);
$devUnit |= (($dif & 0b01000000 >> 6)) << ($difExtNo-1); $devUnit |= (($dif & 0b01000000 >> 6)) << ($difExtNo-1);
#printf("dife %x storage %d\n", $dif, $storageNo);
} }
$dataBlockRef->{functionField} = $functionField; $dataBlockRef->{functionField} = $functionField;
@ -745,6 +749,7 @@ sub decodeDataInformationBlock($$$) {
$dataBlockRef->{devUnit} = $devUnit; $dataBlockRef->{devUnit} = $devUnit;
#printf("in DIF: datafield %x\n", $dataBlockRef->{dataField}); #printf("in DIF: datafield %x\n", $dataBlockRef->{dataField});
#print "offset in dif $offset\n";
return $offset; return $offset;
} }
@ -812,15 +817,30 @@ sub decodePayload($$) {
} elsif ($dataBlock->{dataField} == DIF_BCD8) { } elsif ($dataBlock->{dataField} == DIF_BCD8) {
$value = $self->decodeBCD(8, substr($payload,$offset,4)); $value = $self->decodeBCD(8, substr($payload,$offset,4));
$offset += 4; $offset += 4;
} elsif ($dataBlock->{dataField} == DIF_BCD12) {
$value = $self->decodeBCD(12, substr($payload,$offset,6));
$offset += 6;
} elsif ($dataBlock->{dataField} == DIF_INT8) { } elsif ($dataBlock->{dataField} == DIF_INT8) {
$value = unpack('C', substr($payload, $offset, 1)); $value = unpack('C', substr($payload, $offset, 1));
$offset += 1; $offset += 1;
} elsif ($dataBlock->{dataField} == DIF_INT16) { } elsif ($dataBlock->{dataField} == DIF_INT16) {
$value = unpack('v', substr($payload, $offset, 2)); $value = unpack('v', substr($payload, $offset, 2));
$offset += 2; $offset += 2;
} elsif ($dataBlock->{dataField} == DIF_INT24) {
my @bytes = unpack('CCC', substr($payload, $offset, 3));
$offset += 3;
$value = $bytes[0] + $bytes[1] << 8 + $bytes[2] << 16;
} elsif ($dataBlock->{dataField} == DIF_INT32) { } elsif ($dataBlock->{dataField} == DIF_INT32) {
$value = unpack('V', substr($payload, $offset, 4)); $value = unpack('V', substr($payload, $offset, 4));
$offset += 4; $offset += 4;
} elsif ($dataBlock->{dataField} == DIF_INT48) {
my @words = unpack('vvv', substr($payload, $offset, 6));
$value = $words[0] + $words[1] << 16 + $words[2] << 32;
$offset += 6;
} elsif ($dataBlock->{dataField} == DIF_INT64) {
my @lwords = unpack('VV', substr($payload, $offset, 8));
$value = $lwords[0] + $lwords[1] << 32;
$offset += 8;
} elsif ($dataBlock->{dataField} == DIF_VARLEN) { } elsif ($dataBlock->{dataField} == DIF_VARLEN) {
my $lvar = unpack('C',substr($payload, $offset++, 1)); my $lvar = unpack('C',substr($payload, $offset++, 1));
#print "in datablock $dataBlockNo: LVAR field " . sprintf("%x", $lvar) . "\n"; #print "in datablock $dataBlockNo: LVAR field " . sprintf("%x", $lvar) . "\n";