FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

CUL_HM:avoid unexpected definition if devices

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-01-10 19:06:48 +00:00
parent d0cfe4cbba
commit 6c30b81d03
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_CUL_HM.pm
View File

@ -2692,8 +2692,8 @@ sub CUL_HM_parseCommon(@){#####################################################
if ($peerIDs =~ m/$dst/){# dst is available in the ID list if ($peerIDs =~ m/$dst/){# dst is available in the ID list
foreach my $peer (grep /^$dst/,split(",",$peerIDs)){ foreach my $peer (grep /^$dst/,split(",",$peerIDs)){
my $pName = CUL_HM_id2Name($peer); my $pName = CUL_HM_id2Name($peer);
$pName = CUL_HM_id2Name($dst) if (!$defs{$pName}); #$dst - device-id of $peer next if (!$pName || !$defs{$pName});
next if (!$defs{$pName}); $pName = CUL_HM_id2Name($dst); #$dst - device-id of $peer
push @evtEt,[$defs{$pName},1,"trig_$cName:$level"]; push @evtEt,[$defs{$pName},1,"trig_$cName:$level"];
push @evtEt,[$defs{$pName},1,"trigLast:$cName ".(($level ne "-")?":$level":"")]; push @evtEt,[$defs{$pName},1,"trigLast:$cName ".(($level ne "-")?":$level":"")];
@ -4280,7 +4280,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
CUL_HM_PushCmdStack($pHash,"++${peerFlag}40$dst$peer$pc"); CUL_HM_PushCmdStack($pHash,"++${peerFlag}40$dst$peer$pc");
$snd = 1; $snd = 1;
foreach my $pCh(grep /$peer/,@peerLchn){ foreach my $pCh(grep /$peer/,@peerLchn){
delete $modules{CUL_HM}{defptr}{$pCh}{helper}{dlvl};#stop desiredLevel supervision delete $modules{CUL_HM}{defptr}{$pCh}{helper}{dlvl}
if (defined $modules{CUL_HM}{defptr}{$pCh});#stop desiredLevel supervision
my $n = CUL_HM_id2Name($pCh); my $n = CUL_HM_id2Name($pCh);
next if (!$n); next if (!$n);
$n =~s/_chn:.*//; $n =~s/_chn:.*//;
@ -5896,7 +5897,7 @@ sub CUL_HM_id2Name($) { #in: name or HMid out: name
my $defPtr = $modules{CUL_HM}{defptr}; my $defPtr = $modules{CUL_HM}{defptr};
if (length($p) == 8){ if (length($p) == 8){
return $defPtr->{$p}{NAME} if($defPtr->{$p});#channel return $defPtr->{$p}{NAME} if(defined $defPtr->{$p});#channel
return $defPtr->{$devId}{NAME}."_chn:".substr($p,6,2) return $defPtr->{$devId}{NAME}."_chn:".substr($p,6,2)
if($defPtr->{$devId});#dev, add chn if($defPtr->{$devId});#dev, add chn
return $p; #not defined, return ID only return $p; #not defined, return ID only
@ -5908,9 +5909,9 @@ sub CUL_HM_id2Name($) { #in: name or HMid out: name
} }
sub CUL_HM_id2Hash($) { #in: id, out:hash sub CUL_HM_id2Hash($) { #in: id, out:hash
my ($id) = @_; my ($id) = @_;
return $modules{CUL_HM}{defptr}{$id} if ($modules{CUL_HM}{defptr}{$id}); return $modules{CUL_HM}{defptr}{$id} if (defined $modules{CUL_HM}{defptr}{$id});
$id = substr($id,0,6); $id = substr($id,0,6);
return $modules{CUL_HM}{defptr}{$id}?($modules{CUL_HM}{defptr}{$id}):undef; return defined $modules{CUL_HM}{defptr}{$id}?($modules{CUL_HM}{defptr}{$id}):undef;
} }
sub CUL_HM_getDeviceHash($) {#in: hash out: devicehash sub CUL_HM_getDeviceHash($) {#in: hash out: devicehash
my ($hash) = @_; my ($hash) = @_;
@ -6926,7 +6927,8 @@ sub CUL_HM_assignIO($){ #check and assign IO
} }
my $ioCCU = $hash->{helper}{io}{vccu}; my $ioCCU = $hash->{helper}{io}{vccu};
if ( defined $defs{$ioCCU} && AttrVal($ioCCU,"model","") eq "CCU-FHEM" if ( $ioCCU
&& defined $defs{$ioCCU} && AttrVal($ioCCU,"model","") eq "CCU-FHEM"
&& ref($defs{$ioCCU}{helper}{io}{ioList}) eq 'ARRAY'){ && ref($defs{$ioCCU}{helper}{io}{ioList}) eq 'ARRAY'){
my @ioccu = @{$defs{$ioCCU}{helper}{io}{ioList}}; my @ioccu = @{$defs{$ioCCU}{helper}{io}{ioList}};
my @ios = ((sort {$hash->{helper}{mRssi}{io}{$b} <=> my @ios = ((sort {$hash->{helper}{mRssi}{io}{$b} <=>