Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

73_AutoShuttersControl: add event RegEx true false to WinRec Fn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20471 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-11-07 13:01:23 +00:00
parent ce280bbecb
commit 63b934b7ed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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- - feature: 49_SSCam: add possible usage of several cache types, e.g. file-
memory- and Redis-Cache, to store images/recordings for memory- and Redis-Cache, to store images/recordings for
streaming devices and email/telebot transmissions. streaming devices and email/telebot transmissions.

11
FHEM/73_AutoShuttersControl.pm
View File

@ -929,7 +929,8 @@ sub EventProcessingWindowRec($@) {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; 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) ) and IsAfterShuttersManualBlocking($shuttersDev) )
{ {
my $match = $1; my $match = $1;
@ -966,7 +967,7 @@ sub EventProcessingWindowRec($@) {
); );
if ( if (
$match =~ /[Cc]lose/ $match =~ /[Cc]lose|true/
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
@ -1023,7 +1024,7 @@ sub EventProcessingWindowRec($@) {
elsif ( elsif (
( (
$match =~ /tilt/ $match =~ /tilt/
or ( $match =~ /[Oo]pen/ or ( $match =~ /[Oo]pen|false/
and $shutters->getSubTyp eq 'twostate' ) and $shutters->getSubTyp eq 'twostate' )
) )
and $shutters->getVentilateOpen eq 'on' 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' ) and $shutters->getSubTyp eq 'threestate' )
{ {
my $posValue; my $posValue;
@ -6658,7 +6659,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.34", "version": "v0.6.35",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],