mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_CUL_HM:restrict statusrequest repetition

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8835 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2015-06-26 10:54:48 +00:00
parent 169a5fed3b
commit c1f68cd5bf
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/00_HMLAN.pm
View File

@@ -953,6 +953,7 @@ sub HMLAN_qResp($$$) {#response-waiting queue##################################
push @{$hashQ->{apIDs}},$id;
if ($hashQ->{answerPend} >= $hashQ->{hmLanQlen}){
$hash->{XmitOpen} = 2;#delay further sending
RemoveInternalTimer("hmClearQ:$hash->{NAME}");
InternalTimer(gettimeofday()+10, "HMLAN_clearQ", "hmClearQ:$hash->{NAME}", 0);
}
}

11
fhem/FHEM/10_CUL_HM.pm
View File

@@ -7523,6 +7523,7 @@ sub CUL_HM_qAutoRead($$){
sub CUL_HM_unQEntity($$){# remove entity from q
my ($name,$q) = @_;
my $devN = CUL_HM_getDeviceName($name);
return if (AttrVal($devN,"subType","") eq "virtual");
my $dq = $defs{$devN}{helper}{q};
RemoveInternalTimer("sUpdt:$name") if ($q eq "qReqStat");#remove delayed
@@ -7569,6 +7570,12 @@ sub CUL_HM_qEntity($$){ # add to queue
InternalTimer(gettimeofday()+ $wT,"CUL_HM_procQs","CUL_HM_procQs", 0);
}
sub CUL_HM_readStateTo($){#staterequest not working
my ($eN) = @_;
$eN = substr($eN,6) if ($eN =~ m/^sUpdt:/);
CUL_HM_UpdtReadSingle($defs{$eN},"state","unreachable",1);
CUL_HM_stateUpdatDly($eN,1800);
}
sub CUL_HM_procQs($){#process non-wakeup queues
# --- verify send is possible
@@ -7580,7 +7587,7 @@ sub CUL_HM_procQs($){#process non-wakeup queues
next if(!defined $defs{$devN}{IODev}{NAME});
my $ioName = $defs{$devN}{IODev}{NAME};
if ( ( ReadingsVal($ioName,"cond","") =~ m /^(ok|Overload-released|init)$/
if ( ( ReadingsVal($ioName,"cond","") =~ m /^(ok|Overload-released|Warning-HighLoad|init)$/
&& $q eq "qReqStat")
||( CUL_HM_autoReadReady($ioName)
&& !$defs{$devN}{cmdStack}
@@ -7600,6 +7607,8 @@ sub CUL_HM_procQs($){#process non-wakeup queues
}
else{
CUL_HM_Set($defs{$eN},$eN,"statusRequest");
CUL_HM_unQEntity($eN,"qReqStat");
InternalTimer(gettimeofday()+5,"CUL_HM_readStateTo","sUpdt:$eN",0);
}
}
last; # execute only one!