FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

fix window closed after sunset and ModeUp absent, fix other bugs

Browse Source
This commit is contained in:
Marko Oldenburg 2019-04-30 09:53:45 +02:00
parent 6528876e23
commit ae7363d1f1
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
73_AutoShuttersControl.pm
View File

@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.3'; my $version = '0.6.3.4';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -845,6 +845,15 @@ sub EventProcessingWindowRec($@) {
: $shutters->getStatus < $shutters->getComfortOpenPos : $shutters->getStatus < $shutters->getComfortOpenPos
); );
ASC_Debug( 'EventProcessingWindowRec: '
. $shutters->getShuttersDev
. ' - HOMEMODE: '
. $homemode
. ' : QueryShuttersPosWinRecTilted'
. $queryShuttersPosWinRecTilted
. ' QueryShuttersPosWinRecComfort: '
. $queryShuttersPosWinRecComfort );
if ( if (
$1 eq 'closed' $1 eq 'closed'
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
@ -853,19 +862,17 @@ sub EventProcessingWindowRec($@) {
or $shutters->getStatus == $shutters->getOpenPos ) or $shutters->getStatus == $shutters->getOpenPos )
) )
{ {
my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus
if ( $homemode eq 'none' );
if ( if (
IsDay($shuttersDev) IsDay($shuttersDev)
and $shutters->getStatus != $shutters->getOpenPos and $shutters->getStatus != $shutters->getOpenPos
and ( $homemode ne 'asleep' and ( ( $homemode ne 'asleep'
or $homemode ne 'gotosleep' and $homemode ne 'gotosleep' )
or $homemode eq 'none' ) or $homemode eq 'none' )
and $shutters->getModeUp ne 'absent'
and $shutters->getModeUp ne 'off'
) )
{ {
$shutters->setLastDrive('window day closed'); $shutters->setLastDrive('window closed at day');
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->setDriveCmd(
( (
@ -876,11 +883,16 @@ sub EventProcessingWindowRec($@) {
); );
} }
elsif (not IsDay($shuttersDev) elsif ( $shutters->getModeUp ne 'absent'
or $homemode eq 'asleep' and $shutters->getModeUp ne 'off'
or $homemode eq 'gotosleep' ) and ( not IsDay($shuttersDev)
or $homemode eq 'asleep'
or $homemode eq 'gotosleep' )
and $shutters->getModeDown ne 'absent'
and $shutters->getModeDown ne 'off'
)
{ {
$shutters->setLastDrive('window night closed'); $shutters->setLastDrive('window closed at night');
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->getClosedPos ); $shutters->setDriveCmd( $shutters->getClosedPos );
} }