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

00_TCM: telegram counter routines changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23436 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2020-12-30 07:11:44 +00:00
parent 405138b55f
commit 79f06de8c3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/00_TCM.pm
View File

@ -76,7 +76,7 @@ sub TCM_Define($$) {
$attr{$name}{dummy} = 1;
return undef;
}
InternalTimer(gettimeofday() + 60, 'TCM_msgCounter', $hash, 0);
InternalTimer(time() + 60, 'TCM_msgCounter', $hash, 0);
my $ret = DevIo_OpenDev($hash, 0, undef);
return $ret;
}
@ -315,7 +315,7 @@ sub TCM_Write($$$$) {
#Log3 $name, 5, "TCM $name awaitCmdResp: " . join(' ', @{$hash->{helper}{awaitCmdResp}});
}
Log3 $name, 5, "TCM $name sent ESP: $bstring";
push(@{$hash->{helper}{sndCounter}}, gettimeofday() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
push(@{$hash->{helper}{sndCounter}}, time() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
DevIo_SimpleWrite($hash, $bstring, 1);
# next commands will be sent with a delay
usleep(int(AttrVal($name, "sendInterval", 100)) * 1000);
@ -439,7 +439,7 @@ sub TCM_Read($) {
}
}
$data = $rest;
push(@{$hash->{helper}{rcvCounter}}, gettimeofday() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
push(@{$hash->{helper}{rcvCounter}}, time() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
}
if(length($data) >= 4) {
@ -617,7 +617,7 @@ sub TCM_Read($) {
}
$data = $rest;
push(@{$hash->{helper}{rcvCounter}}, gettimeofday() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
push(@{$hash->{helper}{rcvCounter}}, time() + 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
}
if(length($data) >= 4) {
@ -1271,7 +1271,7 @@ sub TCM_BlockSenderID($$$) {
#
sub TCM_msgCounter($) {
my $hash = shift(@_);
my $timeNow = gettimeofday();
my $timeNow = time();
my ($count, $countPerDay, $countPerHour, $countPerMin);
RemoveInternalTimer($hash, 'TCM_msgCounter');
if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'off') {
@ -1311,7 +1311,7 @@ sub TCM_msgCounter($) {
$hash->{MsgSndPerHour} = $hash->{MsgSndPerDay} + $countPerDay - $countPerHour;
$hash->{MsgSndPerMin} = $hash->{MsgSndPerDay} + $countPerDay - $countPerMin;
}
InternalTimer(gettimeofday() + 60, 'TCM_msgCounter', $hash, 0);
InternalTimer(time() + 60, 'TCM_msgCounter', $hash, 0);
return undef;
}
@ -1407,7 +1407,7 @@ sub TCM_Attr(@) {
RemoveInternalTimer($hash, 'TCM_msgCounter');
} elsif ($attrVal eq 'on') {
RemoveInternalTimer($hash, 'TCM_msgCounter');
InternalTimer(gettimeofday() + 60, 'TCM_msgCounter', $hash, 0);
InternalTimer(time() + 60, 'TCM_msgCounter', $hash, 0);
} else {
Log3 $name, 2, "TCM $name attribute-value [$attrName] = $attrVal wrong";
CommandDeleteAttr(undef, "$name $attrName");
@ -1448,7 +1448,7 @@ sub TCM_Notify(@) {
if ($dev->{TYPE} eq 'Global' && grep (m/^INITIALIZED|REREADCFG$/, @{$dev->{CHANGED}})){
#if ($dev->{NAME} eq "global" && grep (m/^INITIALIZED|REREADCFG$/, @{$dev->{CHANGED}})){
RemoveInternalTimer($hash, 'TCM_msgCounter');
InternalTimer(gettimeofday() + 60, 'TCM_msgCounter', $hash, 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
InternalTimer(time() + 60, 'TCM_msgCounter', $hash, 0) if (AttrVal($hash->{NAME}, 'msgCounter', 'off') eq 'on');
TCM_InitSerialCom($hash);
my $assignIODevFlag = AttrVal($hash->{NAME}, 'assignIODev', undef);
if (defined $assignIODevFlag) {