FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

98_RandomTimer: new attriute forceStoptimeSameDay to force stopping time of RT the same day.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14538 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
orti-otto 2017-06-18 19:48:48 +00:00
parent 9d122c6a54
commit ab7a49e8e4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/98_RandomTimer.pm
View File

@ -50,7 +50,7 @@ sub RandomTimer_Initialize($)
$hash->{DefFn} = "RandomTimer_Define"; $hash->{DefFn} = "RandomTimer_Define";
$hash->{UndefFn} = "RandomTimer_Undef"; $hash->{UndefFn} = "RandomTimer_Undef";
$hash->{AttrFn} = "RandomTimer_Attr"; $hash->{AttrFn} = "RandomTimer_Attr";
$hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond runonce:0,1 keepDeviceAlive ". $hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond runonce:0,1 keepDeviceAlive forceStoptimeSameDay ".
$readingFnAttributes; $readingFnAttributes;
} }
######################################################################## ########################################################################
@ -385,8 +385,11 @@ sub RandomTimer_stopZeitErmitteln ($$) {
} else { } else {
$stopTime = RandomTimer_zeitBerechnen($now, $hour, $min, $sec); $stopTime = RandomTimer_zeitBerechnen($now, $hour, $min, $sec);
} }
if ($hash->{helper}{startTime} > $stopTime) {
$stopTime = RandomTimer_addDays($stopTime, 1); if (!AttrVal($hash->{NAME}, "forceStoptimeSameDay", 0)) {
if ($hash->{helper}{startTime} > $stopTime) {
$stopTime = RandomTimer_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} = strftime("%d.%m.%Y %H:%M:%S",localtime($stopTime));