From 2eed8b1bec5d558dd708bdad296a4f056caefeef Mon Sep 17 00:00:00 2001
From: LeonGaultier <LeonGaultier@users.noreply.github.com>
Date: Sat, 14 Mar 2020 15:58:32 +0000
Subject: [PATCH] 73_AutoShuttersControl: fix SleepPos conditions in residents
 and roommates Fn

git-svn-id: https://svn.fhem.de/fhem/trunk@21423 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                        |  2 ++
 fhem/FHEM/73_AutoShuttersControl.pm | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index a3ac3d5d8..1327adda9 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,7 @@
 # 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.
+ - bugfix:  73_AutoShuttersControl: fix SleepPos conditions in residents
+                                    and roommates Fn
  - feature: 73_DoorBird: Manual Video_Request
  - change:  59_WUup: use UConv to calculate solarradiation from lux to W/m²
  - change:  74_AMADDevice: add logreport is attribut fhemServerIP not set
diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm
index 236499914..68778a03d 100644
--- a/fhem/FHEM/73_AutoShuttersControl.pm
+++ b/fhem/FHEM/73_AutoShuttersControl.pm
@@ -1274,13 +1274,14 @@ sub EventProcessingRoommate($@) {
                             or $shutters->getShadingMode eq 'absent'
                         )
                         and (  $shutters->getStatus == $shutters->getClosedPos
-                            or $shutters->getStatus ==
-                            $shutters->getShadingPos )
+                            or $shutters->getStatus == $shutters->getSleepPos
+                            or $shutters->getStatus == $shutters->getShadingPos )
                       )
                     {
                         $shutters->setLastDrive(
                             (
-                                $shutters->getStatus == $shutters->getClosedPos
+                                (  $shutters->getStatus == $shutters->getClosedPos
+                                or $shutters->getStatus == $shutters->getSleepPos)
                                 ? 'roommate come home'
                                 : 'shading out'
                             )
@@ -1439,7 +1440,8 @@ sub EventProcessingResidents($@) {
             my $getModeDown = $shutters->getModeDown;
 
             if (
-                    $shutters->getStatus != $shutters->getClosedPos
+                    (  $shutters->getStatus != $shutters->getClosedPos
+                    or $shutters->getStatus != $shutters->getSleepPos )
                 and not $shutters->getIsDay
                 and $shutters->getRoommatesStatus eq 'none'
                 and (  $getModeDown eq 'home'
@@ -1502,7 +1504,8 @@ sub EventProcessingResidents($@) {
                     and not $shutters->getSelfDefenseAbsent
                     and $shutters->getSelfDefenseAbsentTimerrun );
 
-                if (    $shutters->getStatus == $shutters->getClosedPos
+                if (    (  $shutters->getStatus == $shutters->getClosedPos
+                        or $shutters->getStatus == $shutters->getSleepPos )
                     and $shutters->getIsDay )
                 {
                     $shutters->setHardLockOut('on')
@@ -1525,7 +1528,8 @@ sub EventProcessingResidents($@) {
                 }
             }
             elsif (
-                    $shutters->getStatus == $shutters->getClosedPos
+                    (  $shutters->getStatus == $shutters->getClosedPos
+                    or $shutters->getStatus == $shutters->getSleepPos )
                 and $shutters->getIsDay
                 and $shutters->getRoommatesStatus eq 'none'
                 and (  $getModeUp eq 'home'
@@ -7905,7 +7909,7 @@ sub getblockAscDrivesAfterManual {
   ],
   "release_status": "testing",
   "license": "GPL_2",
-  "version": "v0.8.17",
+  "version": "v0.8.18",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],