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

bugfix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6452 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2014-08-24 12:47:37 +00:00
parent 6651763203
commit 56a644894e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/10_CUL_HM.pm
View File

@@ -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});
}
}
}

2
fhem/FHEM/98_HMinfo.pm
View File

@@ -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_/,