From 68679a3b821cb41757d25d4f6134654bb1629ce5 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 11 Apr 2009 08:20:13 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.fhem.de/fhem/trunk@362 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/90_at.pm | 4 ++-- fhem/fhem.pl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/90_at.pm b/fhem/FHEM/90_at.pm index d31d91780..f4946460f 100755 --- a/fhem/FHEM/90_at.pm +++ b/fhem/FHEM/90_at.pm @@ -53,12 +53,11 @@ at_Define($$) $nt -= ($lt[2]*3600+$lt[1]*60+$lt[0]) # Midnight for absolute time if($rel ne "+"); $nt += ($hr*3600+$min*60+$sec); # Plus relative time - $nt += 86400 if($ot >= $nt);# Do it tomorrow... + $nt += 86400 if($ot >= $nt); # Do it tomorrow... $nt += $at_tdiff if(defined($at_tdiff)); @lt = localtime($nt); my $ntm = sprintf("%02d:%02d:%02d", $lt[2], $lt[1], $lt[0]); - if($rep) { # Setting the number of repetitions $cnt =~ s/[{}]//g; return undef if($cnt eq "0"); @@ -100,6 +99,7 @@ at_Exec($) $disable = 1 if($attr{$name} && $attr{$name}{disable}); } + #Log 1, "EXEC $name"; delete $attr{$name}{skip_next} if($skip); my (undef, $command) = split("[ \t]+", $defs{$name}{DEF}, 2); $command = SemicolonEscape($command); diff --git a/fhem/fhem.pl b/fhem/fhem.pl index d95270626..18d1d61a4 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -132,6 +132,7 @@ use vars qw(%oldvalue); # Old values, see commandref.html use vars qw($init_done); # use vars qw($internal_data); # use vars qw(%cmds); # Global command name hash. To be expanded +use vars qw(%data); # Hash for user data use vars qw($reread_active); @@ -150,7 +151,7 @@ my %defaultattr; # Default attributes my %intAt; # Internal at timer hash. my $nextat; # Time when next timer will be triggered. my $intAtCnt=0; -my $cvsid = '$Id: fhem.pl,v 1.69 2009-02-11 12:58:22 rudolfkoenig Exp $'; +my $cvsid = '$Id: fhem.pl,v 1.70 2009-04-11 08:20:13 rudolfkoenig Exp $'; my $namedef = "where is either:\n" . "- a single device name\n" .