From e052a8f82b5ea9880e23daaf2385795a2baf32bf Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Thu, 17 Jan 2019 08:50:23 +0000 Subject: [PATCH] 73_AutoShuttersControl: fix drive up then roommate asleep git-svn-id: https://svn.fhem.de/fhem/trunk@18290 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AutoShuttersControl.pm | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 4224882b8..68e389517 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 drive up then roommate asleep - bugfix: DarkSkyAPI: fix uninitialized value in localtime at line 430 - bugfix: 89_FULLY: fixed command set url - bugfix: 98_livetracking: fixed HTTP return diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index c9afffe8d..bd08aeee9 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -41,7 +41,7 @@ package main; use strict; use warnings; -my $version = '0.2.3.2'; +my $version = '0.2.3.3'; sub AutoShuttersControl_Initialize($) { my ($hash) = @_; @@ -1214,7 +1214,7 @@ sub EventProcessingBrightness($@) { ); my $posValue; - if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 + if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and $shutters->getSubTyp eq 'threestate' and $ascDev->getAutoShuttersControlComfort eq 'on' ) { @@ -1767,9 +1767,11 @@ sub SunRiseShuttersAfterTimerFn($) { or $shutters->getRoommatesStatus eq 'gone' or $shutters->getRoommatesStatus eq 'none' ) - and $ascDev->getSelfDefense eq 'off' - or ( $ascDev->getSelfDefense eq 'on' - and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) + and ( + $ascDev->getSelfDefense eq 'off' + or ( $ascDev->getSelfDefense eq 'on' + and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) + ) ) { $shutters->setLastDrive('day open');