From 78bbe6a3b930eb70d7839b7dd8fe64b9d262f453 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 19 Nov 2013 08:25:35 +0000
Subject: [PATCH] ZWave: power reading is now energy if the unit is not W

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4248 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_ZWave.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index d9e75e89a..ff80028d3 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -440,10 +440,11 @@ ZWave_ParseMeter($)
   my $size  = ($v2 >> 0) & 0x7;
   my @txt = ("undef", "power", "gas", "water");
   my $txt = ($v1 > $#txt ? "undef" : $txt[$v1]);
-  my %unit = (power => ["kWh", "kVAh", "W", "pulseCount"],
+  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");
   $v3 = hex(substr($v3, 0, 2*$size))/$prec;
   return "$txt:$v3 $unit";
 }
@@ -909,9 +910,10 @@ s2Hex($)
   <li>supportedStatus: <list of supported stati></li>
 
   <br><br><b>Class METER</b>
-  <li>power:val [kWh|kVAh|W|pulseCount]</li>
+  <li>energy:val [kWh|kVAh|pulseCount]</li>
   <li>gas:val [m3|feet3|pulseCount]</li>
   <li>water:val [m3|feet3|USgallons|pulseCount]</li>
+  <li>power:val W</li>
 
   <br><br><b>Class MULTI_CHANNEL</b>
   <li>endpoints:total X $dynamic $identical</li>