FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

CUL_HM:bugfix for pairing sequence

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23938 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2021-03-13 08:11:13 +00:00
parent f43597dc59
commit f3c9540ea7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/10_CUL_HM.pm
View File

@ -1369,8 +1369,9 @@ sub CUL_HM_Parse($$) {#########################################################
$mh{dst}));
if(!$mh{devH} && $mh{mTp} eq "00") { # generate device
my $sname = "HM_$mh{src}";
Log3 undef, 2, "CUL_HM Unknown device $sname is now defined";
DoTrigger("global","UNDEFINED $sname CUL_HM $mh{src}");
my $defret = CommandDefine(undef,"$sname CUL_HM $mh{src}");
Log 1,"CUL_HM Unknown device $sname is now defined ".(defined $defret ? " return: $defret" : "");
$mh{devN} = $sname ;
$mh{devH} = CUL_HM_id2Hash($mh{src}); #sourcehash - changed to channel entity
$mh{devH}->{IODev} = $iohash;
@ -3218,9 +3219,7 @@ sub CUL_HM_Parse($$) {#########################################################
sub CUL_HM_parseCommon(@){#####################################################
# parsing commands that are device independent
my ($ioHash,$mhp) = @_;
return "" if(!$mhp->{devH}{DEF});# this should be from ourself
my ($p) = $mhp->{p};
my $devHlpr = $mhp->{devH}{helper};
my $ret = "";
@ -3444,13 +3443,16 @@ sub CUL_HM_parseCommon(@){#####################################################
my $ioOwn = InternalVal($ioN,"owner_CCU","");
my $hmPair = InternalVal($ioN,"hmPair" ,InternalVal($ioOwn,"hmPair" ,0 ));
my $hmPser = InternalVal($ioN,"hmPairSerial",InternalVal($ioOwn,"hmPairSerial",""));
Log3 $ioOwn,3,"CUL_HM received config CCU:$ioOwn device: $mhp->{devN}. PairForSec: ".($hmPair?"on":"off")." PairSerial: $hmPser";
if ( $hmPair ){# pairing is active
if (!$hmPser || $hmPser eq ReadingsVal($mhp->{devN},"D-serialNr","")){
# pairing requested - shall we?
my $ioId = CUL_HM_h2IoId($ioHash);
# pair now
Log3 $mhp->{devH},3, "CUL_HM pair: $mhp->{devN} "
Log3 $ioOwn ,3, "CUL_HM pair: $mhp->{devN} "
."$attr{$mhp->{devN}}{subType}, "
."model $attr{$mhp->{devN}}{model} "
."serialNr ".ReadingsVal($mhp->{devN},"D-serialNr","");