FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM:bugfix assignIO

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15498 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2017-11-25 17:12:33 +00:00
parent 3f48d9c36e
commit 34bb5d12f5
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/FHEM/10_CUL_HM.pm
View File

@ -1177,13 +1177,15 @@ sub CUL_HM_Parse($$) {#########################################################
return;
}
CUL_HM_assignIO($mh{devH}); #this way the init and remove work even on startup for TSCUL
if ( !defined $mh{devH}->{IODev}
|| !defined $mh{devH}->{IODev}{NAME}){
Log3 $mh{devH},1,"CUL_HM $mh{devN} error: no IO deviced!!! correkt it";
$mh{devH}->{IODev} = $iohash;
}
my $oldIo = $mh{devH}{IODev}{NAME};
CUL_HM_assignIO($mh{devH}); #this way the init and remove work even on startup for TSCUL
$respRemoved = 0; #set to 'no response in this message' at start
$mh{devN} = $mh{devH}->{NAME}; #sourcehash - will be modified to channel entity
$mh{shash} = $mh{devH}; # source hash - will be redirected to channel if applicable
@ -1194,23 +1196,6 @@ sub CUL_HM_Parse($$) {#########################################################
return (CUL_HM_pushEvnts(),$mh{devN},@entities);
}
#----------CUL aesCommReq handling---------
if ( AttrVal($mh{devN},"aesCommReq",0) #aesCommReq enabled for device
&& $mh{devH}{IODev}{NAME} ne $mh{ioName} #message not received on assigned IO
&& $mh{msgStat} !~ m/AES/) { #IO did not already do AES processing for us
my $oldIo = $mh{devH}{IODev}{NAME};
CUL_HM_assignIO($mh{devH}); #update IO in case of roaming
if ( $mh{devH}{IODev}{NAME} ne $mh{ioName} #current IO not selected as new IO
|| AttrVal($mh{devH}{IODev}{NAME},"rfmode","") ne "HomeMatic" #new IO is not CUL
|| AttrVal($oldIo,"rfmode","") ne "HomeMatic") { #old IO is not CUL
Log3 $mh{devH},5,"CUL_HM ignoring message for ${oldIo} received on $mh{ioName}";
#Do not process message further, the assigned IO has to handle it
$defs{$_}{".noDispatchVars"} = 1 foreach (grep !/^$mh{devN}$/,@entities);
return (CUL_HM_pushEvnts(),$mh{devN});
}
}
#----------CUL aesCommReq handling---------
my $aComReq = AttrVal($mh{devN},"aesCommReq",0);
my $dRfMode = AttrVal($mh{devH}{IODev}{NAME},"rfmode","");
@ -1219,7 +1204,6 @@ sub CUL_HM_Parse($$) {#########################################################
&& !$dIoOk #message not received on assigned IO
&& $mh{msgStat} !~ m/AES/) { #IO did not already do AES processing for us
my $oldIo = $mh{devH}{IODev}{NAME};
CUL_HM_assignIO($mh{devH}); #update IO in case of roaming
if ( !$dIoOk #current IO not selected as new IO
|| $dRfMode ne "HomeMatic" #new IO is not CUL
@ -8900,12 +8884,13 @@ sub CUL_HM_assignIO($){ #check and assign IO
}
if (!$newIODev) {# not assigned thru CCU - try normal
$newIODev = $oldIODev;
my $dIo = AttrVal($hash->{NAME},"IODev","");
if ( $defs{$dIo}
&&(!$oldIODev || $dIo ne $oldIODev->{NAME})) {
$newIODev = $defs{$dIo}; # assign according to Attribut
}
else {
elsif (!$defs{$dIo}) {
AssignIoPort($hash); #let kernal decide
$newIODev = $hash->{IODev};
}