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

add Closed Open to RegEx Windowevent

Browse Source
This commit is contained in:
Marko Oldenburg 2019-06-10 14:23:00 +02:00
parent 0aa3b79a4b
commit 3ededcb209
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
73_AutoShuttersControl.pm
View File

@ -48,7 +48,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.16.6'; my $version = '0.6.16.7';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -892,7 +892,7 @@ sub EventProcessingWindowRec($@) {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if ( $events =~ m#.*state:.*(open(?>ed)?|closed?|tilt(?>ed)?)# if ( $events =~ m#.*state:.*([Oo]pen(?>ed)?|[Cc]losed?|tilt(?>ed)?)#
and IsAfterShuttersManualBlocking($shuttersDev) ) and IsAfterShuttersManualBlocking($shuttersDev) )
{ {
my $match = $1; my $match = $1;
@ -939,7 +939,7 @@ sub EventProcessingWindowRec($@) {
); );
if ( if (
$match =~ /close/ $match =~ /[Cc]lose/
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and ( $shutters->getStatus == $shutters->getVentilatePos and ( $shutters->getStatus == $shutters->getVentilatePos
or $shutters->getStatus == $shutters->getComfortOpenPos or $shutters->getStatus == $shutters->getComfortOpenPos
@ -991,7 +991,7 @@ sub EventProcessingWindowRec($@) {
elsif ( elsif (
( (
$match =~ /tilt/ $match =~ /tilt/
or ( $match =~ /open/ or ( $match =~ /[Oo]pen/
and $shutters->getSubTyp eq 'twostate' ) and $shutters->getSubTyp eq 'twostate' )
) )
and $shutters->getVentilateOpen eq 'on' and $shutters->getVentilateOpen eq 'on'
@ -1002,7 +1002,7 @@ sub EventProcessingWindowRec($@) {
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->getVentilatePos ); $shutters->setDriveCmd( $shutters->getVentilatePos );
} }
elsif ( $match =~ /open/ elsif ( $match =~ /[Oop]en/
and $shutters->getSubTyp eq 'threestate' ) and $shutters->getSubTyp eq 'threestate' )
{ {
my $posValue; my $posValue;