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

add support for Max contact sensor with state opened

Browse Source
This commit is contained in:
Marko Oldenburg 2019-02-16 18:18:53 +01:00
parent 28499386e3
commit 16142e0b16
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
73_AutoShuttersControl.pm
View File

@ -770,7 +770,7 @@ sub EventProcessingWindowRec($@) {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if ( $events =~ m#state:\s(open|closed|tilted)# if ( $events =~ m#state:\s(open(ed)?|closed|tilted)# # weitere mögliche Events (opened / closed)
and IsAfterShuttersManualBlocking($shuttersDev) ) and IsAfterShuttersManualBlocking($shuttersDev) )
{ {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
@ -781,7 +781,7 @@ sub EventProcessingWindowRec($@) {
$shutters->setHardLockOut('off') $shutters->setHardLockOut('off')
if ( $1 eq 'closed' and $shutters->getShuttersPlace eq 'terrace' ); if ( $1 eq 'closed' and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
if ( $1 eq 'open' and $shutters->getShuttersPlace eq 'terrace' ); if ( ($1 eq 'open' or $1 eq 'opened') and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
@ -853,7 +853,7 @@ sub EventProcessingWindowRec($@) {
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getVentilatePos ); $shutters->getVentilatePos );
} }
elsif ( $1 eq 'open' elsif ( ($1 eq 'open' or $1 eq 'opened')
and $shutters->getSubTyp eq 'threestate' and $shutters->getSubTyp eq 'threestate'
and $ascDev->getAutoShuttersControlComfort eq 'on' and $ascDev->getAutoShuttersControlComfort eq 'on'
and $queryShuttersPosWinRecComfort ) and $queryShuttersPosWinRecComfort )
@ -1621,7 +1621,7 @@ sub CreateSunRiseSetShuttersTimer($$) {
), ),
1 1
); );
readingsEndUpdate( $shuttersDevHash, 0 ); readingsEndUpdate( $shuttersDevHash, 1 );
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdateIfChanged( readingsBulkUpdateIfChanged(
@ -2373,7 +2373,7 @@ sub CheckIfShuttersWindowRecOpen($) {
my $shuttersDev = shift; my $shuttersDev = shift;
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
if ( $shutters->getWinStatus eq 'open' ) { return 2; } if ( $shutters->getWinStatus eq 'open' or $shutters->getWinStatus eq 'opened' ) { return 2; }
elsif ( $shutters->getWinStatus eq 'tilted' elsif ( $shutters->getWinStatus eq 'tilted'
and $shutters->getSubTyp eq 'threestate' ) and $shutters->getSubTyp eq 'threestate' )
{ {
@ -3660,7 +3660,7 @@ sub getFreezeTemp {
my $name = $self->{name}; my $name = $self->{name};
my $default = $self->{defaultarg}; my $default = $self->{defaultarg};
$default = 'none' if ( not defined($default) ); $default = 3 if ( not defined($default) );
return AttrVal( $name, 'ASC_freezeTemp', $default ); return AttrVal( $name, 'ASC_freezeTemp', $default );
} }