From 969c74028514ab246bc9f236073a0dedb951c650 Mon Sep 17 00:00:00 2001
From: LeonGaultier <LeonGaultier@users.noreply.github.com>
Date: Sat, 16 May 2020 18:17:02 +0000
Subject: [PATCH] 73_AutoShuttersControl: fix bug after privacyDown and open
 window

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

diff --git a/fhem/CHANGED b/fhem/CHANGED
index a2d7ef6fd..ce84327f8 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # 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 bug after privacyDown and open window
  - feature: 48_BlinkCamera: first step to support BlinkMini (no change possible)
  - feature: 82_LGTV_WebOS: add Spotify app support
  - change:  93_Log2Syslog: permit content of 'exclErrCond' to fhemLog strings
diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm
index a07ce92fa..639aadcbf 100644
--- a/fhem/FHEM/73_AutoShuttersControl.pm
+++ b/fhem/FHEM/73_AutoShuttersControl.pm
@@ -1044,9 +1044,14 @@ sub EventProcessingWindowRec {
         if (
                $match =~ m{[Cc]lose|true}xms
             && IsAfterShuttersTimeBlocking($shuttersDev)
-            && (   $shutters->getStatus == $shutters->getVentilatePos
+            && (
+                   $shutters->getStatus == $shutters->getVentilatePos
                 || $shutters->getStatus == $shutters->getComfortOpenPos
-                || $shutters->getStatus == $shutters->getOpenPos )
+                || $shutters->getStatus == $shutters->getOpenPos
+                || (   $shutters->getStatus == $shutters->getPrivacyDownPos
+                    && $shutters->getPrivacyDownStatus == 1
+                    && !$shutters->getIsDay )
+            )
             && (   $shutters->getVentilateOpen eq 'on'
                 || $ascDev->getAutoShuttersControlComfort eq 'on' )
           )
@@ -3679,7 +3684,7 @@ sub _IsDay {
             ) ? 1 : 0
         ) if ( $shutters->getDown eq 'brightness' );
 
-        ASC_Debug( 'FnIsDay: '
+        ASC_Debug( 'FnIsDay nach Sonnenuntergang / Abends: '
               . $shuttersDev
               . ' getDownBrightness: '
               . $respIsDay
@@ -3688,7 +3693,9 @@ sub _IsDay {
               . ' BrightnessMin: '
               . $brightnessMinVal
               . ' Sunset: '
-              . $shutters->getSunset );
+              . $shutters->getSunset
+              . ' isday: '
+              . $isday );
 
         ##### Nach Sonnenauf / Morgens
         $respIsDay = (
@@ -3696,14 +3703,14 @@ sub _IsDay {
                 (
                          $shutters->getBrightness > $brightnessMaxVal
                       && !$isday
-                      && !$shutters->getSunrise
+                      && $shutters->getSunrise
                 )
                   || $respIsDay
                   || $shutters->getSunrise
             ) ? 1 : 0
         ) if ( $shutters->getUp eq 'brightness' );
 
-        ASC_Debug( 'FnIsDay: '
+        ASC_Debug( 'FnIsDay nach Sonnenaufgang / Morgens: '
               . $shuttersDev
               . ' getUpBrightness: '
               . $respIsDay
@@ -3712,7 +3719,9 @@ sub _IsDay {
               . ' BrightnessMax: '
               . $brightnessMaxVal
               . ' Sunrise: '
-              . $shutters->getSunrise );
+              . $shutters->getSunrise
+              . ' isday: '
+              . $isday );
     }
 
     return $respIsDay;
@@ -8410,7 +8419,7 @@ sub getBlockAscDrivesAfterManual {
   ],
   "release_status": "testing",
   "license": "GPL_2",
-  "version": "v0.8.27",
+  "version": "v0.8.29",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],