mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ZWave: power reading is now energy if the unit is not W

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4248 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-11-19 08:25:35 +00:00
parent a29b6fce3e
commit 78bbe6a3b9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/10_ZWave.pm
View File

@@ -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>