Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

correction in RandomTimer_Wakeup()

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5720 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-05-02 10:32:35 +00:00
parent 9009a08770
commit ee45c4b0ab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_RandomTimer.pm
View File

@ -122,6 +122,8 @@ sub RandomTimer_SetTimer($)
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);
$hash->{active} = 0;
schaltZeitenErmitteln($hash, $now); schaltZeitenErmitteln($hash, $now);
@ -150,7 +152,7 @@ sub RandomTimer_Exec($) {
# Wenn aktiv aber disabled, dann timer abschalten, Meldung ausgeben. # Wenn aktiv aber disabled, dann timer abschalten, Meldung ausgeben.
my $active = RandomTimer_isAktiv($hash); my $active = RandomTimer_isAktiv($hash);
my $disabled = RandomTimer_disable($hash); my $disabled = RandomTimer_isDisabled($hash);
my $stopTimeReached = RandomTimer_stopTimeReached($hash); my $stopTimeReached = RandomTimer_stopTimeReached($hash);
if ($active) { if ($active) {
@ -402,7 +404,7 @@ sub get_switchmode ($) {
} }
} }
######################################################################## ########################################################################
sub RandomTimer_disable($) { sub RandomTimer_isDisabled($) {
my ($hash) = @_; my ($hash) = @_;
my $disable = AttrVal($hash->{NAME}, "disable", 0 ); my $disable = AttrVal($hash->{NAME}, "disable", 0 );
@ -417,7 +419,7 @@ sub RandomTimer_Wakeup() { # {RandomTimer_Wakeup()}
my $hash = $modules{RandomTimer}{defptr}{$hc}; my $hash = $modules{RandomTimer}{defptr}{$hc};
my $myHash->{HASH}=$hash; my $myHash->{HASH}=$hash;
RandomTimer_Exec($myHash); RandomTimer_SetTimer($myHash);
Log3 undef, 3, "RandomTimer_Wakeup() for $hash->{NAME} done!"; Log3 undef, 3, "RandomTimer_Wakeup() for $hash->{NAME} done!";
} }
Log3 undef, 3, "RandomTimer_Wakeup() done!"; Log3 undef, 3, "RandomTimer_Wakeup() done!";