From 63b934b7eddbc14b0d2c41ddd8d46eb908e4ceea Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Thu, 7 Nov 2019 13:01:23 +0000 Subject: [PATCH] 73_AutoShuttersControl: add event RegEx true false to WinRec Fn git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20471 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 1 + FHEM/73_AutoShuttersControl.pm | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGED b/CHANGED index e41ef8937..d50077497 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 73_AutoShuttersControl: add event RegEx true false to WinRec Fn - feature: 49_SSCam: add possible usage of several cache types, e.g. file- memory- and Redis-Cache, to store images/recordings for streaming devices and email/telebot transmissions. diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index df22d490a..be1d98fea 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/73_AutoShuttersControl.pm @@ -929,7 +929,8 @@ sub EventProcessingWindowRec($@) { my ( $hash, $shuttersDev, $events ) = @_; my $name = $hash->{NAME}; - if ( $events =~ m#.*state:.*?([Oo]pen(?>ed)?|[Cc]losed?|tilt(?>ed)?)# + if ( $events =~ + m#.*state:.*?([Oo]pen(?>ed)?|[Cc]losed?|tilt(?>ed)?|true|false)# and IsAfterShuttersManualBlocking($shuttersDev) ) { my $match = $1; @@ -966,7 +967,7 @@ sub EventProcessingWindowRec($@) { ); if ( - $match =~ /[Cc]lose/ + $match =~ /[Cc]lose|true/ and IsAfterShuttersTimeBlocking($shuttersDev) and ( $shutters->getStatus == $shutters->getVentilatePos or $shutters->getStatus == $shutters->getComfortOpenPos @@ -1023,7 +1024,7 @@ sub EventProcessingWindowRec($@) { elsif ( ( $match =~ /tilt/ - or ( $match =~ /[Oo]pen/ + or ( $match =~ /[Oo]pen|false/ and $shutters->getSubTyp eq 'twostate' ) ) and $shutters->getVentilateOpen eq 'on' @@ -1041,7 +1042,7 @@ sub EventProcessingWindowRec($@) { ) ); } - elsif ( $match =~ /[Oo]pen/ + elsif ( $match =~ /[Oo]pen|false/ and $shutters->getSubTyp eq 'threestate' ) { my $posValue; @@ -6658,7 +6659,7 @@ sub getblockAscDrivesAfterManual { ], "release_status": "under develop", "license": "GPL_2", - "version": "v0.6.34", + "version": "v0.6.35", "author": [ "Marko Oldenburg " ],