FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

RESIDENTStk.pm wakeuptimer: Allow relative increase/decrease of wakeup time

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10896 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-02-20 20:18:54 +00:00
parent 0a600e15e4
commit aad0180eca
1 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fhem/FHEM/RESIDENTStk.pm
View File

@ -42,7 +42,7 @@ sub RESIDENTStk_wakeupSet($$) {
my @notify = split / /, $notifyValue; my @notify = split / /, $notifyValue;
if ( if (
lc( $notify[0] ) !~ lc( $notify[0] ) !~
/^(off|nextrun|trigger|start|stop|end|reset|auto|([0-9]{2}:[0-9]{2}))$/ /^(off|nextrun|trigger|start|stop|end|reset|auto|[\+\-][1-9]*[0-9]*|[\+\-]?[0-9]{2}:[0-9]{2})$/
) )
{ {
Log3 $NAME, 5, Log3 $NAME, 5,
@ -801,10 +801,22 @@ if (\$EVTPART0 eq \"stop\") {\
} }
# set new wakeup value # set new wakeup value
elsif (( lc($VALUE) eq "off" || $VALUE =~ /^([0-9]{2}:[0-9]{2})$/ ) elsif (
(
lc($VALUE) eq "off"
|| $VALUE =~ /^[\+\-][1-9]*[0-9]*$/
|| $VALUE =~ /^[\+\-]?([0-9]{2}):([0-9]{2})$/
)
&& defined( $defs{$wakeupAtdevice} ) && defined( $defs{$wakeupAtdevice} )
&& $defs{$wakeupAtdevice}{TYPE} eq "at" ) && $defs{$wakeupAtdevice}{TYPE} eq "at"
)
{ {
if ( $VALUE =~ /^[\+\-]/ ) {
$VALUE =
RESIDENTStk_TimeSum( ReadingsVal( $NAME, "nextRun", 0 ), $VALUE );
}
# Update wakeuptimer device # Update wakeuptimer device
# #
readingsBeginUpdate( $defs{$NAME} ); readingsBeginUpdate( $defs{$NAME} );
@ -1566,6 +1578,43 @@ sub RESIDENTStk_wakeupGetNext($) {
#------------------------------------ #------------------------------------
# #
#
# Make a summary of two time designations
#
sub RESIDENTStk_TimeSum($$) {
my ( $val1, $val2 ) = @_;
my ( $timestamp1, $timestamp2, $math );
if ( $val1 !~ /^([0-9]{2}):([0-9]{2})$/ ) {
return $val1;
}
else {
$timestamp1 = RESIDENTStk_time2sec($val1);
}
if ( $val2 =~ /^([\+\-])([0-9]{2}):([0-9]{2})$/ ) {
$math = $1;
$timestamp2 = RESIDENTStk_time2sec("$2:$3");
}
elsif ( $val2 =~ /^([\+\-])([0-9]*)$/ ) {
$math = $1;
$timestamp2 = $2 * 60;
}
else {
return $val1;
}
if ( $math eq "-" ) {
return
substr( RESIDENTStk_sec2time( $timestamp1 - $timestamp2 ), 0, -3 );
}
else {
return
substr( RESIDENTStk_sec2time( $timestamp1 + $timestamp2 ), 0, -3 );
}
}
sub RESIDENTStk_TimeDiff ($$;$) { sub RESIDENTStk_TimeDiff ($$;$) {
my ( $datetimeNow, $datetimeOld, $format ) = @_; my ( $datetimeNow, $datetimeOld, $format ) = @_;