From d1800e2f791921c190cbccd8fb73a11e34767ca5 Mon Sep 17 00:00:00 2001
From: loredo <loredo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 20 May 2015 20:49:46 +0000
Subject: [PATCH] RESIDENTStk wakeuptimer: introduce set command end

git-svn-id: https://svn.fhem.de/fhem/trunk@8610 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_RESIDENTS.pm | 17 ++++++-----------
 fhem/FHEM/20_GUEST.pm     | 16 ++++++++--------
 fhem/FHEM/20_ROOMMATE.pm  | 16 ++++++++--------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm
index 3fb820e6c..86cbffbc3 100644
--- a/fhem/FHEM/10_RESIDENTS.pm
+++ b/fhem/FHEM/10_RESIDENTS.pm
@@ -599,7 +599,7 @@ sub RESIDENTS_Set($@) {
                     fhem "attr $wakeuptimerName room " . $attr{$name}{room}
                       if ( defined( $attr{$name}{room} ) );
                     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 sortby " . $sortby
                       if ($sortby);
@@ -955,17 +955,12 @@ sub RESIDENTS_UpdateReadings (@) {
                     && $defs{$wakeupDevice}{TYPE} eq "dummy" )
                 {
                     # forced-stop only if resident is not present anymore
-                    my $wakeupNormalStop;
-                    if (   $newstate ne "gone"
-                        && $newstate ne "none"
-                        && $newstate ne "absent" )
-                    {
-                        $wakeupNormalStop =
-                          AttrVal( $wakeupDevice, "lastRun", "00:00" );
+                    if ( $newpresence eq "present" ) {
+                        fhem "set $wakeupDevice:FILTER=running!=0 end";
+                    }
+                    else {
+                        fhem "set $wakeupDevice:FILTER=running!=0 stop";
                     }
-
-                    fhem
-"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop";
                 }
             }
         }
diff --git a/fhem/FHEM/20_GUEST.pm b/fhem/FHEM/20_GUEST.pm
index 7dd425727..74f1905fb 100644
--- a/fhem/FHEM/20_GUEST.pm
+++ b/fhem/FHEM/20_GUEST.pm
@@ -483,13 +483,13 @@ sub GUEST_Set($@) {
                     if ( defined( $defs{$wakeupDevice} )
                         && $defs{$wakeupDevice}{TYPE} eq "dummy" )
                     {
-                        my $wakeupNormalStop;
-                        $wakeupNormalStop =
-                          AttrVal( $wakeupDevice, "lastRun", "00:00" )
-                          if ( $newpresence eq "present" );
-
-                        fhem
-"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop";
+                        # forced-stop only if resident is not present anymore
+                        if ( $newpresence eq "present" ) {
+                            fhem "set $wakeupDevice:FILTER=running!=0 end";
+                        }
+                        else {
+                            fhem "set $wakeupDevice:FILTER=running!=0 stop";
+                        }
                     }
                 }
             }
@@ -800,7 +800,7 @@ sub GUEST_Set($@) {
                     fhem "attr $wakeuptimerName room " . $attr{$name}{room}
                       if ( defined( $attr{$name}{room} ) );
                     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 sortby " . $sortby
                       if ($sortby);
diff --git a/fhem/FHEM/20_ROOMMATE.pm b/fhem/FHEM/20_ROOMMATE.pm
index ced2fa8e8..227679fa3 100644
--- a/fhem/FHEM/20_ROOMMATE.pm
+++ b/fhem/FHEM/20_ROOMMATE.pm
@@ -485,13 +485,13 @@ sub ROOMMATE_Set($@) {
                     if ( defined( $defs{$wakeupDevice} )
                         && $defs{$wakeupDevice}{TYPE} eq "dummy" )
                     {
-                        my $wakeupNormalStop;
-                        $wakeupNormalStop =
-                          AttrVal( $wakeupDevice, "lastRun", "00:00" )
-                          if ( $newpresence eq "present" );
-
-                        fhem
-"set $wakeupDevice:FILTER=running!=0 stop $wakeupNormalStop";
+                        # forced-stop only if resident is not present anymore
+                        if ( $newpresence eq "present" ) {
+                            fhem "set $wakeupDevice:FILTER=running!=0 end";
+                        }
+                        else {
+                            fhem "set $wakeupDevice:FILTER=running!=0 stop";
+                        }
                     }
                 }
             }
@@ -782,7 +782,7 @@ sub ROOMMATE_Set($@) {
                     fhem "attr $wakeuptimerName room " . $attr{$name}{room}
                       if ( defined( $attr{$name}{room} ) );
                     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 sortby " . $sortby
                       if ($sortby);