73_AutoShuttersControl: fix drive up then roommate asleep

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18290 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-01-17 08:50:23 +00:00
parent 8ae589a112
commit 9442e36341
2 changed files with 8 additions and 5 deletions

View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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: DarkSkyAPI: fix uninitialized value in localtime at line 430
- bugfix: 89_FULLY: fixed command set url - bugfix: 89_FULLY: fixed command set url
- bugfix: 98_livetracking: fixed HTTP return - bugfix: 98_livetracking: fixed HTTP return

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) = @_;
@ -1214,7 +1214,7 @@ sub EventProcessingBrightness($@) {
); );
my $posValue; my $posValue;
if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getSubTyp eq 'threestate' and $shutters->getSubTyp eq 'threestate'
and $ascDev->getAutoShuttersControlComfort eq 'on' ) and $ascDev->getAutoShuttersControlComfort eq 'on' )
{ {
@ -1767,9 +1767,11 @@ 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 (
or ( $ascDev->getSelfDefense eq 'on' $ascDev->getSelfDefense eq 'off'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
)
) )
{ {
$shutters->setLastDrive('day open'); $shutters->setLastDrive('day open');