fix shhutter drive morning up then roommate sleep and window is closed and selfdefense is on

This commit is contained in:
Marko Oldenburg 2019-01-17 09:47:53 +01:00
parent 88272bca99
commit c3c82436fc

View File

@ -41,7 +41,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = '0.2.3.2'; my $version = '0.2.3.3';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -1767,10 +1767,12 @@ sub SunRiseShuttersAfterTimerFn($) {
or $shutters->getRoommatesStatus eq 'gone' or $shutters->getRoommatesStatus eq 'gone'
or $shutters->getRoommatesStatus eq 'none' or $shutters->getRoommatesStatus eq 'none'
) )
and $ascDev->getSelfDefense eq 'off' and (
$ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
) )
)
{ {
$shutters->setLastDrive('day open'); $shutters->setLastDrive('day open');
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getOpenPos ); ShuttersCommandSet( $hash, $shuttersDev, $shutters->getOpenPos );