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

code style

Browse Source
This commit is contained in:
Marko Oldenburg 2020-04-10 15:42:44 +02:00
parent df93a8b8c1
commit f61ceaf6f0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
73_AutoShuttersControl.pm
View File

@ -2511,8 +2511,7 @@ sub ShadingProcessingDriveCommand {
&& $getShadingPos != $getStatus ) && $getShadingPos != $getStatus )
{ {
if ( !CheckIfShuttersWindowRecOpen($shuttersDev) == 2 if ( !CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $shutters->getShuttersPlace eq 'terrace' && $shutters->getShuttersPlace eq 'terrace' )
)
{ {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos ); ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos );
@ -2949,8 +2948,8 @@ sub CreateSunRiseSetShuttersTimer {
} }
else { else {
CommandDeleteReading( undef, $shuttersDev . ' ASC_Time_PrivacyDriveUp' ) CommandDeleteReading( undef, $shuttersDev . ' ASC_Time_PrivacyDriveUp' )
if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) ne
ne 'none' ); 'none' );
} }
## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen ## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen
@ -2962,8 +2961,8 @@ sub CreateSunRiseSetShuttersTimer {
CommandDeleteReading( undef, CommandDeleteReading( undef,
$shuttersDev . ' ASC_Time_PrivacyDriveDown' ) $shuttersDev . ' ASC_Time_PrivacyDriveDown' )
if ( if (
ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveDown', 'none' ) ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveDown', 'none' ) ne
ne 'none' ); 'none' );
} }
## kleine Hilfe für InternalTimer damit ich alle benötigten Variablen an die Funktion übergeben kann welche von Internal Timer aufgerufen wird. ## kleine Hilfe für InternalTimer damit ich alle benötigten Variablen an die Funktion übergeben kann welche von Internal Timer aufgerufen wird.
@ -5308,7 +5307,7 @@ sub setShadingStatus {
return return
if ( defined($value) if ( defined($value)
&& exists($self->{ $self->{shuttersDev} }{ShadingStatus}{VAL}) && exists( $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} )
&& $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} eq $value ); && $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} eq $value );
$self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} = $value $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} = $value
@ -5325,14 +5324,14 @@ sub setShadingLastStatus {
return return
if ( defined($value) if ( defined($value)
&& exists($self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL}) && exists( $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} )
&& $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} eq $value ); && $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} eq $value );
$self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} = $value $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} = $value
if ( defined($value) ); if ( defined($value) );
$self->{ $self->{shuttersDev} }{ShadingLastStatus}{TIME} = $self->{ $self->{shuttersDev} }{ShadingLastStatus}{TIME} =
int( gettimeofday() ) int( gettimeofday() )
if ( defined( $self->{ $self->{shuttersDev} }{ShadingLastStatus} ) ); if ( defined( $self->{ $self->{shuttersDev} }{ShadingLastStatus} ) );
$self->{ $self->{shuttersDev} }{ShadingManualDriveStatus}{VAL} = 0 $self->{ $self->{shuttersDev} }{ShadingManualDriveStatus}{VAL} = 0
if ( $value eq 'out' ); if ( $value eq 'out' );