FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: move _export decoding to preserve unit (Forum #136912)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28473 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2024-02-04 09:03:38 +00:00
parent cb35c03017
commit 9d487f29f2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/10_ZWave.pm
View File

@ -1848,9 +1848,6 @@ ZWave_meterParse($$)
my $meter_type_text = ($meter_type > $#meter_type_text ?
"UNKNOWN_${meter_type}" : $meter_type_text[$meter_type]);
my $rate_type = ($v1 >> 5) & 0x3; # ("undef","_import", "_export")
$meter_type_text .= "_export" if($meter_type == 1 && $rate_type == 2); #136912
my $precision = ($v2>>5) & 0x7; # 3 bits
my $scale = ($v2>>3) & 0x3; # 2 bits, meaning unit
my $size = $v2 & 0x7; # 3 bits
@ -1867,6 +1864,8 @@ ZWave_meterParse($$)
$meter_type_text = "powerFactor";
$unit_text = "";
}
my $rate_type = ($v1 >> 5) & 0x3; # ("undef","_import", "_export")
$meter_type_text .= "_export" if($meter_type == 1 && $rate_type == 2); #136912
my $mv = hex(substr($v3, 0, 2*$size));
$mv = ($mv >> 31 ? $mv - 2 ** 32 : $mv) if($size == 4);