From 20191f45650b4c12445ff66b265b3340d3d44b82 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 12 May 2020 22:40:17 +0200 Subject: [PATCH] fix bug then privacyDownPos and night drive with window open --- 73_AutoShuttersControl.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm index f98ed5e..aebd03f 100644 --- a/73_AutoShuttersControl.pm +++ b/73_AutoShuttersControl.pm @@ -1142,9 +1142,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 == 0 + && !$shutters->getIsDay ) + ) && ( $shutters->getVentilateOpen eq 'on' || $ascDev->getAutoShuttersControlComfort eq 'on' ) ) @@ -2250,12 +2255,12 @@ sub EventProcessingBrightness { sub EventProcessingShadingBrightness { my ( $hash, $shuttersDev, $events ) = @_; - my $name = $hash->{NAME}; + my $name = $hash->{NAME}; $shutters->setShuttersDev($shuttersDev); my $reading = $shutters->getBrightnessReading; my $outTemp = $shutters->getOutTemp; - $outTemp = $ascDev->getOutTemp - if ($outTemp == -100); + $outTemp = $ascDev->getOutTemp + if ( $outTemp == -100 ); Log3( $name, 4, "AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness" @@ -2328,8 +2333,8 @@ sub EventProcessingTwilightDevice { if ( $events =~ m{(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)}xms ) { my $name = $device; my $outTemp = $shutters->getOutTemp; - $outTemp = $ascDev->getOutTemp - if ($outTemp == -100); + $outTemp = $ascDev->getOutTemp + if ( $outTemp == -100 ); my ( $azimuth, $elevation ); $azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' ); @@ -2581,11 +2586,13 @@ sub ShadingProcessing { ) && ( $shutters->getShadingMode eq 'always' || $shutters->getShadingMode eq $homemode ) - && ( $shutters->getModeUp eq 'always' + && ( + $shutters->getModeUp eq 'always' || $shutters->getModeUp eq $homemode || ( $shutters->getModeUp eq 'home' && $homemode ne 'asleep' ) - || $shutters->getModeUp eq 'off' ) + || $shutters->getModeUp eq 'off' + ) && ( ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2 || ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos )