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

CUL_HM:update AES handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13085 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2017-01-15 13:24:15 +00:00
parent 80b420f1ad
commit 87b5b7bbf0
1 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fhem/FHEM/10_CUL_HM.pm
View File

@ -1138,6 +1138,13 @@ sub CUL_HM_Parse($$) {#########################################################
} }
return; return;
} }
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;
}
$respRemoved = 0; #set to 'no response in this message' at start $respRemoved = 0; #set to 'no response in this message' at start
$mh{devN} = $mh{devH}->{NAME}; #sourcehash - will be modified to channel entity $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 $mh{shash} = $mh{devH}; # source hash - will be redirected to channel if applicable
@ -1148,11 +1155,55 @@ sub CUL_HM_Parse($$) {#########################################################
return (CUL_HM_pushEvnts(),$mh{devN},@entities); return (CUL_HM_pushEvnts(),$mh{devN},@entities);
} }
#----------CUL aesCommReq handling--------- #----------CUL aesCommReq handling---------
if ( AttrVal($mh{devH}{IODev}{NAME},"rfmode","") eq "HomeMatic" # $mh{devH}->{IODev}->{TYPE} eq "CUL" 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","");
my $dIoOk = ($mh{devH}{IODev}{NAME} eq $mh{ioName}) ? 1 : 0;
if ( $aComReq #aesCommReq enabled for device
&& !$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
|| 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});
}
}
if ( $dRfMode eq "HomeMatic" # $mh{devH}->{IODev}->{TYPE} eq "CUL"
&& $dIoOk #message received on assigned IO
&& $cryptFunc == 1 && $cryptFunc == 1
&& $ioId eq $mh{dst} && $ioId eq $mh{dst}
&& AttrVal($mh{devN},"aesCommReq",0)) { #aesCommReq enabled for device && $aComReq) { #aesCommReq enabled for device
if ($mh{devH}->{helper}{aesCommRq}{msgStat}) { if ($mh{devH}->{helper}{aesCommRq}{msgStat}) {
#----------Message was already handled, pass on result--------- #----------Message was already handled, pass on result---------
@ -3980,7 +4031,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
my $id = CUL_HM_IoId($defs{$devName}); my $id = CUL_HM_IoId($defs{$devName});
if(length($id) != 6 ){# have to try to find an O if(length($id) != 6 ){# have to try to find an IO
CUL_HM_assignIO($defs{$devName}); CUL_HM_assignIO($defs{$devName});
$id = CUL_HM_IoId($defs{$devName}); $id = CUL_HM_IoId($defs{$devName});
return "no IO device identified" if(length($id) != 6 ); return "no IO device identified" if(length($id) != 6 );
@ -5801,8 +5852,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my $pSt = CUL_HM_Get($peerHash,$peerHash->{NAME},"param","subType"); my $pSt = CUL_HM_Get($peerHash,$peerHash->{NAME},"param","subType");
if ($set eq "unset"){$set = 0;$cmdB ="02";} if ($set eq "unset"){$set = 0; $cmdB ="02";}
else {$set = 1;$cmdB ="01";} else {$set = 1; $cmdB ="01";}
my (@b,$nrCh2Pair); my (@b,$nrCh2Pair);
$b[1] = ($roleD) ?(($single eq "single")?$bNo : ($bNo*2 - 1)) $b[1] = ($roleD) ?(($single eq "single")?$bNo : ($bNo*2 - 1))
@ -5847,7 +5898,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my $bStr = sprintf("%02X",$b[$i]); my $bStr = sprintf("%02X",$b[$i]);
CUL_HM_PushCmdStack($hash, CUL_HM_PushCmdStack($hash,
"++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}$pCh[$i]00"); "++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}$pCh[$i]00");
CUL_HM_pushConfig($hash,$id, $dst,$b[$i],$peerDst,hex($pCh[$i]),4,$burst) # my ($hash,$src,$dst,$chn ,$peerAddr,$peerChn ,$list,$content,$prep) = @_;
CUL_HM_pushConfig($hash,$id, $dst,$b[$i],$peerDst ,hex($pCh[$i]),4 ,$burst)
if($burst && $cmdB eq "01"); # only if set if($burst && $cmdB eq "01"); # only if set
CUL_HM_qAutoRead($name,3); CUL_HM_qAutoRead($name,3);
} }