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 2019-11-07 14:06:47 +01:00
parent 2f41ead59d
commit 47e64de57d
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
73_AutoShuttersControl.pm
View File

@ -2860,7 +2860,7 @@ sub RenewSunRiseSetShuttersTimer($) {
AttrVal( $name, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne AttrVal( $name, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne
'none' ); 'none' );
delFromDevAttrList( $name, 'ASC_PrivacyDownTime_beforNightClose' ); delFromDevAttrList( $name, 'ASC_PrivacyDownTime_beforNightClose' );
delFromDevAttrList( $name, 'ASC_ExternalTriggerDevice' ); delFromDevAttrList( $name, 'ASC_ExternalTriggerDevice' );
} }
} }
@ -5482,8 +5482,7 @@ sub getShadingWaitingPeriod {
sub getExternalTriggerDevice { sub getExternalTriggerDevice {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{device}
->{device}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
@ -5493,8 +5492,8 @@ sub getExternalTriggerDevice {
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{LASTGETTIME} =
= int( gettimeofday() ); int( gettimeofday() );
my ( $device, $reading, $valueActive, $valueInactive, $posActive, my ( $device, $reading, $valueActive, $valueInactive, $posActive,
$posInactive ) $posInactive )
= FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev}, = FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev},
@ -5507,25 +5506,23 @@ sub getExternalTriggerDevice {
$device; $device;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{reading} = $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{reading} =
$reading; $reading;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{valueactive} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{valueactive} =
= $valueActive; $valueActive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{valueinactive} =
->{valueinactive} = $valueInactive; $valueInactive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posactive} = $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posactive} =
$posActive; $posActive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posinactive} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posinactive} =
= ( $posInactive ne 'none' ? $posInactive : $shutters->getLastPos ); ( $posInactive ne 'none' ? $posInactive : $shutters->getLastPos );
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{device};
->{device};
} }
sub getExternalTriggerReading { sub getExternalTriggerReading {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{reading}
->{reading}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
@ -5537,15 +5534,13 @@ sub getExternalTriggerReading {
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{reading};
->{reading};
} }
sub getExternalTriggerValueActive { sub getExternalTriggerValueActive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{valueactive}
->{valueactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
@ -5584,8 +5579,7 @@ sub getExternalTriggerValueInactive {
sub getExternalTriggerPosActive { sub getExternalTriggerPosActive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posactive}
->{posactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
@ -5597,15 +5591,13 @@ sub getExternalTriggerPosActive {
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posactive};
->{posactive};
} }
sub getExternalTriggerPosInactive { sub getExternalTriggerPosInactive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posinactive}
->{posinactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}