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

fix shading with wind and rain protection

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-04 18:46:09 +02:00
parent 062502fdfc
commit 02d8ab2745
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
73_AutoShuttersControl.pm
View File

@ -1597,7 +1597,11 @@ sub EventProcessingShadingBrightness($@) {
ASC_Debug( 'EventProcessingShadingBrightness: ' ASC_Debug( 'EventProcessingShadingBrightness: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Nummerischer Brightness-Wert wurde erkannt. Der Wert ist: ' . ' - Nummerischer Brightness-Wert wurde erkannt. Der Wert ist: '
. $1 ); . $1
. ' RainProtection: '
. $shutters->getRainProtectionStatus
. ' WindProtection: '
. $shutters->getWindProtectionStatus );
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
@ -1609,8 +1613,8 @@ sub EventProcessingShadingBrightness($@) {
) )
and IsDay($shuttersDev) and IsDay($shuttersDev)
and $ascDev->getAutoShuttersControlShading eq 'on' and $ascDev->getAutoShuttersControlShading eq 'on'
#and $shutters->getRainProtectionStatus eq 'unprotection' and $shutters->getRainProtectionStatus eq 'unprotection'
#and $shutters->getWindProtectionStatus eq 'unprotection' and $shutters->getWindProtectionStatus eq 'unprotection'
) )
{ {
ShadingProcessing( ShadingProcessing(
@ -1672,6 +1676,13 @@ sub EventProcessingTwilightDevice($@) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
ASC_Debug( 'EventProcessingTwilightDevice: '
. $shutters->getShuttersDev
. ' RainProtection: '
. $shutters->getRainProtectionStatus
. ' WindProtection: '
. $shutters->getWindProtectionStatus );
if ( if (
( (
$shutters->getShadingMode eq 'always' $shutters->getShadingMode eq 'always'
@ -3718,10 +3729,12 @@ sub getWindProtectionStatus { # Werte protection, unprotection
my $self = shift; my $self = shift;
return ( return (
defined( $self->{ $self->{shuttersDev} }->{ASC_WindParameters} ) (
and defined( defined( $self->{ $self->{shuttersDev} }->{ASC_WindParameters} )
$self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{VAL} and defined(
) $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{VAL}
)
)
? $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{VAL} ? $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{VAL}
: 'unprotection' : 'unprotection'
); );
@ -3731,9 +3744,12 @@ sub getRainProtectionStatus { # Werte protection, unprotection
my $self = shift; my $self = shift;
return ( return (
defined( $self->{ $self->{shuttersDev} }->{RainProtection} ) (
and defined( $self->{ $self->{shuttersDev} }->{RainProtection} )
defined( $self->{ $self->{shuttersDev} }->{RainProtection}->{VAL} ) and defined(
$self->{ $self->{shuttersDev} }->{RainProtection}->{VAL}
)
)
? $self->{ $self->{shuttersDev} }->{RainProtection}->{VAL} ? $self->{ $self->{shuttersDev} }->{RainProtection}->{VAL}
: 'unprotection' : 'unprotection'
); );