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

fix little typo bug in code

Browse Source
This commit is contained in:
Marko Oldenburg 2019-06-10 14:03:03 +02:00
parent 62ca4ead34
commit 0aa3b79a4b
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
73_AutoShuttersControl.pm
View File

@ -2038,14 +2038,14 @@ sub ShadingProcessingDriveCommand($$) {
if ( $shutters->getShadingStatus eq 'in' if ( $shutters->getShadingStatus eq 'in'
and $getShadingPos != $getStatus ) and $getShadingPos != $getStatus )
{ {
# my $queryShuttersShadingPos = ( # my $queryShuttersShadingPos = (
# $shutters->getShuttersPosCmdValueNegate # $shutters->getShuttersPosCmdValueNegate
# ? $getStatus > $getShadingPos # ? $getStatus > $getShadingPos
# : $getStatus < $getShadingPos # : $getStatus < $getShadingPos
# ); # );
if ( if (
not $shutters->getQueryShuttersPos($shutters->getShadingPos); not $shutters->getQueryShuttersPos( $shutters->getShadingPos )
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
) )
@ -2395,10 +2395,10 @@ sub RenewSunRiseSetShuttersTimer($) {
# delFromDevAttrList( $_, 'ASC_BrightnessMaxVal' ) # delFromDevAttrList( $_, 'ASC_BrightnessMaxVal' )
# ; # temporär muss später gelöscht werden ab Version 0.4.11beta9 # ; # temporär muss später gelöscht werden ab Version 0.4.11beta9
$attr{$_}{'ASC_Shading_MinMax_Elevation'} = $attr{$_}{'ASC_Shading_MinMax_Elevation'} =
AttrVal( $_, 'ASC_Shading_Min_Elevation', 'none' ) AttrVal( $_, 'ASC_Shading_Min_Elevation', 'none' )
if ( AttrVal( $_, 'ASC_Shading_Min_Elevation', 'none' ) ne 'none' ); if ( AttrVal( $_, 'ASC_Shading_Min_Elevation', 'none' ) ne 'none' );
delFromDevAttrList( $_, 'ASC_Shading_Min_Elevation') delFromDevAttrList( $_, 'ASC_Shading_Min_Elevation' )
; # temporär muss später gelöscht werden ab Version 0.6.17 ; # temporär muss später gelöscht werden ab Version 0.6.17
} }
} }
@ -2484,14 +2484,15 @@ sub SunSetShuttersAfterTimerFn($) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
if ( $ascDev->getAutoShuttersControlEvening eq 'on' if (
and IsAfterShuttersManualBlocking($shuttersDev) $ascDev->getAutoShuttersControlEvening eq 'on'
and ( and IsAfterShuttersManualBlocking($shuttersDev)
and (
$shutters->getModeDown eq $homemode $shutters->getModeDown eq $homemode
or ( $shutters->getModeDown eq 'absent' or ( $shutters->getModeDown eq 'absent'
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeDown eq 'always' or $shutters->getModeDown eq 'always'
) )
) )
{ {
# my $queryShuttersPosPrivacyDown = ( # my $queryShuttersPosPrivacyDown = (
@ -2530,13 +2531,17 @@ sub SunRiseShuttersAfterTimerFn($) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
if ( $ascDev->getAutoShuttersControlMorning eq 'on' if (
and ( $shutters->getModeUp eq $homemode $ascDev->getAutoShuttersControlMorning eq 'on'
or ( $shutters->getModeUp eq 'absent' and (
and $homemode eq 'gone' ) $shutters->getModeUp eq $homemode
or $shutters->getModeUp eq 'always' ) or ( $shutters->getModeUp eq 'absent'
and $homemode eq 'gone' )
or $shutters->getModeUp eq 'always'
)
) )
{ {
if ( if (
( (
$shutters->getRoommatesStatus eq 'home' $shutters->getRoommatesStatus eq 'home'
@ -4160,7 +4165,8 @@ sub getShadingMinOutsideTemperature {
sub getShadingMinElevation { sub getShadingMinElevation {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{minVal} return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{minVal}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation} $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
@ -4170,8 +4176,8 @@ sub getShadingMinElevation {
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation} $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
int( gettimeofday() ); ->{LASTGETTIME} = int( gettimeofday() );
my ( $min, $max ) = my ( $min, $max ) =
FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev},
'ASC_Shading_MinMax_Elevation', '25.0:100.0' ); 'ASC_Shading_MinMax_Elevation', '25.0:100.0' );
@ -4179,16 +4185,20 @@ sub getShadingMinElevation {
### erwartetes Ergebnis ### erwartetes Ergebnis
# MIN:MAX # MIN:MAX
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{minVal} = $min; $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{minVal} =
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{maxVal} = $max; $min;
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{maxVal} =
$max;
return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{minVal}; return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{minVal};
} }
sub getShadingMaxElevation { sub getShadingMaxElevation {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{maxVal} return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{maxVal}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation} $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
@ -4200,7 +4210,8 @@ sub getShadingMaxElevation {
); );
$shutters->getShadingMinElevation; $shutters->getShadingMinElevation;
return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}->{maxVal}; return $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{maxVal};
} }
sub getShadingStateChangeSunny { sub getShadingStateChangeSunny {