FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-01 15:44:52 +00:00
Code Issues Releases Wiki Activity

49_SSCamSTRM: fix: adoptTime accept not only integer values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22490 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-07-29 15:46:10 +00:00
parent 76ae85794b
commit 8cbd1fd21a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/49_SSCamSTRM.pm
View File

@ -91,6 +91,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"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 ",
"2.14.0" => "27.07.2020 new commands adoptForTimer and control command adoptTime ", "2.14.0" => "27.07.2020 new commands adoptForTimer and control command adoptTime ",
"2.13.1" => "21.07.2020 fix: set of values in attr adoptSubset is empty after restart, changes according level 3 PBP ", "2.13.1" => "21.07.2020 fix: set of values in attr adoptSubset is empty after restart, changes according level 3 PBP ",
@ -441,11 +442,11 @@ 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); my $atime = ReadingsVal($name, "adoptTimer", 10);
RemoveInternalTimer("", "FHEM::SSCamSTRM::_setadoptForTimer"); # $paref nicht checken ! da immer unikat RemoveInternalTimer("", "FHEM::SSCamSTRM::_setadoptForTimer"); # $paref nicht checken ! da immer unikat
if ($init_done != 1) { if ($init_done != 1) {
InternalTimer(gettimeofday()+3, "FHEM::SSCamSTRM::_setadoptForTimer", $paref, 0); InternalTimer(gettimeofday()+3, "FHEM::SSCamSTRM::_setadoptForTimer", $paref, 0);
@ -460,7 +461,7 @@ sub _setadoptForTimer { ## no critic "not used"
$hash->{HELPER}{SWITCHED} = $hash->{LINKNAME} if(!$hash->{HELPER}{SWITCHED}); $hash->{HELPER}{SWITCHED} = $hash->{LINKNAME} if(!$hash->{HELPER}{SWITCHED});
$paref->{odev} = $hash->{HELPER}{SWITCHED}; # bisheriges adoptiertes Device in %params aufnehmen, InternalTimer mitgeben $paref->{odev} = $hash->{HELPER}{SWITCHED}; # bisheriges adoptiertes Device in %params aufnehmen, InternalTimer mitgeben
} else { # Step 2 -> zweiter Durchlauf mit odef gesetzt } else { # Step 2 -> zweiter Durchlauf mit odef gesetzt
my @a; my @a;
delete $hash->{HELPER}{SWITCHED}; delete $hash->{HELPER}{SWITCHED};
$sdev = $odev eq $name ? "--reset--" : $odev; $sdev = $odev eq $name ? "--reset--" : $odev;
@ -472,7 +473,7 @@ sub _setadoptForTimer { ## no critic "not used"
$paref->{aref} = \@a; $paref->{aref} = \@a;
} }
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";
@ -499,7 +500,7 @@ sub _setAdoptTimer { ## no critic "not used"
my $prop = $paref->{prop} // 0; my $prop = $paref->{prop} // 0;
my $ret = ""; my $ret = "";
$ret = qq{The command "$opt" needs an integer as argument.} if($prop !~ /[0-9]+/x); $ret = qq{The command "$opt" needs an integer as argument.} if($prop !~ /^[0-9]+?$/x);
return $ret if($ret); return $ret if($ret);
delReadings ($hash, "adoptTimer"); delReadings ($hash, "adoptTimer");