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

10_ZWave.pm: slight meter code reformatting, making it easier to read

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17035 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-07-27 09:30:45 +00:00
parent d8a4ddd1f7
commit f222e25bf4
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/10_ZWave.pm
View File

@ -1731,20 +1731,15 @@ ZWave_meterParse($$)
my $meter_type_text = ($meter_type > $#meter_type_text ?
"undef" : $meter_type_text[$meter_type]);
my $precision = ($v2 >>5) & 0x7;
# no definition for text or numbers, used as -> (10 ** hex($precision))
my $precision = ($v2>>5) & 0x7; # 3 bits
my $scale = ($v2>>3) & 0x3; # 2 bits, meaning unit
my $size = $v2 & 0x7; # 3 bits
# V3 use 3 bit, in V2 there are only 2 bit available
# V3 use bit 7 of first byte as bit 3 of scale
my $scale = ($v2 >> 3) & 0x3;
$scale |= (($v1 & 0x80) >> 5);
my $unit_text = ($meter_type_text eq "undef" ?
"undef" : $zwm_unit{$meter_type_text}[$scale]);
my $size = $v2 & 0x7;
$meter_type_text = "power" if ($unit_text eq "W");
$meter_type_text = "power" if ($unit_text eq "W");
$meter_type_text = "voltage" if ($unit_text eq "V");
$meter_type_text = "current" if ($unit_text eq "A");