diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 94928afbe..34a037313 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -507,7 +507,10 @@ sub CUL_HM_Parse($$) {############################## #----------start valid messages parsing --------- my $parse = CUL_HM_parseCommon($mNo,$mFlg,$mTp,$src,$dst,$p); push @event, "powerOn" if($parse eq "powerOn"); - + if ($parse =~ s/entities://){#common generated trigger for some entities + push @entities,split(",",$parse); + } + if ($parse eq "ACK"){# remember - ACKinfo will be passed on push @event, ""; } @@ -1578,12 +1581,16 @@ sub CUL_HM_parseCommon(@){##################################################### my $level = "-"; $level = hex(substr($p,4,2))." %" if (length($p)>5); my @peers = split(",",AttrVal($cName,"peerIDs","")); + my @entities; foreach my $peer (@peers){ my $pName = CUL_HM_id2Name($peer); + $pName = CUL_HM_id2Name(substr($peer,0,6)) if (!$defs{$pName}); next if (!$defs{$pName}); - CUL_HM_UpdtReadBulk($defs{$pName},1,"trig_$cName:$level", - "trigLast:$cName"); + push @entities,CUL_HM_UpdtReadBulk($defs{$pName},1 + ,"trig_$cName:$level" + ,"trigLast:$cName".(($level ne "-")?":$level":"")); } + return "entities:".join(",",@entities); } elsif($mTp eq "70"){ #Time to trigger TC################## #send wakeup and process command stack diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 8f3f6a608..b0402333a 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -625,8 +625,9 @@ sub HMinfo_status($){########################################################## @protNames = sort keys %all; $hash->{ERR__protoNames} = join",",@protNames if(@protNames); - if (@{$modules{CUL_HM}{helper}{autoRdCfgLst}}>0){ - $hash->{I_autoReadPend} = join ",",@{$modules{CUL_HM}{helper}{autoRdCfgLst}}; + if (defined $modules{CUL_HM}{helper}{autoRdCfgLst} && + @{$modules{CUL_HM}{helper}{autoRdCfgLst}}>0){ + $hash->{I_autoReadPend} = join ",",@{$modules{CUL_HM}{helper}{autoRdCfgLst}}; } else{ delete $hash->{I_autoReadPend}; @@ -653,18 +654,18 @@ sub HMinfo_status($){########################################################## my %tpl = ( - autoOff => {p=>"time" ,t=>"staircase - auto off after