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

change version and code style

Browse Source
This commit is contained in:
Marko Oldenburg 2019-04-30 09:56:19 +02:00
parent ae7363d1f1
commit 9ea78f22c3
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
73_AutoShuttersControl.pm
View File

@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.3.4'; my $version = '0.6.4';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -846,13 +846,13 @@ sub EventProcessingWindowRec($@) {
); );
ASC_Debug( 'EventProcessingWindowRec: ' ASC_Debug( 'EventProcessingWindowRec: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - HOMEMODE: ' . ' - HOMEMODE: '
. $homemode . $homemode
. ' : QueryShuttersPosWinRecTilted' . ' : QueryShuttersPosWinRecTilted'
. $queryShuttersPosWinRecTilted . $queryShuttersPosWinRecTilted
. ' QueryShuttersPosWinRecComfort: ' . ' QueryShuttersPosWinRecComfort: '
. $queryShuttersPosWinRecComfort ); . $queryShuttersPosWinRecComfort );
if ( if (
$1 eq 'closed' $1 eq 'closed'
@ -865,8 +865,7 @@ sub EventProcessingWindowRec($@) {
if ( if (
IsDay($shuttersDev) IsDay($shuttersDev)
and $shutters->getStatus != $shutters->getOpenPos and $shutters->getStatus != $shutters->getOpenPos
and ( ( $homemode ne 'asleep' and ( ( $homemode ne 'asleep' and $homemode ne 'gotosleep' )
and $homemode ne 'gotosleep' )
or $homemode eq 'none' ) or $homemode eq 'none' )
and $shutters->getModeUp ne 'absent' and $shutters->getModeUp ne 'absent'
and $shutters->getModeUp ne 'off' and $shutters->getModeUp ne 'off'
@ -883,11 +882,12 @@ sub EventProcessingWindowRec($@) {
); );
} }
elsif ( $shutters->getModeUp ne 'absent' elsif (
$shutters->getModeUp ne 'absent'
and $shutters->getModeUp ne 'off' and $shutters->getModeUp ne 'off'
and ( not IsDay($shuttersDev) and ( not IsDay($shuttersDev)
or $homemode eq 'asleep' or $homemode eq 'asleep'
or $homemode eq 'gotosleep' ) or $homemode eq 'gotosleep' )
and $shutters->getModeDown ne 'absent' and $shutters->getModeDown ne 'absent'
and $shutters->getModeDown ne 'off' and $shutters->getModeDown ne 'off'
) )
@ -4669,10 +4669,11 @@ sub _getRainSensor {
$self->{ASC_rainSensor}->{reading} = $self->{ASC_rainSensor}->{reading} =
( $reading ne 'none' ? $reading : 'state' ); ( $reading ne 'none' ? $reading : 'state' );
$self->{ASC_rainSensor}->{triggermax} = ( $max ne 'none' ? $max : 1000 ); $self->{ASC_rainSensor}->{triggermax} = ( $max ne 'none' ? $max : 1000 );
$self->{ASC_rainSensor}->{triggerhyst} = $self->{ASC_rainSensor}->{triggerhyst} = (
( $hyst ne 'none' $hyst ne 'none'
? $max - $hyst ? $max - $hyst
: ( $self->{ASC_rainSensor}->{triggermax} * 0 ) ); : ( $self->{ASC_rainSensor}->{triggermax} * 0 )
);
$self->{ASC_rainSensor}->{shuttersClosedPos} = $self->{ASC_rainSensor}->{shuttersClosedPos} =
( $pos ne 'none' ? $pos : $shutters->getClosedPos ); ( $pos ne 'none' ? $pos : $shutters->getClosedPos );