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

49_SSCamSTRM: fix check of ARG in RemoveInternalTimer in _setadoptForTimer sub

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22534 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-08-03 20:10:28 +00:00
parent c7a44f40ad
commit 5e7b58f15b
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/49_SSCamSTRM.pm
View File

@ -91,6 +91,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"2.14.4" => "03.08.2020 fix check of ARG in RemoveInternalTimer in _setadoptForTimer sub (sometimes no switch back done) ",
"2.14.3" => "01.08.2020 verbose 5 log in _setadoptForTimer sub ", "2.14.3" => "01.08.2020 verbose 5 log in _setadoptForTimer sub ",
"2.14.2" => "29.07.2020 fix: adoptTime accept not only integer values ", "2.14.2" => "29.07.2020 fix: adoptTime accept not only integer values ",
"2.14.1" => "28.07.2020 switching time increases with each adoptForTimer command ", "2.14.1" => "28.07.2020 switching time increases with each adoptForTimer command ",
@ -443,19 +444,12 @@ sub _setadoptForTimer { ## no critic "not used"
my $hash = $paref->{hash}; my $hash = $paref->{hash};
my $name = $paref->{name}; my $name = $paref->{name};
my $opt = $paref->{opt}; my $opt = $paref->{opt};
my $odev = $paref->{odev}; # bisheriges adoptiertes Device (wird erst im InternalTimer gesetzt und verwendet) my $odev = $paref->{odev}; # bisheriges adoptiertes Device (wird erst im InternalTimer gesetzt und verwendet)
my $atime = ReadingsVal($name, "adoptTimer", 10); return if(IsDisabled($name) || $init_done != 1);
if ($init_done != 1) {
RemoveInternalTimer("", "FHEM::SSCamSTRM::_setadoptForTimer"); # $paref nicht checken ! da immer unikat
InternalTimer(gettimeofday()+3, "FHEM::SSCamSTRM::_setadoptForTimer", $paref, 0);
return;
}
return if(IsDisabled($name));
my $sdev; my $sdev;
my $atime = ReadingsVal($name, "adoptTimer", 10);
if(!$odev) { # Step 1 -> erster Durchlauf ohne odef if(!$odev) { # Step 1 -> erster Durchlauf ohne odef
$hash->{HELPER}{SWITCHED} = $hash->{LINKNAME} if(!$hash->{HELPER}{SWITCHED}); $hash->{HELPER}{SWITCHED} = $hash->{LINKNAME} if(!$hash->{HELPER}{SWITCHED});
@ -473,12 +467,12 @@ sub _setadoptForTimer { ## no critic "not used"
$paref->{aref} = \@a; $paref->{aref} = \@a;
} }
Log3($name, 5, "$name - Call Fn => $hset{adopt}{fn}, odev => ".($odev // "")." , sdev => ".($sdev // "")." ,Helper SWITCHED => ".($hash->{HELPER}{SWITCHED} // "").", switch time => $atime");
no strict "refs"; ## no critic 'NoStrict' no strict "refs"; ## no critic 'NoStrict'
&{$hset{adopt}{fn}} ($paref); &{$hset{adopt}{fn}} ($paref);
use strict "refs"; use strict "refs";
Log3($name, 5, "$name - new => $hash->{LINKNAME}, odev => ".($odev // "")." , sdev => ".($sdev // "")." ,Helper SWITCHED => ".($hash->{HELPER}{SWITCHED} // "").", switch time => $atime");
if($odev) { if($odev) {
Log3($name, 4, qq{$name - Switched Stream Device back to "$sdev"}); Log3($name, 4, qq{$name - Switched Stream Device back to "$sdev"});
return; return;
@ -486,7 +480,8 @@ sub _setadoptForTimer { ## no critic "not used"
Log3($name, 4, qq{$name - Switched to Stream Device "$hash->{LINKNAME}" for $atime seconds}); Log3($name, 4, qq{$name - Switched to Stream Device "$hash->{LINKNAME}" for $atime seconds});
RemoveInternalTimer("", "FHEM::SSCamSTRM::_setadoptForTimer"); # $paref nicht checken ! da immer unikat RemoveInternalTimer($hash->{HELPER}{ARG}, "FHEM::SSCamSTRM::_setadoptForTimer");
$hash->{HELPER}{ARG} = $paref; # $paref ist Unikat !
InternalTimer(gettimeofday()+$atime, "FHEM::SSCamSTRM::_setadoptForTimer", $paref, 0); InternalTimer(gettimeofday()+$atime, "FHEM::SSCamSTRM::_setadoptForTimer", $paref, 0);
return; return;