mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
correction in RandomTimer_Wakeup()
git-svn-id: https://svn.fhem.de/fhem/trunk@5720 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
9009a08770
commit
ee45c4b0ab
@ -123,6 +123,8 @@ sub RandomTimer_SetTimer($)
|
||||
my $now = time();
|
||||
my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime($now);
|
||||
|
||||
$hash->{active} = 0;
|
||||
|
||||
schaltZeitenErmitteln($hash, $now);
|
||||
|
||||
Log3 $hash, 4, "[".$hash->{NAME}."]" . " timings for RandomTimer on $hash->{DEVICE}: "
|
||||
@ -150,7 +152,7 @@ sub RandomTimer_Exec($) {
|
||||
|
||||
# Wenn aktiv aber disabled, dann timer abschalten, Meldung ausgeben.
|
||||
my $active = RandomTimer_isAktiv($hash);
|
||||
my $disabled = RandomTimer_disable($hash);
|
||||
my $disabled = RandomTimer_isDisabled($hash);
|
||||
my $stopTimeReached = RandomTimer_stopTimeReached($hash);
|
||||
|
||||
if ($active) {
|
||||
@ -402,7 +404,7 @@ sub get_switchmode ($) {
|
||||
}
|
||||
}
|
||||
########################################################################
|
||||
sub RandomTimer_disable($) {
|
||||
sub RandomTimer_isDisabled($) {
|
||||
my ($hash) = @_;
|
||||
|
||||
my $disable = AttrVal($hash->{NAME}, "disable", 0 );
|
||||
@ -417,7 +419,7 @@ sub RandomTimer_Wakeup() { # {RandomTimer_Wakeup()}
|
||||
my $hash = $modules{RandomTimer}{defptr}{$hc};
|
||||
|
||||
my $myHash->{HASH}=$hash;
|
||||
RandomTimer_Exec($myHash);
|
||||
RandomTimer_SetTimer($myHash);
|
||||
Log3 undef, 3, "RandomTimer_Wakeup() for $hash->{NAME} done!";
|
||||
}
|
||||
Log3 undef, 3, "RandomTimer_Wakeup() done!";
|
||||
|
Loading…
x
Reference in New Issue
Block a user