diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm index abff63f..b645995 100644 --- a/73_AutoShuttersControl.pm +++ b/73_AutoShuttersControl.pm @@ -4980,22 +4980,24 @@ sub getPosCmd { sub getOpenPos { my $self = shift; - my $val = AttrVal( $self->{shuttersDev}, 'ASC_Open_Pos', +# my $val = + + return AttrVal( $self->{shuttersDev}, 'ASC_Open_Pos', $userAttrList{'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100'} [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); - if ( FHEM::AutoShuttersControl::_perlCodeCheck( $val, 'none' ) ) { - $val = FHEM::AutoShuttersControl::_perlCodeCheck( $val, - $userAttrList{'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100'} - [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); - } - - return ( - $val =~ /^\d+(\.\d+)?$/ - ? $val - : $userAttrList{'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100'} - [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] - ); +# if ( FHEM::AutoShuttersControl::_perlCodeCheck( $val, 'none' ) ) { +# $val = FHEM::AutoShuttersControl::_perlCodeCheck( $val, +# $userAttrList{'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100'} +# [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); +# } +# +# return ( +# $val =~ /^\d+(\.\d+)?$/ +# ? $val +# : $userAttrList{'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100'} +# [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] +# ); } sub getVentilatePos { @@ -5027,22 +5029,24 @@ sub getVentilatePosAfterDayClosed { sub getClosedPos { my $self = shift; - my $val = AttrVal( $self->{shuttersDev}, 'ASC_Closed_Pos', +# my $val = + + return AttrVal( $self->{shuttersDev}, 'ASC_Closed_Pos', $userAttrList{'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100'} [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); - if ( FHEM::AutoShuttersControl::_perlCodeCheck( $val, 'none' ) ) { - $val = FHEM::AutoShuttersControl::_perlCodeCheck( $val, - $userAttrList{'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100'} - [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); - } - - return ( - $val =~ /^\d+(\.\d+)?$/ - ? $val - : $userAttrList{'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100'} - [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] - ); +# if ( FHEM::AutoShuttersControl::_perlCodeCheck( $val, 'none' ) ) { +# $val = FHEM::AutoShuttersControl::_perlCodeCheck( $val, +# $userAttrList{'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100'} +# [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] ); +# } +# +# return ( +# $val =~ /^\d+(\.\d+)?$/ +# ? $val +# : $userAttrList{'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100'} +# [ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] +# ); } sub getSleepPos { @@ -6818,8 +6822,8 @@ sub getblockAscDrivesAfterManual {