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

CUL_HM:update press with attack-supervision

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22533 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-08-03 19:02:42 +00:00
parent d6599366fe
commit c7a44f40ad
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/10_CUL_HM.pm
View File

@ -552,7 +552,7 @@ sub CUL_HM_updateConfig($){##########################
CUL_HM_setAssotiat($name); CUL_HM_setAssotiat($name);
} }
delete $modules{CUL_HM}{helper}{updtCfgLst}; delete $modules{CUL_HM}{helper}{updtCfgLst};
my ($hm) = devspec2array("TYPE=HMinfo"); my ($hm) = devspec2array("TYPE=HMinfo");
HMinfo_GetFn($defs{$hm},$hm,"configCheck") if(defined $hm && !$modules{CUL_HM}{helper}{hmManualOper}); HMinfo_GetFn($defs{$hm},$hm,"configCheck") if(defined $hm && !$modules{CUL_HM}{helper}{hmManualOper});
@ -7243,13 +7243,12 @@ sub CUL_HM_responseSetup($$) {#store all we need to handle the response
my (undef,$mNo,$mFlg,$mTp,$src,$dst,$chn,$sTp,$dat) = my (undef,$mNo,$mFlg,$mTp,$src,$dst,$chn,$sTp,$dat) =
unpack 'A4A2A2A2A6A6A2A2A*',$cmd; unpack 'A4A2A2A2A6A6A2A2A*',$cmd;
$mFlg = hex($mFlg); $mFlg = hex($mFlg);
if (($mFlg & 0x20) && ($dst ne '000000')){#msg wants ack if (($mFlg & 0x20) && ($dst ne '000000')){#msg wants ack
my $rss = $hash->{helper}{prt}{wuReSent} my $rss = $hash->{helper}{prt}{wuReSent}
? $hash->{helper}{prt}{wuReSent} ? $hash->{helper}{prt}{wuReSent}
:1;#resend counter start value - may need preloaded for WU device :1;#resend counter start value - may need preloaded for WU device
if ($mTp eq '01' && $sTp) { if ($mTp =~ m/^(01|3E)$/ && $sTp) {
if ($sTp eq "03"){ #PeerList----------- if ($sTp eq "03"){ #PeerList-----------
#--- remember request params in device level #--- remember request params in device level
CUL_HM_respWaitSu ($hash,"Pending:=PeerList" CUL_HM_respWaitSu ($hash,"Pending:=PeerList"
@ -7814,8 +7813,10 @@ sub CUL_HM_eventP($$) {#handle protocol events
my ($hash, $evntType) = @_; my ($hash, $evntType) = @_;
return if (!defined $hash); return if (!defined $hash);
if ($evntType eq "Rcv"){ if ($evntType eq "Rcv"){
$hash->{"protLastRcv"} = TimeNow(); my $t = TimeNow();
CUL_HM_UpdtReadSingle($hash,".protLastRcv",$hash->{"protLastRcv"},0); $hash->{"protLastRcv"} = $t;
$t =~ s/[\:\-\ ]//g;
CUL_HM_UpdtReadSingle($hash,".protLastRcv",$t,0);
# return; # return;
} }
my $evnt = $hash->{"prot".$evntType} ? $hash->{"prot".$evntType} : "0"; my $evnt = $hash->{"prot".$evntType} ? $hash->{"prot".$evntType} : "0";
@ -9457,6 +9458,12 @@ sub CUL_HM_ActAdd($$) {# add an HMid to list for activity supervision
$attr{$devName}{actStatus}=""; # force trigger $attr{$devName}{actStatus}=""; # force trigger
my $actHash = CUL_HM_ActGetCreateHash(); my $actHash = CUL_HM_ActGetCreateHash();
$actHash->{helper}{$devId}{start} = TimeNow(); $actHash->{helper}{$devId}{start} = TimeNow();
$actHash->{helper}{$devId}{start} =~ s/[\:\-\ ]//g;
if(defined $devHash->{READINGS}{".protLastRcv"}){
$devHash->{READINGS}{".protLastRcv"}{VAL} =~ s/[\:\-\ ]//g;
}
$actHash->{helper}{peers} = CUL_HM_noDupInString( $actHash->{helper}{peers} = CUL_HM_noDupInString(
($actHash->{helper}{peers}?$actHash->{helper}{peers}:"") ($actHash->{helper}{peers}?$actHash->{helper}{peers}:"")
.",$devId"); .",$devId");
@ -9464,7 +9471,7 @@ sub CUL_HM_ActAdd($$) {# add an HMid to list for activity supervision
.$cycleString." time"; .$cycleString." time";
#run ActionDetector #run ActionDetector
RemoveInternalTimer("ActionDetector"); RemoveInternalTimer("ActionDetector");
CUL_HM_ActCheck("add"); CUL_HM_ActCheck("add") if ($init_done);
return; return;
} }
sub CUL_HM_ActDel($) {# delete HMid for activity supervision sub CUL_HM_ActDel($) {# delete HMid for activity supervision
@ -9515,12 +9522,11 @@ sub CUL_HM_ActCheck($) {# perform supervision
else{ else{
my $tLast = ReadingsVal($devName,".protLastRcv",0); my $tLast = ReadingsVal($devName,".protLastRcv",0);
my @t = localtime($tod - $tSec); #time since when a trigger is expected my @t = localtime($tod - $tSec); #time since when a trigger is expected
my $tSince = sprintf("%04d-%02d-%02d %02d:%02d:%02d", my $tSince = sprintf("%04d%02d%02d%02d%02d%02d",
$t[5]+1900, $t[4]+1, $t[3], $t[2], $t[1], $t[0]); $t[5]+1900, $t[4]+1, $t[3], $t[2], $t[1], $t[0]);
if (!$tLast #cannot determine time if (!$tLast #cannot determine time
|| $tSince gt $tLast){ #no message received in window || $tSince gt $tLast){ #no message received in window
if ($actHash->{helper}{$devId}{start} lt $tSince){ if ($actHash->{helper}{$devId}{start} < $tSince){
if($autoTry) { #try to send a statusRequest? if($autoTry) { #try to send a statusRequest?
my $try = $actHash->{helper}{$devId}{try} ? $actHash->{helper}{$devId}{try} : 0; my $try = $actHash->{helper}{$devId}{try} ? $actHash->{helper}{$devId}{try} : 0;
$actHash->{helper}{$devId}{try} = $try + 1; $actHash->{helper}{$devId}{try} = $try + 1;