Merge branch 'master' into devel

little bugfix
This commit is contained in:
Marko Oldenburg 2019-11-07 19:29:54 +01:00
commit ecf1935164

View File

@ -978,10 +978,10 @@ sub EventProcessingWindowRec($@) {
#### Hardware Lock der Rollläden
$shutters->setHardLockOut('off')
if ( $match =~ /[Cc]lose/
if ( $match =~ /[Cc]lose|true/
and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setHardLockOut('on')
if ( $match =~ /[Oo]pen/
if ( $match =~ /[Oo]pen|false/
and $shutters->getShuttersPlace eq 'terrace' );
ASC_Debug( 'EventProcessingWindowRec: '
@ -3934,7 +3934,7 @@ sub CheckIfShuttersWindowRecOpen($) {
my $shuttersDev = shift;
$shutters->setShuttersDev($shuttersDev);
if ( $shutters->getWinStatus =~ /[Oo]pen/ ) # CK: covers: open|opened
if ( $shutters->getWinStatus =~ /[Oo]pen|false/ ) # CK: covers: open|opened
{
return 2;
}
@ -3943,7 +3943,7 @@ sub CheckIfShuttersWindowRecOpen($) {
{
return 1;
}
elsif ( $shutters->getWinStatus =~ /[Cc]lose/ ) {
elsif ( $shutters->getWinStatus =~ /[Cc]lose|true/ ) {
return 0;
} # CK: covers: close|closed
}