mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 09:16:53 +00:00
98_RandomTimer.pm: Add perl syntax check to disableCond attribute; remove unused function; perltidy patch
git-svn-id: https://svn.fhem.de/fhem/trunk@21983 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User
parent
a885bfe86d
commit
cef7607065
@ -1,5 +1,6 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
||||||
# Do not insert empty lines here, update check depends on it.
|
# Do not insert empty lines here, update check depends on it.
|
||||||
|
- feature: 98_RandomTimer: Add perlSyntaxCheck to condition attribute
|
||||||
- bugfix: dashboard.js: Dashboard no longer requires dummy readingsgroup
|
- bugfix: dashboard.js: Dashboard no longer requires dummy readingsgroup
|
||||||
- feature: 72_XiaomiDevice: new device SmartFan1X, S5 Max vacuum water box
|
- feature: 72_XiaomiDevice: new device SmartFan1X, S5 Max vacuum water box
|
||||||
- feature: 48_BlinkCamera: Support for BlinkMini - en/disable + thumbnail
|
- feature: 48_BlinkCamera: Support for BlinkMini - en/disable + thumbnail
|
||||||
|
|||||||
@ -30,7 +30,7 @@ use strict;
|
|||||||
use warnings;
|
use warnings;
|
||||||
use utf8;
|
use utf8;
|
||||||
use Time::HiRes qw(gettimeofday);
|
use Time::HiRes qw(gettimeofday);
|
||||||
use Time::Local 'timelocal_nocheck';
|
use Time::Local qw(timelocal_nocheck);
|
||||||
use List::Util qw(max);
|
use List::Util qw(max);
|
||||||
use GPUtils qw(GP_Import GP_Export);
|
use GPUtils qw(GP_Import GP_Export);
|
||||||
|
|
||||||
@ -60,6 +60,7 @@ BEGIN {
|
|||||||
CommandDeleteAttr
|
CommandDeleteAttr
|
||||||
AnalyzeCommandChain
|
AnalyzeCommandChain
|
||||||
AnalyzePerlCommand
|
AnalyzePerlCommand
|
||||||
|
perlSyntaxCheck
|
||||||
SemicolonEscape
|
SemicolonEscape
|
||||||
FmtDateTime
|
FmtDateTime
|
||||||
strftime
|
strftime
|
||||||
@ -68,25 +69,19 @@ BEGIN {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#-- Export to main context with different name
|
sub main::RandomTimer_Initialize { goto &Initialize }
|
||||||
# use this feature with care!
|
|
||||||
GP_Export(
|
|
||||||
qw(
|
|
||||||
Initialize
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
# initialize ##################################################################
|
# initialize ##################################################################
|
||||||
sub Initialize {
|
sub Initialize {
|
||||||
my $hash = shift;
|
my $hash = shift // return;
|
||||||
|
|
||||||
$hash->{DefFn} = \&Define;
|
$hash->{DefFn} = \&Define;
|
||||||
$hash->{UndefFn} = \&Undef;
|
$hash->{UndefFn} = \&Undef;
|
||||||
$hash->{SetFn} = \&Set;
|
$hash->{SetFn} = \&Set;
|
||||||
$hash->{AttrFn} = \&Attr;
|
$hash->{AttrFn} = \&Attr;
|
||||||
$hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond disableCondCmd:none,offCmd,onCmd offState ".
|
$hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond disableCondCmd:none,offCmd,onCmd offState "
|
||||||
"runonce:0,1 keepDeviceAlive:0,1 forceStoptimeSameDay:0,1 disabledForIntervals ".
|
. "runonce:0,1 keepDeviceAlive:0,1 forceStoptimeSameDay:0,1 disabledForIntervals "
|
||||||
$readingFnAttributes;
|
. $readingFnAttributes;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,49 +91,54 @@ sub Define {
|
|||||||
my $def = shift // return;
|
my $def = shift // return;
|
||||||
|
|
||||||
RemoveInternalTimer($hash);
|
RemoveInternalTimer($hash);
|
||||||
my ($name, $type, $timespec_start, $device, $timespec_stop, $timeToSwitch, $variation) =
|
my ( $name, $type, $timespec_start, $device, $timespec_stop, $timeToSwitch,
|
||||||
split m{\s+}xms, $def;
|
$variation )
|
||||||
|
= split m{\s+}xms, $def;
|
||||||
|
|
||||||
return "wrong syntax: define <name> RandomTimer <timespec_start> <device> <timespec_stop> <timeToSwitch> [<variations>]"
|
return "wrong syntax: define <name> RandomTimer <timespec_start> <device> <timespec_stop> <timeToSwitch> [<variations>]"
|
||||||
if(!defined $timeToSwitch);
|
if ( !defined $timeToSwitch );
|
||||||
|
|
||||||
my ($rel, $rep, $tspec);
|
my ( $rel, $rep, $tspec );
|
||||||
if ($timespec_start =~ m{^(\+)?(\*)?(.*)$}ixms) {
|
if ( $timespec_start =~ m{^(\+)?(\*)?(.*)$}ixms ) {
|
||||||
$rel = $1;
|
$rel = $1;
|
||||||
$rep = $2;
|
$rep = $2;
|
||||||
$tspec = $3;
|
$tspec = $3;
|
||||||
} else {
|
}
|
||||||
return qq{"Wrong timespec_start <$timespec_start>, use "[+][*]<time or func>"};
|
else {
|
||||||
|
return qq{ "Wrong timespec_start <$timespec_start>, use "[+][*]<time or func>" };
|
||||||
}
|
}
|
||||||
|
|
||||||
my ($err, $hr, $min, $sec, $fn) = GetTimeSpec($tspec);
|
my ( $err, $hr, $min, $sec, $fn ) = GetTimeSpec($tspec);
|
||||||
return $err if($err);
|
return $err if ($err);
|
||||||
|
|
||||||
$rel = $rel // "";
|
$rel = $rel // "";
|
||||||
$rep = $rep // "";
|
$rep = $rep // "";
|
||||||
|
|
||||||
my ($srel, $srep, $stspec);
|
my ( $srel, $srep, $stspec );
|
||||||
if ($timespec_stop =~ m{^(\+)?(\*)?(.*)$}ixms) {
|
if ( $timespec_stop =~ m{^(\+)?(\*)?(.*)$}ixms ) {
|
||||||
$srel = $1;
|
$srel = $1;
|
||||||
$srep = $2;
|
$srep = $2;
|
||||||
$stspec = $3;
|
$stspec = $3;
|
||||||
} else {
|
}
|
||||||
return qq{"Wrong timespec_stop <$timespec_stop>, use "[+][*]<time or func>"};
|
else {
|
||||||
|
return
|
||||||
|
qq{"Wrong timespec_stop <$timespec_stop>, use "[+][*]<time or func>"};
|
||||||
}
|
}
|
||||||
|
|
||||||
my ($e, $h, $m, $s, $f) = GetTimeSpec($stspec);
|
my ( $e, $h, $m, $s, $f ) = GetTimeSpec($stspec);
|
||||||
return $e if($e);
|
return $e if ($e);
|
||||||
|
|
||||||
return "invalid timeToSwitch <$timeToSwitch>, use 9999"
|
return "invalid timeToSwitch <$timeToSwitch>, use 9999"
|
||||||
if(!($timeToSwitch =~ m{^[0-9]{2,4}$}ixms));
|
if ( !( $timeToSwitch =~ m{^[0-9]{2,4}$}ixms ) );
|
||||||
my ($varDuration,$varStart);
|
my ( $varDuration, $varStart );
|
||||||
$varDuration=0;
|
$varDuration = 0;
|
||||||
$varStart=0;
|
$varStart = 0;
|
||||||
if(defined $variation) {
|
if ( defined $variation ) {
|
||||||
$variation =~ m{^([\d]+)}xms ? $varDuration = $1 : undef;
|
$variation =~ m{^([\d]+)}xms ? $varDuration = $1 : undef;
|
||||||
$variation =~ m{[:]([\d]+)}xms ? $varStart = $1 : undef;
|
$variation =~ m{[:]([\d]+)}xms ? $varStart = $1 : undef;
|
||||||
}
|
}
|
||||||
setSwitchmode ($hash, "800/200") if (!defined $hash->{helper}{SWITCHMODE});
|
setSwitchmode( $hash, "800/200" )
|
||||||
|
if ( !defined $hash->{helper}{SWITCHMODE} );
|
||||||
|
|
||||||
$hash->{NAME} = $name;
|
$hash->{NAME} = $name;
|
||||||
$hash->{DEVICE} = $device;
|
$hash->{DEVICE} = $device;
|
||||||
@ -152,91 +152,99 @@ sub Define {
|
|||||||
$hash->{helper}{S_REL} = $srel;
|
$hash->{helper}{S_REL} = $srel;
|
||||||
$hash->{helper}{S_REL} = $srel;
|
$hash->{helper}{S_REL} = $srel;
|
||||||
|
|
||||||
$hash->{COMMAND} = Value($hash->{DEVICE}) if ($featurelevel < 6.1);
|
$hash->{COMMAND} = Value( $hash->{DEVICE} ) if ( $featurelevel < 6.1 );
|
||||||
if ($featurelevel > 6.0) {
|
if ( $featurelevel > 6.0 ) {
|
||||||
$hash->{COMMAND} = ReadingsVal($hash->{DEVICE},"state",undef) ;
|
$hash->{COMMAND} = ReadingsVal( $hash->{DEVICE}, "state", undef );
|
||||||
$hash->{helper}{offRegex} = "off";
|
$hash->{helper}{offRegex} = "off";
|
||||||
$hash->{helper}{offReading} = "state";
|
$hash->{helper}{offReading} = "state";
|
||||||
}
|
}
|
||||||
#$attr{$name}{verbose} = 4;
|
|
||||||
|
|
||||||
readingsSingleUpdate ($hash, "TimeToSwitch", $hash->{helper}{TIMETOSWITCH}, 1);
|
readingsSingleUpdate( $hash, "TimeToSwitch", $hash->{helper}{TIMETOSWITCH},
|
||||||
|
1 );
|
||||||
|
|
||||||
RmInternalTimer("SetTimer", $hash);
|
RmInternalTimer( "SetTimer", $hash );
|
||||||
MkInternalTimer("SetTimer", time(), \&SetTimer, $hash, 0);
|
MkInternalTimer( "SetTimer", time(), \&SetTimer, $hash, 0 );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub Undef {
|
sub Undef {
|
||||||
|
|
||||||
my ($hash, $arg) = @_;
|
my ( $hash, $arg ) = @_;
|
||||||
|
|
||||||
RmInternalTimer("SetTimer", $hash);
|
RmInternalTimer( "SetTimer", $hash );
|
||||||
RmInternalTimer("Exec", $hash);
|
RmInternalTimer( "Exec", $hash );
|
||||||
delete $modules{RandomTimer}{defptr}{$hash->{NAME}};
|
delete $modules{RandomTimer}{defptr}{ $hash->{NAME} };
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub Attr {
|
sub Attr {
|
||||||
my ($cmd, $name, $attrName, $attrVal) = @_;
|
my ( $cmd, $name, $attrName, $attrVal ) = @_;
|
||||||
|
|
||||||
my $hash = $defs{$name};
|
my $hash = $defs{$name};
|
||||||
|
|
||||||
if ($attrName eq 'switchmode') {
|
if ( $attrName eq 'switchmode' ) {
|
||||||
setSwitchmode($hash, $attrVal);
|
setSwitchmode( $hash, $attrVal );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($attrName =~ m{\A disable(Cond)? \z}xms) {
|
if ( $attrName =~ m{\A disable(Cond)? \z}xms ) {
|
||||||
|
|
||||||
# Immediately execute next switch check
|
# Immediately execute next switch check
|
||||||
RmInternalTimer("Exec", $hash);
|
RmInternalTimer( "Exec", $hash );
|
||||||
MkInternalTimer("Exec", time()+1, \&Exec, $hash, 0);
|
MkInternalTimer( "Exec", time() + 1, \&Exec, $hash, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($attrName eq 'offState') {
|
if ( $attrName eq 'offState' ) {
|
||||||
my ($offRegex, $offReading) = split ' ', $attrVal, 2;
|
my ( $offRegex, $offReading ) = split ' ', $attrVal, 2;
|
||||||
$hash->{helper}{offRegex} = $offRegex;
|
$hash->{helper}{offRegex} = $offRegex;
|
||||||
$hash->{helper}{offReading} = $offReading // 'state';
|
$hash->{helper}{offReading} = $offReading // 'state';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $attrName eq 'disableCond' ) {
|
||||||
|
if( $cmd eq "set" ) {
|
||||||
|
my $err = perlSyntaxCheck($attrVal);
|
||||||
|
return $err if ( $err );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub Set {
|
sub Set {
|
||||||
my ($hash, @a) = @_;
|
my ( $hash, @a ) = @_;
|
||||||
|
|
||||||
return "no set value specified" if(int(@a) < 2);
|
return "no set value specified" if ( int(@a) < 2 );
|
||||||
return "Unknown argument $a[1], choose one of execNow:noArg active:noArg inactive:noArg" if($a[1] eq "?");
|
return "Unknown argument $a[1], choose one of execNow:noArg active:noArg inactive:noArg"
|
||||||
|
if ( $a[1] eq "?" );
|
||||||
|
|
||||||
my $name = shift @a;
|
my $name = shift @a;
|
||||||
my $v = join(" ", @a);
|
my $v = join( " ", @a );
|
||||||
|
|
||||||
if ($v eq "execNow") {
|
if ( $v eq "execNow" ) {
|
||||||
Log3 ($hash, 3, "[$name] set $name $v");
|
Log3( $hash, 3, "[$name] set $name $v" );
|
||||||
if (AttrVal($name, "disable", 0)) {
|
if ( AttrVal( $name, "disable", 0 ) ) {
|
||||||
Log3 ($hash, 3, "[$name] is disabled, set execNow not possible");
|
Log3( $hash, 3, "[$name] is disabled, set execNow not possible" );
|
||||||
} else {
|
}
|
||||||
RmInternalTimer("Exec", $hash);
|
else {
|
||||||
MkInternalTimer("Exec", time()+1, \&Exec, $hash, 0);
|
RmInternalTimer( "Exec", $hash );
|
||||||
|
MkInternalTimer( "Exec", time() + 1, \&Exec, $hash, 0 );
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ( $v eq "active" || $v eq "inactive" ) {
|
if ( $v eq "active" || $v eq "inactive" ) {
|
||||||
Log3 ($hash, 3, "[$name] set $name $v");
|
Log3( $hash, 3, "[$name] set $name $v" );
|
||||||
if ( $v eq "active" && AttrVal($name, "disable", 0)) {
|
if ( $v eq "active" && AttrVal( $name, "disable", 0 ) ) {
|
||||||
CommandDeleteAttr(undef,"$name disable");
|
CommandDeleteAttr( undef, "$name disable" );
|
||||||
}
|
}
|
||||||
my $statevalue = $v eq "active" ? "activated" : $v;
|
my $statevalue = $v eq "active" ? "activated" : $v;
|
||||||
readingsSingleUpdate ($hash, "state", $statevalue, 1);
|
readingsSingleUpdate( $hash, "state", $statevalue, 1 );
|
||||||
RmInternalTimer("Exec", $hash);
|
RmInternalTimer( "Exec", $hash );
|
||||||
MkInternalTimer("Exec", time()+1, \&Exec, $hash, 0);
|
MkInternalTimer( "Exec", time() + 1, \&Exec, $hash, 0 );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# module Fn ###################################################################
|
# module Fn ###################################################################
|
||||||
sub addDays {
|
sub addDays {
|
||||||
my $now = shift;
|
my $now = shift;
|
||||||
@ -254,18 +262,20 @@ sub device_switch {
|
|||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
|
|
||||||
my $command = "set @ $hash->{COMMAND}";
|
my $command = "set @ $hash->{COMMAND}";
|
||||||
if ($hash->{COMMAND} eq "on") {
|
if ( $hash->{COMMAND} eq "on" ) {
|
||||||
$command = AttrVal($hash->{NAME}, "onCmd", $command);
|
$command = AttrVal( $hash->{NAME}, "onCmd", $command );
|
||||||
} else {
|
}
|
||||||
$command = AttrVal($hash->{NAME}, "offCmd", $command);
|
else {
|
||||||
|
$command = AttrVal( $hash->{NAME}, "offCmd", $command );
|
||||||
}
|
}
|
||||||
$command =~ s/@/$hash->{DEVICE}/gxms;
|
$command =~ s/@/$hash->{DEVICE}/gxms;
|
||||||
$command = SemicolonEscape($command);
|
$command = SemicolonEscape($command);
|
||||||
readingsSingleUpdate($hash, 'LastCommand', $command, 1);
|
readingsSingleUpdate( $hash, 'LastCommand', $command, 1 );
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}. "]"." command: $command";
|
Log3( $hash, 4, "[" . $hash->{NAME} . "]" . " command: $command" );
|
||||||
|
|
||||||
my $ret = AnalyzeCommandChain(undef, $command);
|
my $ret = AnalyzeCommandChain( undef, $command );
|
||||||
Log3 ($hash, 3, "[$hash->{NAME}] ERROR: " . $ret . " SENDING " . $command) if($ret);
|
Log3( $hash, 3, "[$hash->{NAME}] ERROR: " . $ret . " SENDING " . $command )
|
||||||
|
if ($ret);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -273,32 +283,37 @@ sub device_switch {
|
|||||||
sub device_toggle {
|
sub device_toggle {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
#my $attrOffState = AttrVal($name,"offState",undef);
|
#my $attrOffState = AttrVal($name,"offState",undef);
|
||||||
my $status = Value($hash->{DEVICE});
|
my $status = Value( $hash->{DEVICE} );
|
||||||
|
|
||||||
if (defined $hash->{helper}{offRegex}) {
|
if ( defined $hash->{helper}{offRegex} ) {
|
||||||
$status = ReadingsVal($hash->{DEVICE},$hash->{helper}{offReading},"off");
|
$status =
|
||||||
|
ReadingsVal( $hash->{DEVICE}, $hash->{helper}{offReading}, "off" );
|
||||||
my $attrOffState = $hash->{helper}{offRegex};
|
my $attrOffState = $hash->{helper}{offRegex};
|
||||||
$status = $status =~ m{^$attrOffState$}xms ? "off" : lc($status) ;
|
$status = $status =~ m{^$attrOffState$}xms ? "off" : lc($status);
|
||||||
$status = $status =~ m{off}xms ? "off" : "on" ;
|
$status = $status =~ m{off}xms ? "off" : "on";
|
||||||
}
|
}
|
||||||
if ($status ne "on" && $status ne "off" ) {
|
if ( $status ne "on" && $status ne "off" ) {
|
||||||
if ($hash->{helper}{offRegex}) {
|
if ( $hash->{helper}{offRegex} ) {
|
||||||
Log3 $hash, 3, "[$name] result of function ReadingsVal($hash->{DEVICE},\"<offReading>\",undef) must be 'on' or 'off' or set attribute offState accordingly";
|
Log3( $hash, 3, "[$name] result of function ReadingsVal($hash->{DEVICE},\"<offReading>\",undef) must be 'on' or 'off' or set attribute offState accordingly" );
|
||||||
} else {
|
}
|
||||||
Log3 $hash, 3, "[$name] result of function Value($hash->{DEVICE}) must be 'on' or 'off'";;
|
else {
|
||||||
|
Log3 ( $hash, 3, "[$name] result of function Value($hash->{DEVICE}) must be 'on' or 'off'" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
my $sigma = ($status eq "on")
|
my $sigma =
|
||||||
|
( $status eq "on" )
|
||||||
? $hash->{helper}{SIGMAWHENON}
|
? $hash->{helper}{SIGMAWHENON}
|
||||||
: $hash->{helper}{SIGMAWHENOFF};
|
: $hash->{helper}{SIGMAWHENOFF};
|
||||||
|
|
||||||
my $zufall = int(rand(1000));
|
my $zufall = int( rand(1000) );
|
||||||
Log3 $hash, 4, "[$name] IstZustand:$status sigmaWhen-$status:$sigma random:$zufall<$sigma=>" . (($zufall < $sigma)?"true":"false");
|
Log3( $hash, 4, "[$name] IstZustand:$status sigmaWhen-$status:$sigma random:$zufall<$sigma=>"
|
||||||
|
. ( ( $zufall < $sigma ) ? "true" : "false" ) );
|
||||||
|
|
||||||
if ($zufall < $sigma ) {
|
if ( $zufall < $sigma ) {
|
||||||
$hash->{COMMAND} = ($status eq "on") ? "off" : "on";
|
$hash->{COMMAND} = ( $status eq "on" ) ? "off" : "on";
|
||||||
device_switch($hash);
|
device_switch($hash);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -306,32 +321,45 @@ sub device_toggle {
|
|||||||
|
|
||||||
sub disableDown {
|
sub disableDown {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
my $disableCondCmd = AttrVal($hash->{NAME}, "disableCondCmd", 0);
|
my $disableCondCmd = AttrVal( $hash->{NAME}, "disableCondCmd", 0 );
|
||||||
|
|
||||||
if ($disableCondCmd ne "none") {
|
if ( $disableCondCmd ne "none" ) {
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}."]"." setting requested disableCondCmd on $hash->{DEVICE}: ";
|
Log3( $hash, 4,
|
||||||
$hash->{COMMAND} = AttrVal($hash->{NAME}, "disableCondCmd", 0) eq "onCmd" ? "on" : "off";
|
"["
|
||||||
|
. $hash->{NAME} . "]"
|
||||||
|
. " setting requested disableCondCmd on $hash->{DEVICE}: " );
|
||||||
|
$hash->{COMMAND} =
|
||||||
|
AttrVal( $hash->{NAME}, "disableCondCmd", 0 ) eq "onCmd"
|
||||||
|
? "on"
|
||||||
|
: "off";
|
||||||
device_switch($hash);
|
device_switch($hash);
|
||||||
} else {
|
}
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}."]"." no action requested on $hash->{DEVICE}: ";
|
else {
|
||||||
|
Log3( $hash, 4,
|
||||||
|
"["
|
||||||
|
. $hash->{NAME} . "]"
|
||||||
|
. " no action requested on $hash->{DEVICE}: " );
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub down {
|
sub down {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}."]"." setting requested keepDeviceAlive on $hash->{DEVICE}: ";
|
Log3( $hash, 4,
|
||||||
$hash->{COMMAND} = AttrVal($hash->{NAME}, "keepDeviceAlive", 0) ? "on" : "off";
|
"["
|
||||||
|
. $hash->{NAME} . "]"
|
||||||
|
. " setting requested keepDeviceAlive on $hash->{DEVICE}: " );
|
||||||
|
$hash->{COMMAND} =
|
||||||
|
AttrVal( $hash->{NAME}, "keepDeviceAlive", 0 ) ? "on" : "off";
|
||||||
device_switch($hash);
|
device_switch($hash);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub Exec {
|
sub Exec {
|
||||||
my $myHash = shift // return;
|
my $myHash = shift // return;
|
||||||
|
|
||||||
my $hash = GetHashIndirekt($myHash, (caller(0))[3]);
|
my $hash = GetHashIndirekt( $myHash, ( caller(0) )[3] );
|
||||||
return if (!defined($hash));
|
return if ( !defined($hash) );
|
||||||
|
|
||||||
my $now = time();
|
my $now = time();
|
||||||
|
|
||||||
@ -341,62 +369,96 @@ sub Exec {
|
|||||||
my $stopTimeReached = stopTimeReached($hash);
|
my $stopTimeReached = stopTimeReached($hash);
|
||||||
|
|
||||||
if ($active) {
|
if ($active) {
|
||||||
|
|
||||||
# wenn temporär ausgeschaltet
|
# wenn temporär ausgeschaltet
|
||||||
if ($disabled) {
|
if ($disabled) {
|
||||||
Log3 $hash, 3, "[".$hash->{NAME}."]"." disabled before stop-time , ending RandomTimer on $hash->{DEVICE}: "
|
Log3( $hash, 3,
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
|
"["
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
|
. $hash->{NAME} . "]"
|
||||||
|
. " disabled before stop-time , ending RandomTimer on $hash->{DEVICE}: "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{startTime} ) )
|
||||||
|
. " - "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{stopTime} ) ) );
|
||||||
disableDown($hash);
|
disableDown($hash);
|
||||||
setActive($hash,0);
|
setActive( $hash, 0 );
|
||||||
setState ($hash);
|
setState($hash);
|
||||||
}
|
}
|
||||||
# Wenn aktiv und Abschaltzeit erreicht, dann Gerät ausschalten, Meldung ausgeben und Timer schließen
|
|
||||||
|
# Wenn aktiv und Abschaltzeit erreicht, dann Gerät ausschalten, Meldung ausgeben und Timer schließen
|
||||||
if ($stopTimeReached) {
|
if ($stopTimeReached) {
|
||||||
Log3 $hash, 3, "[".$hash->{NAME}."]"." stop-time reached, ending RandomTimer on $hash->{DEVICE}: "
|
Log3( $hash, 3,
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
|
"["
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
|
. $hash->{NAME} . "]"
|
||||||
|
. " stop-time reached, ending RandomTimer on $hash->{DEVICE}: "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{startTime} ) )
|
||||||
|
. " - "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{stopTime} ) ) );
|
||||||
down($hash);
|
down($hash);
|
||||||
setActive($hash, 0);
|
setActive( $hash, 0 );
|
||||||
if ( AttrVal($hash->{NAME}, "runonce", -1) eq "1" ) {
|
if ( AttrVal( $hash->{NAME}, "runonce", -1 ) eq "1" ) {
|
||||||
Log3 $hash, 3, "[".$hash->{NAME}. "]" ."runonceMode";
|
Log3( $hash, 3, "[" . $hash->{NAME} . "]" . "runonceMode" );
|
||||||
fhem ("delete $hash->{NAME}") ;
|
fhem("delete $hash->{NAME}");
|
||||||
}
|
}
|
||||||
setState($hash);
|
setState($hash);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else { # !active
|
}
|
||||||
|
else { # !active
|
||||||
if ($disabled) {
|
if ($disabled) {
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}. "] RandomTimer on $hash->{DEVICE} timer disabled - no switch";
|
Log3( $hash, 4,
|
||||||
|
"["
|
||||||
|
. $hash->{NAME}
|
||||||
|
. "] RandomTimer on $hash->{DEVICE} timer disabled - no switch" );
|
||||||
setState($hash);
|
setState($hash);
|
||||||
setActive($hash,0);
|
setActive( $hash, 0 );
|
||||||
}
|
}
|
||||||
if ($stopTimeReached) {
|
if ($stopTimeReached) {
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}."]"." definition RandomTimer on $hash->{DEVICE}: "
|
Log3( $hash, 4,
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
|
"["
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
|
. $hash->{NAME} . "]"
|
||||||
setState ($hash);
|
. " definition RandomTimer on $hash->{DEVICE}: "
|
||||||
setActive($hash,0);
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{startTime} ) )
|
||||||
|
. " - "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{stopTime} ) ) );
|
||||||
|
setState($hash);
|
||||||
|
setActive( $hash, 0 );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!$disabled) {
|
if ( !$disabled ) {
|
||||||
if ($now>$hash->{helper}{startTime} && $now<$hash->{helper}{stopTime}) {
|
if ( $now > $hash->{helper}{startTime}
|
||||||
Log3 $hash, 3, "[".$hash->{NAME}."]"." starting RandomTimer on $hash->{DEVICE}: "
|
&& $now < $hash->{helper}{stopTime} )
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
|
{
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
|
Log3( $hash, 3,
|
||||||
setActive($hash,1);
|
"["
|
||||||
|
. $hash->{NAME} . "]"
|
||||||
|
. " starting RandomTimer on $hash->{DEVICE}: "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{startTime} ) )
|
||||||
|
. " - "
|
||||||
|
. strftime( "%H:%M:%S(%d)",
|
||||||
|
localtime( $hash->{helper}{stopTime} ) ) );
|
||||||
|
setActive( $hash, 1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setState($hash);
|
setState($hash);
|
||||||
if ($now>$hash->{helper}{startTime} && $now<$hash->{helper}{stopTime}) {
|
if ( $now > $hash->{helper}{startTime} && $now < $hash->{helper}{stopTime} )
|
||||||
device_toggle($hash) if (!$disabled);
|
{
|
||||||
|
device_toggle($hash) if ( !$disabled );
|
||||||
}
|
}
|
||||||
|
|
||||||
my $nextSwitch = time() + getSecsToNextAbschaltTest($hash);
|
my $nextSwitch = time() + getSecsToNextAbschaltTest($hash);
|
||||||
RmInternalTimer("Exec", $hash);
|
RmInternalTimer( "Exec", $hash );
|
||||||
$hash->{helper}{NEXT_CHECK} = strftime("%d.%m.%Y %H:%M:%S",localtime($nextSwitch));
|
$hash->{helper}{NEXT_CHECK} =
|
||||||
MkInternalTimer("Exec", $nextSwitch, \&Exec, $hash, 0);
|
strftime( "%d.%m.%Y %H:%M:%S", localtime($nextSwitch) );
|
||||||
|
MkInternalTimer( "Exec", $nextSwitch, \&Exec, $hash, 0 );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -404,45 +466,49 @@ sub getSecsToNextAbschaltTest {
|
|||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
my $intervall = $hash->{helper}{TIMETOSWITCH};
|
my $intervall = $hash->{helper}{TIMETOSWITCH};
|
||||||
my $varDuration = $hash->{helper}{VAR_DURATION};
|
my $varDuration = $hash->{helper}{VAR_DURATION};
|
||||||
my $nextSecs = $intervall + int(rand($varDuration));
|
my $nextSecs = $intervall + int( rand($varDuration) );
|
||||||
unless ($varDuration) {
|
unless ($varDuration) {
|
||||||
my $proz = 10;
|
my $proz = 10;
|
||||||
my $delta = $intervall * $proz/100;
|
my $delta = $intervall * $proz / 100;
|
||||||
$nextSecs = $intervall - $delta/2 + int(rand($delta));
|
$nextSecs = $intervall - $delta / 2 + int( rand($delta) );
|
||||||
}
|
}
|
||||||
return $nextSecs;
|
return $nextSecs;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub isAktive {
|
sub isAktive {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
return defined ($hash->{helper}{active}) ? $hash->{helper}{active} : 0;
|
return defined( $hash->{helper}{active} ) ? $hash->{helper}{active} : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub isDisabled {
|
sub isDisabled {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
|
|
||||||
my $disable = IsDisabled($hash->{NAME}); #AttrVal($hash->{NAME}, "disable", 0 );
|
my $disable =
|
||||||
return $disable if($disable);
|
IsDisabled( $hash->{NAME} ); #AttrVal($hash->{NAME}, "disable", 0 );
|
||||||
|
return $disable if ($disable);
|
||||||
|
|
||||||
my $disableCond = AttrVal($hash->{NAME}, "disableCond", "nf" );
|
my $disableCond = AttrVal( $hash->{NAME}, "disableCond", "nf" );
|
||||||
return 0 if ($disableCond eq "nf");
|
return 0 if ( $disableCond eq "nf" );
|
||||||
|
|
||||||
return AnalyzePerlCommand($hash, $disableCond);
|
return AnalyzePerlCommand( $hash, $disableCond );
|
||||||
}
|
}
|
||||||
|
|
||||||
sub schaltZeitenErmitteln {
|
sub schaltZeitenErmitteln {
|
||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $now = shift // return;
|
my $now = shift // return;
|
||||||
|
|
||||||
startZeitErmitteln($hash, $now);
|
startZeitErmitteln( $hash, $now );
|
||||||
stopZeitErmitteln ($hash, $now);
|
stopZeitErmitteln( $hash, $now );
|
||||||
|
|
||||||
readingsBeginUpdate($hash);
|
readingsBeginUpdate($hash);
|
||||||
|
|
||||||
# readingsBulkUpdate ($hash, "Startzeit", FmtDateTime($hash->{helper}{startTime}));
|
# readingsBulkUpdate ($hash, "Startzeit", FmtDateTime($hash->{helper}{startTime}));
|
||||||
# readingsBulkUpdate ($hash, "Stoppzeit", FmtDateTime($hash->{helper}{stopTime}));
|
# readingsBulkUpdate ($hash, "Stoppzeit", FmtDateTime($hash->{helper}{stopTime}));
|
||||||
readingsBulkUpdate ($hash, "StartTime", FmtDateTime($hash->{helper}{startTime}));
|
readingsBulkUpdate( $hash, "StartTime",
|
||||||
readingsBulkUpdate ($hash, "StopTime", FmtDateTime($hash->{helper}{stopTime}));
|
FmtDateTime( $hash->{helper}{startTime} ) );
|
||||||
readingsEndUpdate ($hash, defined($hash->{LOCAL} ? 0 : 1));
|
readingsBulkUpdate( $hash, "StopTime",
|
||||||
|
FmtDateTime( $hash->{helper}{stopTime} ) );
|
||||||
|
readingsEndUpdate( $hash, defined( $hash->{LOCAL} ? 0 : 1 ) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -450,22 +516,26 @@ sub setActive {
|
|||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $value = shift // return;
|
my $value = shift // return;
|
||||||
$hash->{helper}{active} = $value;
|
$hash->{helper}{active} = $value;
|
||||||
my $trigger = (isDisabled($hash)) ? 0 : 1;
|
my $trigger = ( isDisabled($hash) ) ? 0 : 1;
|
||||||
readingsSingleUpdate ($hash, "active", $value, $trigger);
|
readingsSingleUpdate( $hash, "active", $value, $trigger );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub setState {
|
sub setState {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
|
|
||||||
if (isDisabled($hash)) {
|
if ( isDisabled($hash) ) {
|
||||||
if(ReadingsVal($hash->{NAME}, "state", "") ne "inactive") {
|
if ( ReadingsVal( $hash->{NAME}, "state", "" ) ne "inactive" ) {
|
||||||
my $dotrigger = ReadingsVal($hash->{NAME},"state","none") ne "disabled" ? 1 : 0;
|
my $dotrigger =
|
||||||
readingsSingleUpdate ($hash, "state", "disabled", $dotrigger);
|
ReadingsVal( $hash->{NAME}, "state", "none" ) ne "disabled"
|
||||||
|
? 1
|
||||||
|
: 0;
|
||||||
|
readingsSingleUpdate( $hash, "state", "disabled", $dotrigger );
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
my $state = $hash->{helper}{active} ? "on" : "off";
|
my $state = $hash->{helper}{active} ? "on" : "off";
|
||||||
readingsSingleUpdate ($hash, "state", $state, 1);
|
readingsSingleUpdate( $hash, "state", $state, 1 );
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -474,48 +544,54 @@ sub setSwitchmode {
|
|||||||
|
|
||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $attrVal = shift // return;
|
my $attrVal = shift // return;
|
||||||
my $mod = "[".$hash->{NAME} ."] ";
|
my $mod = "[" . $hash->{NAME} . "] ";
|
||||||
|
|
||||||
|
if ( !( $attrVal =~ m/^([0-9]{1,3})\/([0-9]{1,3})$/ixms ) ) {
|
||||||
if(!($attrVal =~ m/^([0-9]{1,3})\/([0-9]{1,3})$/ixms)) {
|
Log3( undef, 3, $mod . "invalid switchMode <$attrVal>, use 999/999");
|
||||||
Log3 undef, 3, $mod . "invalid switchMode <$attrVal>, use 999/999";
|
}
|
||||||
} else {
|
else {
|
||||||
my ($sigmaWhenOff, $sigmaWhenOn) = ($1, $2);
|
my ( $sigmaWhenOff, $sigmaWhenOn ) = ( $1, $2 );
|
||||||
$hash->{helper}{SWITCHMODE} = $attrVal;
|
$hash->{helper}{SWITCHMODE} = $attrVal;
|
||||||
$hash->{helper}{SIGMAWHENON} = $sigmaWhenOn;
|
$hash->{helper}{SIGMAWHENON} = $sigmaWhenOn;
|
||||||
$hash->{helper}{SIGMAWHENOFF} = $sigmaWhenOff;
|
$hash->{helper}{SIGMAWHENOFF} = $sigmaWhenOff;
|
||||||
$attr{$hash->{NAME}}{switchmode} = $attrVal;
|
$attr{ $hash->{NAME} }{switchmode} = $attrVal;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub SetTimer {
|
sub SetTimer {
|
||||||
my $myHash = shift // return;
|
my $myHash = shift // return;
|
||||||
my $hash = GetHashIndirekt($myHash, (caller(0))[3]);
|
my $hash = GetHashIndirekt( $myHash, ( caller(0) )[3] );
|
||||||
return if (!defined($hash));
|
return if ( !defined($hash) );
|
||||||
|
|
||||||
my $now = time();
|
my $now = time();
|
||||||
my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime($now);
|
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
|
||||||
|
localtime($now);
|
||||||
|
|
||||||
setActive($hash, 0);
|
setActive( $hash, 0 );
|
||||||
schaltZeitenErmitteln($hash, $now);
|
schaltZeitenErmitteln( $hash, $now );
|
||||||
setState($hash);
|
setState($hash);
|
||||||
|
|
||||||
Log3 $hash, 4, "[".$hash->{NAME}."]" . " timings RandomTimer on $hash->{DEVICE}: "
|
Log3( $hash, 4,
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
|
"["
|
||||||
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
|
. $hash->{NAME} . "]"
|
||||||
|
. " timings RandomTimer on $hash->{DEVICE}: "
|
||||||
|
. strftime( "%H:%M:%S(%d)", localtime( $hash->{helper}{startTime} ) )
|
||||||
|
. " - "
|
||||||
|
. strftime( "%H:%M:%S(%d)", localtime( $hash->{helper}{stopTime} ) ) );
|
||||||
|
|
||||||
my $secToMidnight = 24*3600 -(3600*$hour + 60*$min + $sec);
|
my $secToMidnight = 24 * 3600 - ( 3600 * $hour + 60 * $min + $sec );
|
||||||
|
|
||||||
my $setExecTime = max($now, $hash->{helper}{startTime});
|
my $setExecTime = max( $now, $hash->{helper}{startTime} );
|
||||||
RmInternalTimer("Exec", $hash);
|
RmInternalTimer( "Exec", $hash );
|
||||||
MkInternalTimer("Exec", $setExecTime, \&Exec, $hash, 0);
|
MkInternalTimer( "Exec", $setExecTime, \&Exec, $hash, 0 );
|
||||||
|
|
||||||
if ($hash->{helper}{REP} gt "") {
|
if ( $hash->{helper}{REP} gt "" ) {
|
||||||
my $setTimerTime = max($now+$secToMidnight + 15,
|
my $setTimerTime =
|
||||||
$hash->{helper}{stopTime}) + $hash->{helper}{TIMETOSWITCH}+15;
|
max( $now + $secToMidnight + 15, $hash->{helper}{stopTime} ) +
|
||||||
RmInternalTimer("SetTimer", $hash);
|
$hash->{helper}{TIMETOSWITCH} + 15;
|
||||||
MkInternalTimer("SetTimer", $setTimerTime, \&SetTimer, $hash, 0);
|
RmInternalTimer( "SetTimer", $hash );
|
||||||
|
MkInternalTimer( "SetTimer", $setTimerTime, \&SetTimer, $hash, 0 );
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -526,35 +602,39 @@ sub startZeitErmitteln {
|
|||||||
|
|
||||||
my $timespec_start = $hash->{helper}{TIMESPEC_START};
|
my $timespec_start = $hash->{helper}{TIMESPEC_START};
|
||||||
|
|
||||||
my ($rel, $rep, $tspec);
|
my ( $rel, $rep, $tspec );
|
||||||
if ($timespec_start =~ m{^(\+)?(\*)?(.*)$}ixms) {
|
if ( $timespec_start =~ m{^(\+)?(\*)?(.*)$}ixms ) {
|
||||||
$rel = $1;
|
$rel = $1;
|
||||||
$rep = $2;
|
$rep = $2;
|
||||||
$tspec = $3;
|
$tspec = $3;
|
||||||
} else {
|
}
|
||||||
return "Wrong timespec_start <$timespec_start>, use \"[+][*]<time or func>\"";
|
else {
|
||||||
|
return
|
||||||
|
"Wrong timespec_start <$timespec_start>, use \"[+][*]<time or func>\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
my ($err, $hour, $min, $sec, $fn) = GetTimeSpec($tspec);
|
my ( $err, $hour, $min, $sec, $fn ) = GetTimeSpec($tspec);
|
||||||
return $err if($err);
|
return $err if ($err);
|
||||||
|
|
||||||
my $startTime;
|
my $startTime;
|
||||||
if($rel) {
|
if ($rel) {
|
||||||
$startTime = $now + 3600* $hour + 60* $min + $sec;
|
$startTime = $now + 3600 * $hour + 60 * $min + $sec;
|
||||||
} else {
|
}
|
||||||
$startTime = zeitBerechnen($now, $hour, $min, $sec);
|
else {
|
||||||
|
$startTime = zeitBerechnen( $now, $hour, $min, $sec );
|
||||||
}
|
}
|
||||||
my $varStart = $hash->{helper}{VAR_START};
|
my $varStart = $hash->{helper}{VAR_START};
|
||||||
$startTime += int(rand($varStart));
|
$startTime += int( rand($varStart) );
|
||||||
|
|
||||||
$hash->{helper}{startTime} = $startTime;
|
$hash->{helper}{startTime} = $startTime;
|
||||||
$hash->{helper}{STARTTIME} = strftime("%d.%m.%Y %H:%M:%S",localtime($startTime));
|
$hash->{helper}{STARTTIME} =
|
||||||
|
strftime( "%d.%m.%Y %H:%M:%S", localtime($startTime) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub stopTimeReached {
|
sub stopTimeReached {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
return ( time()>$hash->{helper}{stopTime} );
|
return ( time() > $hash->{helper}{stopTime} );
|
||||||
}
|
}
|
||||||
|
|
||||||
sub stopZeitErmitteln {
|
sub stopZeitErmitteln {
|
||||||
@ -563,73 +643,73 @@ sub stopZeitErmitteln {
|
|||||||
|
|
||||||
my $timespec_stop = $hash->{helper}{TIMESPEC_STOP};
|
my $timespec_stop = $hash->{helper}{TIMESPEC_STOP};
|
||||||
|
|
||||||
my ($rel, $rep, $tspec);
|
my ( $rel, $rep, $tspec );
|
||||||
if ($timespec_stop =~ m{^(\+)?(\*)?(.*)$}ixms) {
|
if ( $timespec_stop =~ m{^(\+)?(\*)?(.*)$}ixms ) {
|
||||||
$rel = $1;
|
$rel = $1;
|
||||||
$rep = $2;
|
$rep = $2;
|
||||||
$tspec = $3;
|
$tspec = $3;
|
||||||
} else {
|
}
|
||||||
return "Wrong timespec_stop <$timespec_stop>, use \"[+][*]<time or func>\"";
|
else {
|
||||||
|
return
|
||||||
|
"Wrong timespec_stop <$timespec_stop>, use \"[+][*]<time or func>\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
my ($err, $hour, $min, $sec, $fn) = GetTimeSpec($tspec);
|
my ( $err, $hour, $min, $sec, $fn ) = GetTimeSpec($tspec);
|
||||||
return $err if($err);
|
return $err if ($err);
|
||||||
|
|
||||||
my $stopTime;
|
my $stopTime;
|
||||||
if($rel) {
|
if ($rel) {
|
||||||
$stopTime = $hash->{helper}{startTime} + 3600* $hour + 60* $min + $sec;
|
$stopTime =
|
||||||
} else {
|
$hash->{helper}{startTime} + 3600 * $hour + 60 * $min + $sec;
|
||||||
$stopTime = zeitBerechnen($now, $hour, $min, $sec);
|
}
|
||||||
|
else {
|
||||||
|
$stopTime = zeitBerechnen( $now, $hour, $min, $sec );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!AttrVal($hash->{NAME}, "forceStoptimeSameDay", 0)) {
|
if ( !AttrVal( $hash->{NAME}, "forceStoptimeSameDay", 0 ) ) {
|
||||||
if ($hash->{helper}{startTime} > $stopTime) {
|
if ( $hash->{helper}{startTime} > $stopTime ) {
|
||||||
$stopTime = addDays($stopTime, 1);
|
$stopTime = addDays( $stopTime, 1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$hash->{helper}{stopTime} = $stopTime;
|
$hash->{helper}{stopTime} = $stopTime;
|
||||||
$hash->{helper}{STOPTIME} = strftime("%d.%m.%Y %H:%M:%S",localtime($stopTime));
|
$hash->{helper}{STOPTIME} =
|
||||||
return;
|
strftime( "%d.%m.%Y %H:%M:%S", localtime($stopTime) );
|
||||||
}
|
|
||||||
|
|
||||||
sub Wakeup {
|
|
||||||
|
|
||||||
for my $hc ( sort keys %{$modules{RandomTimer}{defptr}} ) {
|
|
||||||
my $hash = $modules{RandomTimer}{defptr}{$hc};
|
|
||||||
|
|
||||||
my $myHash->{HASH}=$hash;
|
|
||||||
SetTimer($myHash);
|
|
||||||
Log3 undef, 3, "RandomTimer::Wakeup() for $hash->{NAME} done!";
|
|
||||||
}
|
|
||||||
|
|
||||||
Log3 undef, 3, "RandomTimer::Wakeup() done!";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub zeitBerechnen {
|
sub zeitBerechnen {
|
||||||
my ($now, $hour, $min, $sec) = @_;
|
my ( $now, $hour, $min, $sec ) = @_;
|
||||||
|
|
||||||
my @jetzt_arr = localtime($now);
|
my @jetzt_arr = localtime($now);
|
||||||
|
|
||||||
#Stunden Minuten Sekunden
|
#Stunden Minuten Sekunden
|
||||||
$jetzt_arr[2] = $hour; $jetzt_arr[1] = $min; $jetzt_arr[0] = $sec;
|
$jetzt_arr[2] = $hour;
|
||||||
|
$jetzt_arr[1] = $min;
|
||||||
|
$jetzt_arr[0] = $sec;
|
||||||
my $next = timelocal_nocheck(@jetzt_arr);
|
my $next = timelocal_nocheck(@jetzt_arr);
|
||||||
return $next;
|
return $next;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub MkInternalTimer {
|
sub MkInternalTimer {
|
||||||
my ($modifier, $tim, $callback, $hash, $waitIfInitNotDone) = @_;
|
my ( $modifier, $tim, $callback, $hash, $waitIfInitNotDone ) = @_;
|
||||||
|
|
||||||
my $timerName = "$hash->{NAME}_$modifier";
|
my $timerName = "$hash->{NAME}_$modifier";
|
||||||
my $mHash = { HASH=>$hash, NAME=>"$hash->{NAME}_$modifier", MODIFIER=>$modifier};
|
my $mHash = {
|
||||||
if (defined($hash->{TIMER}{$timerName})) {
|
HASH => $hash,
|
||||||
Log3 $hash, 1, "[$hash->{NAME}] possible overwriting of timer $timerName - please delete first";
|
NAME => "$hash->{NAME}_$modifier",
|
||||||
|
MODIFIER => $modifier
|
||||||
|
};
|
||||||
|
if ( defined( $hash->{TIMER}{$timerName} ) ) {
|
||||||
|
Log3( $hash, 1, "[$hash->{NAME}] possible overwriting of timer $timerName - please delete first" );
|
||||||
stacktrace();
|
stacktrace();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$hash->{TIMER}{$timerName} = $mHash;
|
$hash->{TIMER}{$timerName} = $mHash;
|
||||||
}
|
}
|
||||||
|
|
||||||
Log3 $hash, 5, "[$hash->{NAME}] setting Timer: $timerName " . FmtDateTime($tim);
|
Log3( $hash, 5,
|
||||||
InternalTimer($tim, $callback, $mHash, $waitIfInitNotDone);
|
"[$hash->{NAME}] setting Timer: $timerName " . FmtDateTime($tim) );
|
||||||
|
InternalTimer( $tim, $callback, $mHash, $waitIfInitNotDone );
|
||||||
return $mHash;
|
return $mHash;
|
||||||
}
|
}
|
||||||
################################################################################
|
################################################################################
|
||||||
@ -639,9 +719,9 @@ sub RmInternalTimer {
|
|||||||
|
|
||||||
my $timerName = "$hash->{NAME}_$modifier";
|
my $timerName = "$hash->{NAME}_$modifier";
|
||||||
my $myHash = $hash->{TIMER}{$timerName};
|
my $myHash = $hash->{TIMER}{$timerName};
|
||||||
if (defined($myHash)) {
|
if ( defined($myHash) ) {
|
||||||
delete $hash->{TIMER}{$timerName};
|
delete $hash->{TIMER}{$timerName};
|
||||||
Log3 $hash, 5, "[$hash->{NAME}] removing Timer: $timerName";
|
Log3( $hash, 5, "[$hash->{NAME}] removing Timer: $timerName" );
|
||||||
RemoveInternalTimer($myHash);
|
RemoveInternalTimer($myHash);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -651,10 +731,10 @@ sub GetHashIndirekt {
|
|||||||
my $myHash = shift;
|
my $myHash = shift;
|
||||||
my $function = shift // return;
|
my $function = shift // return;
|
||||||
|
|
||||||
if (!defined($myHash->{HASH})) {
|
if ( !defined( $myHash->{HASH} ) ) {
|
||||||
Log3 $myHash, 3, "[$function] myHash not valid";
|
Log3( $myHash, 3, "[$function] myHash not valid" );
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
return $myHash->{HASH};
|
return $myHash->{HASH};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user