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

change more window contact values

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-10 16:06:17 +02:00
parent 348058782f
commit 6a8c0f03b1
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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.9'; my $version = '0.6.16.10';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -844,8 +844,6 @@ sub AddNotifyDev($@) {
%hash = map { ( $_ => 1 ) } %hash = map { ( $_ => 1 ) }
split( ',', "$notifyDev,$dev" ); split( ',', "$notifyDev,$dev" );
my $match
; # CK: added local variable to save matched event type (open|opened|close|closed|tilt|tilted)
$hash->{NOTIFYDEV} = join( ',', sort keys %hash ); $hash->{NOTIFYDEV} = join( ',', sort keys %hash );
my @devs = split( ',', $dev ); my @devs = split( ',', $dev );
@ -912,9 +910,9 @@ sub EventProcessingWindowRec($@) {
#### Hardware Lock der Rollläden #### Hardware Lock der Rollläden
$shutters->setHardLockOut('off') $shutters->setHardLockOut('off')
if ( $match =~ /close/ and $shutters->getShuttersPlace eq 'terrace' ); if ( $match =~ /[Cc]lose/ and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
if ( $match =~ /open/ if ( $match =~ /[Oo]pen/
and $shutters->getShuttersPlace eq 'terrace' ); and $shutters->getShuttersPlace eq 'terrace' );
# my $queryShuttersPosWinRecTilted = ( # my $queryShuttersPosWinRecTilted = (
@ -3376,7 +3374,7 @@ sub CheckIfShuttersWindowRecOpen($) {
my $shuttersDev = shift; my $shuttersDev = shift;
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
if ( $shutters->getWinStatus =~ /open/ ) # CK: covers: open|opened if ( $shutters->getWinStatus =~ /[Oo]pen/ ) # CK: covers: open|opened
{ {
return 2; return 2;
} }
@ -3385,7 +3383,7 @@ sub CheckIfShuttersWindowRecOpen($) {
{ {
return 1; return 1;
} }
elsif ( $shutters->getWinStatus =~ /close/ ) { elsif ( $shutters->getWinStatus =~ /[Cc]lose/ ) {
return 0; return 0;
} # CK: covers: close|closed } # CK: covers: close|closed
} }