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

98_structure.pm: add disabledMembers (Forum #110476)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21758 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2020-04-23 07:11:25 +00:00
parent d71554bf65
commit e24c73478d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/98_structure.pm
View File

@@ -48,6 +48,7 @@ structure_Initialize($)
clientstate_priority clientstate_priority
disable disable
disabledForIntervals disabledForIntervals
disabledMembers
evaluateSetResult:1,0 evaluateSetResult:1,0
propagateAttr propagateAttr
setStateIndirectly:1,0 setStateIndirectly:1,0
@@ -236,8 +237,9 @@ structure_Notify($$)
my $minprio = 99999; my $minprio = 99999;
my $devstate; my $devstate;
my $dm = AttrVal($me, "disabledMembers", undef);
foreach my $d (sort keys %{ $hash->{".memberHash"} }) { foreach my $d (sort keys %{ $hash->{".memberHash"} }) {
next if(!$defs{$d} || IsDisabled($d)); next if(!$defs{$d} || (!$dm && IsDisabled($d)));
if($attr{$d} && $attr{$d}{$devmap}) { if($attr{$d} && $attr{$d}{$devmap}) {
my @gruppe = attrSplit($attr{$d}{$devmap}); my @gruppe = attrSplit($attr{$d}{$devmap});
@@ -668,6 +670,12 @@ structure_Attr($@)
<li><a href="#disable">disable</a></li> <li><a href="#disable">disable</a></li>
<li><a href="#disabledForIntervals">disabledForIntervals</a></li> <li><a href="#disabledForIntervals">disabledForIntervals</a></li>
<a name="structuredisabledMembers"></a>
<li>disabledMembers<br>
if set, consider disabled members when computing the overall state of
the structure. If not set or set to 0, disabled members are ignored.
</li>
<a name="clientstate_behavior"></a> <a name="clientstate_behavior"></a>
<li>clientstate_behavior<br> <li>clientstate_behavior<br>
The backward propagated status change from the devices to this structure The backward propagated status change from the devices to this structure
@@ -686,7 +694,8 @@ structure_Attr($@)
clientstate_priority. Needed e.g. for HomeMatic devices. clientstate_priority. Needed e.g. for HomeMatic devices.
</li> </li>
<li>last<br> <li>last<br>
The structure state corresponds to the state of the device last changed. The structure state corresponds to the state of the device last
changed.
</li> </li>
</ul> </ul>
</li> </li>
@@ -885,6 +894,12 @@ structure_Attr($@)
<li><a href="#disable">disable</a></li> <li><a href="#disable">disable</a></li>
<li><a href="#disabledForIntervals">disabledForIntervals</a></li> <li><a href="#disabledForIntervals">disabledForIntervals</a></li>
<a name="structuredisabledMembers"></a>
<li>disabledMembers<br>
wenn gesetzt (auf 1), werden "disabled" Mitglieder bei der Berechnung
der Struktur-Status ber&uuml;cksichtigt, sonst werden diese ignoriert.
</li>
<a name="clientstate_behavior"></a> <a name="clientstate_behavior"></a>
<li>clientstate_behavior<br> <li>clientstate_behavior<br>
Der Status einer Struktur h&auml;ngt von den Status der zugef&uuml;gten Der Status einer Struktur h&auml;ngt von den Status der zugef&uuml;gten