FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

CUL_HM:significant corrections for configCheck and cfgState reading

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-07-03 08:43:42 +00:00
parent 22f102f733
commit 59895ed97e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/10_CUL_HM.pm
View File

@ -9904,9 +9904,11 @@ sub CUL_HM_unQEntity($$){# remove entity from q
my $devN = CUL_HM_getDeviceName($name);
return if (AttrVal($devN,"subType","") eq "virtual");
my ($hm) = devspec2array("TYPE=HMinfo");
HMinfo_SetFn($defs{$hm},$hm,"configCheck -f ",$devN) if(defined $hm && $q eq "qReqConf");
if(defined $hm && $q eq "qReqConf"){
my $chkCfg = "(".join("|",(map{$defs{$devN}{$_}}grep/channel_/,keys %{$defs{$devN}}),$devN).")";
HMinfo_GetFn($defs{$hm},$hm,"configCheck","-f",$chkCfg) ;
}
my $dq = $defs{$devN}{helper}{q};
RemoveInternalTimer("sUpdt:$name") if ($q eq "qReqStat");#remove delayed
@ -9932,13 +9934,9 @@ sub CUL_HM_unQEntity($$){# remove entity from q
sub CUL_HM_qEntity($$){ # add to queue
my ($name,$q) = @_;
return if ($modules{CUL_HM}{helper}{hmManualOper});#no autoaction when manual
my $devN = CUL_HM_getDeviceName($name);
return if (AttrVal($devN,"subType","") eq "virtual");
my ($hm) = devspec2array("TYPE=HMinfo");
HMinfo_SetFn($defs{$hm},$hm,"configCheck -f ",$devN) if(defined $hm && $q eq "qReqConf");
$name = $devN if ($defs{$devN}{helper}{q}{$q} eq "00"); #already requesting all
if ($devN eq $name){#config for all device
$defs{$devN}{helper}{q}{$q}="00";
@ -9949,11 +9947,18 @@ sub CUL_HM_qEntity($$){ # add to queue
.",".substr(CUL_HM_name2Id($name),6,2));
}
$q .= "Wu" if (!(CUL_HM_getRxType($defs{$name}) & 0x03));#normal or wakeup q?
$q = $modules{CUL_HM}{helper}{$q};
@{$q} = CUL_HM_noDup(@{$q},$devN); #we only q device - channels are stored in the device
my $qa = $modules{CUL_HM}{helper}{$q};
@{$qa} = CUL_HM_noDup(@{$qa},$devN); #we only q device - channels are stored in the device
my $wT = (@{$modules{CUL_HM}{helper}{qReqStat}})?
"1":
$modules{CUL_HM}{hmAutoReadScan};
my ($hm) = devspec2array("TYPE=HMinfo");
if(defined $hm && $q eq "qReqConf"){
my $chkCfg = "(".join("|",(map{$defs{$devN}{$_}}grep/channel_/,keys %{$defs{$devN}}),$devN).")";
HMinfo_GetFn($defs{$hm},$hm,"configCheck","-f",$chkCfg) ;
}
RemoveInternalTimer("CUL_HM_procQs");
InternalTimer(gettimeofday()+ $wT,"CUL_HM_procQs","CUL_HM_procQs", 0);
}