FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-06 06:08:44 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: att noUnits attribute for METER data (Forum #126384)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29298 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2024-10-26 11:27:37 +00:00
parent c18f33a53b
commit 6f1d69bc05
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_ZWave.pm
View File

@ -792,6 +792,7 @@ ZWave_Initialize($)
neighborListPos neighborListPos
noExplorerFrames:1,0 noExplorerFrames:1,0
noWakeupForApplicationUpdate:1,0 noWakeupForApplicationUpdate:1,0
noUnits:1,0
secure_classes secure_classes
setExtensionsEvent:1,0 setExtensionsEvent:1,0
setList setList
@ -1841,6 +1842,7 @@ my @meter_type_text = (
"cooling" "cooling"
); );
# 212400000000000000000000 => 0 kWh
sub sub
ZWave_meterParse($$) ZWave_meterParse($$)
{ {
@ -1884,15 +1886,16 @@ ZWave_meterParse($$)
# Log 1, "$v1 $v2 $v3 precision:$precision size:$size scale:$scale val:$mv"; # Log 1, "$v1 $v2 $v3 precision:$precision size:$size scale:$scale val:$mv";
$v3 = substr($v3, 2*$size, length($v3)-(2*$size)); $v3 = substr($v3, 2*$size, length($v3)-(2*$size));
$unit_text = AttrVal($name, "noUnits", 0) ? "" : " $unit_text"; #126384
if (length($v3) < 4) { # V1 report if (length($v3) < 4) { # V1 report
return "$meter_type_text:$mv $unit_text"; return "$meter_type_text:$mv$unit_text";
} else { # V2 or greater report } else { # V2 or greater report
my $delta_time = hex(substr($v3, 0, 4)); my $delta_time = hex(substr($v3, 0, 4));
$v3 = substr($v3, 4, length($v3)-4); $v3 = substr($v3, 4, length($v3)-4);
if ($delta_time == 0) { # no previous meter value if ($delta_time == 0) { # no previous meter value
return "$meter_type_text:$mv $unit_text"; return "$meter_type_text:$mv$unit_text";
} else { # previous meter value present } else { # previous meter value present
my $pmv = hex(substr($v3, 0, 2*$size)); my $pmv = hex(substr($v3, 0, 2*$size));
@ -1904,7 +1907,7 @@ ZWave_meterParse($$)
} else { } else {
$delta_time .= " s"; $delta_time .= " s";
}; };
return "$meter_type_text:$mv $unit_text previous: $pmv delta_time: ". return "$meter_type_text:$mv$unit_text previous: $pmv delta_time: ".
"$delta_time"; # V2 report "$delta_time"; # V2 report
} }
} }
@ -7494,14 +7497,18 @@ ZWave_tmSet($)
turn off the use of Explorer Frames turn off the use of Explorer Frames
</li> </li>
<li><a id="ZWave-attr-noWakeupForApplicationUpdate">noWakeupForApplicationUpdate</a> <li><a id="ZWave-attr-noWakeupForApplicationUpdate">noWakeupForApplicationUpdate</a><br>
<br>
some devices (notable the Aeotec Multisensor 6) are only awake after an some devices (notable the Aeotec Multisensor 6) are only awake after an
APPLICATION UPDATE telegram for a very short time. If this attribute is APPLICATION UPDATE telegram for a very short time. If this attribute is
set (recommended for the Aeotec Multisensor 6), the WakeUp-Stack is not set (recommended for the Aeotec Multisensor 6), the WakeUp-Stack is not
processed after receiving such a message. processed after receiving such a message.
</li> </li>
<li><a id="ZWave-attr-noUnits">noUnits</a><br>
the meter class generates the reading as "value unit".
If this attribute is set to 1, the unit is not part of the reading.
</li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li><a id="ZWave-attr-secure_classes">secure_classes</a><br> <li><a id="ZWave-attr-secure_classes">secure_classes</a><br>
This attribute is the result of the "set DEVICE secSupportedReport" This attribute is the result of the "set DEVICE secSupportedReport"