mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESIDENTStk wakeuptimer: introduce set command end

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8610 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2015-05-20 20:49:46 +00:00
parent 2f8a7211a1
commit 1a4d34db48
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_RESIDENTS.pm
View File

@@ -599,7 +599,7 @@ sub RESIDENTS_Set($@) {
fhem "attr $wakeuptimerName room " . $attr{$name}{room} fhem "attr $wakeuptimerName room " . $attr{$name}{room}
if ( defined( $attr{$name}{room} ) ); if ( defined( $attr{$name}{room} ) );
fhem fhem
"attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg"; "attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg end:noArg";
fhem "attr $wakeuptimerName userattr wakeupUserdevice"; fhem "attr $wakeuptimerName userattr wakeupUserdevice";
fhem "attr $wakeuptimerName sortby " . $sortby fhem "attr $wakeuptimerName sortby " . $sortby
if ($sortby); if ($sortby);
@@ -955,17 +955,12 @@ sub RESIDENTS_UpdateReadings (@) {
&& $defs{$wakeupDevice}{TYPE} eq "dummy" ) && $defs{$wakeupDevice}{TYPE} eq "dummy" )
{ {
# forced-stop only if resident is not present anymore # forced-stop only if resident is not present anymore
my $wakeupNormalStop; if ( $newpresence eq "present" ) {
if ( $newstate ne "gone" fhem "set $wakeupDevice:FILTER=running!=0 end";
&& $newstate ne "none" }
&& $newstate ne "absent" ) else {
{ fhem "set $wakeupDevice:FILTER=running!=0 stop";
$wakeupNormalStop =
AttrVal( $wakeupDevice, "lastRun", "00:00" );
} }
fhem
"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop";
} }
} }
} }

16
fhem/FHEM/20_GUEST.pm
View File

@@ -483,13 +483,13 @@ sub GUEST_Set($@) {
if ( defined( $defs{$wakeupDevice} ) if ( defined( $defs{$wakeupDevice} )
&& $defs{$wakeupDevice}{TYPE} eq "dummy" ) && $defs{$wakeupDevice}{TYPE} eq "dummy" )
{ {
my $wakeupNormalStop; # forced-stop only if resident is not present anymore
$wakeupNormalStop = if ( $newpresence eq "present" ) {
AttrVal( $wakeupDevice, "lastRun", "00:00" ) fhem "set $wakeupDevice:FILTER=running!=0 end";
if ( $newpresence eq "present" ); }
else {
fhem fhem "set $wakeupDevice:FILTER=running!=0 stop";
"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop"; }
} }
} }
} }
@@ -800,7 +800,7 @@ sub GUEST_Set($@) {
fhem "attr $wakeuptimerName room " . $attr{$name}{room} fhem "attr $wakeuptimerName room " . $attr{$name}{room}
if ( defined( $attr{$name}{room} ) ); if ( defined( $attr{$name}{room} ) );
fhem fhem
"attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg"; "attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg end:noArg";
fhem "attr $wakeuptimerName userattr wakeupUserdevice"; fhem "attr $wakeuptimerName userattr wakeupUserdevice";
fhem "attr $wakeuptimerName sortby " . $sortby fhem "attr $wakeuptimerName sortby " . $sortby
if ($sortby); if ($sortby);

16
fhem/FHEM/20_ROOMMATE.pm
View File

@@ -485,13 +485,13 @@ sub ROOMMATE_Set($@) {
if ( defined( $defs{$wakeupDevice} ) if ( defined( $defs{$wakeupDevice} )
&& $defs{$wakeupDevice}{TYPE} eq "dummy" ) && $defs{$wakeupDevice}{TYPE} eq "dummy" )
{ {
my $wakeupNormalStop; # forced-stop only if resident is not present anymore
$wakeupNormalStop = if ( $newpresence eq "present" ) {
AttrVal( $wakeupDevice, "lastRun", "00:00" ) fhem "set $wakeupDevice:FILTER=running!=0 end";
if ( $newpresence eq "present" ); }
else {
fhem fhem "set $wakeupDevice:FILTER=running!=0 stop";
"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop"; }
} }
} }
} }
@@ -782,7 +782,7 @@ sub ROOMMATE_Set($@) {
fhem "attr $wakeuptimerName room " . $attr{$name}{room} fhem "attr $wakeuptimerName room " . $attr{$name}{room}
if ( defined( $attr{$name}{room} ) ); if ( defined( $attr{$name}{room} ) );
fhem fhem
"attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg"; "attr $wakeuptimerName setList nextRun:OFF,00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45 reset:noArg trigger:noArg start:noArg stop:noArg end:noArg";
fhem "attr $wakeuptimerName userattr wakeupUserdevice"; fhem "attr $wakeuptimerName userattr wakeupUserdevice";
fhem "attr $wakeuptimerName sortby " . $sortby fhem "attr $wakeuptimerName sortby " . $sortby
if ($sortby); if ($sortby);