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

Zwave: fix from Mx112

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-11-23 11:05:58 +00:00
parent 1e41ad350a
commit 0a13c7182d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/10_ZWave.pm
View File

@ -438,13 +438,13 @@ ZWave_ParseMeter($)
my $prec = $prectab[($v2 >> 5) & 0x7]; my $prec = $prectab[($v2 >> 5) & 0x7];
my $scale = ($v2 >> 3) & 0x3; my $scale = ($v2 >> 3) & 0x3;
my $size = ($v2 >> 0) & 0x7; my $size = ($v2 >> 0) & 0x7;
my @txt = ("undef", "power", "gas", "water"); my @txt = ("undef", "energy", "gas", "water");
my $txt = ($v1 > $#txt ? "undef" : $txt[$v1]); my $txt = ($v1 > $#txt ? "undef" : $txt[$v1]);
my %unit = (energy => ["kWh", "kVAh", "W", "pulseCount"], my %unit = (energy => ["kWh", "kVAh", "W", "pulseCount"],
gas => ["m3", "feet3", "undef", "pulseCount"], gas => ["m3", "feet3", "undef", "pulseCount"],
water => ["m3", "feet3", "USgallons", "pulseCount"]); water => ["m3", "feet3", "USgallons", "pulseCount"]);
my $unit = $txt eq "undef" ? "undef" : $unit{$txt}[$scale]; my $unit = $txt eq "undef" ? "undef" : $unit{$txt}[$scale];
$txt = "power" if ($unit == "W"); $txt = "power" if ($unit eq "W");
$v3 = hex(substr($v3, 0, 2*$size))/$prec; $v3 = hex(substr($v3, 0, 2*$size))/$prec;
return "$txt:$v3 $unit"; return "$txt:$v3 $unit";
} }