From 56a644894e739518919f07d5594cc3ca3151a255 Mon Sep 17 00:00:00 2001 From: martinp876 Date: Sun, 24 Aug 2014 12:47:37 +0000 Subject: [PATCH] bugfix git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6452 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 5 ++--- fhem/FHEM/98_HMinfo.pm | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 0a3a46240..f95aac867 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -367,8 +367,8 @@ sub CUL_HM_updateConfig($){ else{ $webCmd="statusRequest:getConfig:clear msgEvents";} } elsif($st eq "smokeDetector"){ $webCmd="statusRequest"; - if ($hash->{helper}{fkt} eq "sdLead"){ - $webCmd.="teamCall:alarmOn:alarmOff";} + if ($hash->{helper}{fkt} eq "sdLead"){ + $webCmd.=":teamCall:alarmOn:alarmOff";} } elsif($st eq "keyMatic" ){ $webCmd="lock:inhibit on:inhibit off"; } @@ -1780,7 +1780,6 @@ sub CUL_HM_Parse($$) {######################################################### my $eo = ReadingsVal($shash->{NAME},"energy",0)+ ReadingsVal($shash->{NAME},"energyOffset",0); push @evtEt,[$shash,1,"energyOffset:".$eo]; - push @evtEt,[$defs{$devH->{channel_02}},1,"energyOffset:$eo"] if ($devH->{channel_02}); } } } diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 2eef22317..aeaf1880d 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -949,7 +949,7 @@ sub HMinfo_GetFn($@) {######################################################### my @fheml = (); foreach my $dName (HMinfo_getEntities($opt,$filter)){ # search for irregular trigger - my $peerIDs = AttrVal($dName,"peerIDs",undef); + my $peerIDs = AttrVal($dName,"peerIDs",""); $peerIDs =~ s/00000000,//; foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))} grep /^trigDst_/,