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

fix merge conflict

Browse Source
This commit is contained in:
Marko Oldenburg
2019-02-27 10:35:05 +01:00
parent 857d026e6d 2cf01e406c
commit dbbc002cf6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
73_AutoShuttersControl.pm
View File

@ -41,7 +41,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = '0.4.0.8-patchWind'; my $version = '0.4.0.9-patchWind';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -842,7 +842,7 @@ sub EventProcessingWindowRec($@) {
elsif ( elsif (
( (
$1 eq 'tilted' $1 eq 'tilted'
or ( $1 eq 'open' and $shutters->getSubTyp eq 'twostate' ) or ( ($1 eq 'open' or $1 eq 'opened') and $shutters->getSubTyp eq 'twostate' )
) )
and $shutters->getVentilateOpen eq 'on' and $shutters->getVentilateOpen eq 'on'
and $queryShuttersPosWinRecTilted and $queryShuttersPosWinRecTilted