From 0a13c7182d327e624e7c6da06c79413acdac50a8 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 23 Nov 2013 11:05:58 +0000 Subject: [PATCH] Zwave: fix from Mx112 git-svn-id: https://svn.fhem.de/fhem/trunk@4269 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_ZWave.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index ff80028d3..c6dd98820 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -438,13 +438,13 @@ ZWave_ParseMeter($) my $prec = $prectab[($v2 >> 5) & 0x7]; my $scale = ($v2 >> 3) & 0x3; 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 %unit = (energy => ["kWh", "kVAh", "W", "pulseCount"], gas => ["m3", "feet3", "undef", "pulseCount"], water => ["m3", "feet3", "USgallons", "pulseCount"]); 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; return "$txt:$v3 $unit"; }