FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 06:36:04 +00:00
Code Issues Releases Wiki Activity

98_RandomTimer: remove Twilight dependency

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19272 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2019-04-28 05:43:23 +00:00
parent 627a8e5b37
commit b41f79ff2b
2 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# 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.
- change: 98_RandomTimer: remove 59_Twilight dependency
- feature: 93_DbRep: new set "index" command to manage needed indexe for
DbLog and DbRep, minor code changes
- change: 98_WeekdayTimer: remove 59_Twilight dependency

79
fhem/FHEM/98_RandomTimer.pm
View File

@ -1,6 +1,6 @@
# Id ##########################################################################
##########################################################################
# $Id$
#
# copyright ###################################################################
#
# 98_RandomTimer.pm
@ -61,14 +61,6 @@ sub RandomTimer_zeitBerechnen ($$$$);
sub RandomTimer_Initialize($) {
my ($hash) = @_;
if(
!$modules{Twilight}{LOADED} &&
-f "$attr{global}{modpath}/FHEM/59_Twilight.pm"
) {
my $ret = CommandReload(undef, "59_Twilight");
Log3 undef, 1, $ret if($ret);
}
$hash->{DefFn} = "RandomTimer_Define";
$hash->{UndefFn} = "RandomTimer_Undef";
$hash->{AttrFn} = "RandomTimer_Attr";
@ -125,8 +117,8 @@ sub RandomTimer_Define($$) {
readingsSingleUpdate ($hash, "TimeToSwitch", $hash->{helper}{TIMETOSWITCH}, 1);
myRemoveInternalTimer("SetTimer", $hash);
myInternalTimer ("SetTimer", time(), "RandomTimer_SetTimer", $hash, 0);
RandomTimer_RemoveInternalTimer("SetTimer", $hash);
RandomTimer_InternalTimer("SetTimer", time(), "RandomTimer_SetTimer", $hash, 0);
return undef;
}
@ -135,8 +127,8 @@ sub RandomTimer_Undef($$) {
my ($hash, $arg) = @_;
myRemoveInternalTimer("SetTimer", $hash);
myRemoveInternalTimer("Exec", $hash);
RandomTimer_RemoveInternalTimer("SetTimer", $hash);
RandomTimer_RemoveInternalTimer("Exec", $hash);
delete $modules{RandomTimer}{defptr}{$hash->{NAME}};
return undef;
}
@ -153,8 +145,8 @@ sub RandomTimer_Attr($$$) {
if( $attrName ~~ ["disable","disableCond"] ) {
# Schaltung vorziehen, damit bei einem disable abgeschaltet wird.
myRemoveInternalTimer("Exec", $hash);
myInternalTimer ("Exec", time()+1, "RandomTimer_Exec", $hash, 0);
RandomTimer_RemoveInternalTimer("Exec", $hash);
RandomTimer_InternalTimer("Exec", time()+1, "RandomTimer_Exec", $hash, 0);
}
return undef;
}
@ -220,7 +212,7 @@ sub RandomTimer_down($) {
sub RandomTimer_Exec($) {
my ($myHash) = @_;
my $hash = myGetHashIndirekt($myHash, (caller(0))[3]);
my $hash = RandomTimer_GetHashIndirekt($myHash, (caller(0))[3]);
return if (!defined($hash));
my $now = time();
@ -284,8 +276,8 @@ sub RandomTimer_Exec($) {
}
my $nextSwitch = time() + RandomTimer_getSecsToNextAbschaltTest($hash);
myRemoveInternalTimer("Exec", $hash);
myInternalTimer ("Exec", $nextSwitch, "RandomTimer_Exec", $hash, 0);
RandomTimer_RemoveInternalTimer("Exec", $hash);
RandomTimer_InternalTimer("Exec", $nextSwitch, "RandomTimer_Exec", $hash, 0);
}
@ -376,7 +368,7 @@ sub RandomTimer_setSwitchmode ($$) {
sub RandomTimer_SetTimer($) {
my ($myHash) = @_;
my $hash = myGetHashIndirekt($myHash, (caller(0))[3]);
my $hash = RandomTimer_GetHashIndirekt($myHash, (caller(0))[3]);
return if (!defined($hash));
my $now = time();
@ -393,14 +385,14 @@ sub RandomTimer_SetTimer($) {
my $secToMidnight = 24*3600 -(3600*$hour + 60*$min + $sec);
my $setExecTime = max($now, $hash->{helper}{startTime});
myRemoveInternalTimer("Exec", $hash);
myInternalTimer ("Exec", $setExecTime, "RandomTimer_Exec", $hash, 0);
RandomTimer_RemoveInternalTimer("Exec", $hash);
RandomTimer_InternalTimer("Exec", $setExecTime, "RandomTimer_Exec", $hash, 0);
if ($hash->{helper}{REP} gt "") {
my $setTimerTime = max($now+$secToMidnight + 15,
$hash->{helper}{stopTime}) + $hash->{helper}{TIMETOSWITCH}+15;
myRemoveInternalTimer("SetTimer", $hash);
myInternalTimer ("SetTimer", $setTimerTime, "RandomTimer_SetTimer", $hash, 0);
RandomTimer_RemoveInternalTimer("SetTimer", $hash);
RandomTimer_InternalTimer("SetTimer", $setTimerTime, "RandomTimer_SetTimer", $hash, 0);
}
}
@ -482,6 +474,45 @@ sub RandomTimer_zeitBerechnen ($$$$) {
return $next;
}
sub RandomTimer_InternalTimer($$$$$) {
my ($modifier, $tim, $callback, $hash, $waitIfInitNotDone) = @_;
my $timerName = "$hash->{NAME}_$modifier";
my $mHash = { HASH=>$hash, 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();
} else {
$hash->{TIMER}{$timerName} = $mHash;
}
Log3 $hash, 5, "[$hash->{NAME}] setting Timer: $timerName " . FmtDateTime($tim);
InternalTimer($tim, $callback, $mHash, $waitIfInitNotDone);
return $mHash;
}
################################################################################
sub RandomTimer_RemoveInternalTimer($$) {
my ($modifier, $hash) = @_;
my $timerName = "$hash->{NAME}_$modifier";
my $myHash = $hash->{TIMER}{$timerName};
if (defined($myHash)) {
delete $hash->{TIMER}{$timerName};
Log3 $hash, 5, "[$hash->{NAME}] removing Timer: $timerName";
RemoveInternalTimer($myHash);
}
}
sub RandomTimer_GetHashIndirekt ($$) {
my ($myHash, $function) = @_;
if (!defined($myHash->{HASH})) {
Log 3, "[$function] myHash not valid";
return undef;
};
return $myHash->{HASH};
}
1;
# commandref ##################################################################