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-04-25 21:34:46 +02:00
parent cae15e958b
commit 407cc28291
1 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
73_AutoShuttersControl.pm
View File

@ -716,16 +716,14 @@ sub UserAttributs_Readings_ForShutters($$) {
if ( ref($attribValue) ne 'ARRAY' ) { if ( ref($attribValue) ne 'ARRAY' ) {
$attr{$_}{ ( split( ':', $attrib ) )[0] } = $attribValue $attr{$_}{ ( split( ':', $attrib ) )[0] } = $attribValue
if ( if (
not not defined( $attr{$_}{ ( split( ':', $attrib ) )[0] } )
defined( $attr{$_}{ ( split( ':', $attrib ) )[0] } )
and $attribValue ne '-' ); and $attribValue ne '-' );
} }
else { else {
$attr{$_}{ ( split( ':', $attrib ) )[0] } = $attr{$_}{ ( split( ':', $attrib ) )[0] } =
$attribValue->[ AttrVal( $_, 'ASC', 2 ) ] $attribValue->[ AttrVal( $_, 'ASC', 2 ) ]
if ( if (
not not defined( $attr{$_}{ ( split( ':', $attrib ) )[0] } )
defined( $attr{$_}{ ( split( ':', $attrib ) )[0] } )
and $attrib eq 'ASC_Pos_Reading' ); and $attrib eq 'ASC_Pos_Reading' );
} }
} }
@ -1227,8 +1225,7 @@ sub EventProcessingWind($@) {
. ' WindMin1: ' . ' WindMin1: '
. $shutters->getWindMin . $shutters->getWindMin
. ' Bekommender Wert1: ' . ' Bekommender Wert1: '
. $1 . $1 );
);
$shutters->setWindProtection('unprotection') $shutters->setWindProtection('unprotection')
if ( not defined( $shutters->getWindProtection ) if ( not defined( $shutters->getWindProtection )
@ -1262,8 +1259,7 @@ sub EventProcessingWind($@) {
. ' WindMin2: ' . ' WindMin2: '
. $shutters->getWindMin . $shutters->getWindMin
. ' Bekommender Wert2: ' . ' Bekommender Wert2: '
. $1 . $1 );
);
} }
} }
} }
@ -1843,7 +1839,7 @@ sub ShadingProcessing($@) {
} }
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - Shading Processing - In der Routine zum fahren der Rollläden, Shading Wert: " "AutoShuttersControl ($name) - Shading Processing - In der Routine zum fahren der Rollläden, Shading Wert: "
. $shutters->getShadingStatus ); . $shutters->getShadingStatus );
ASC_Debug( ASC_Debug(
@ -1912,7 +1908,8 @@ sub EventProcessingShutters($@) {
if ( $events =~ m#.*:\s(\d+)# ) { if ( $events =~ m#.*:\s(\d+)# ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
$ascDev->setPosReading; $ascDev->setPosReading;
if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) > $shutters->getDriveUpMaxDuration if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) >
$shutters->getDriveUpMaxDuration
and $shutters->getLastPos != $shutters->getStatus ) and $shutters->getLastPos != $shutters->getStatus )
{ {
$shutters->setLastDrive('manual'); $shutters->setLastDrive('manual');
@ -2454,7 +2451,8 @@ sub AutoSearchTwilightDev($) {
sub GetAttrValues($@) { sub GetAttrValues($@) {
my ( $dev, $attribut, $default ) = @_; my ( $dev, $attribut, $default ) = @_;
my @values = split( ' ', AttrVal( $dev, $attribut, (defined($default) ? $default : 'none') ) ); my @values = split( ' ',
AttrVal( $dev, $attribut, ( defined($default) ? $default : 'none' ) ) );
my ( $value1, $value2 ) = split( ':', $values[0] ); my ( $value1, $value2 ) = split( ':', $values[0] );
my ( $value3, $value4 ) = split( ':', $values[1] ) my ( $value3, $value4 ) = split( ':', $values[1] )
if ( defined( $values[1] ) ); if ( defined( $values[1] ) );
@ -3633,7 +3631,9 @@ sub getASC {
sub getAntiFreezePos { sub getAntiFreezePos {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Antifreeze_Pos', $userAttrList{ASC_Antifreeze_Pos}[AttrVal( $self->{shuttersDev}, 'ASC', 2 )] ); return AttrVal( $self->{shuttersDev}, 'ASC_Antifreeze_Pos',
$userAttrList{ASC_Antifreeze_Pos}
[ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] );
} }
sub getShuttersPlace { sub getShuttersPlace {
@ -3671,7 +3671,9 @@ sub getWiggleValue {
sub getShadingPos { sub getShadingPos {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Pos', $userAttrList{'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100'}[AttrVal( $self->{shuttersDev}, 'ASC', 2 )] ); return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Pos',
$userAttrList{'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100'}
[ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] );
} }
sub getShadingMode { sub getShadingMode {
@ -3836,19 +3838,25 @@ sub getPosCmd {
sub getOpenPos { sub getOpenPos {
my $self = shift; my $self = shift;
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 )] ); 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 ) ] );
} }
sub getVentilatePos { sub getVentilatePos {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Ventilate_Pos', $userAttrList{'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100'}[AttrVal( $self->{shuttersDev}, 'ASC', 2 )] ); return AttrVal( $self->{shuttersDev}, 'ASC_Ventilate_Pos',
$userAttrList{'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100'}
[ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] );
} }
sub getClosedPos { sub getClosedPos {
my $self = shift; my $self = shift;
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 )] ); 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 ) ] );
} }
sub getVentilateOpen { sub getVentilateOpen {
@ -3860,7 +3868,9 @@ sub getVentilateOpen {
sub getComfortOpenPos { sub getComfortOpenPos {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_ComfortOpen_Pos', $userAttrList{'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100'}[AttrVal( $self->{shuttersDev}, 'ASC', 2 )] ); return AttrVal( $self->{shuttersDev}, 'ASC_ComfortOpen_Pos',
$userAttrList{'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100'}
[ AttrVal( $self->{shuttersDev}, 'ASC', 2 ) ] );
} }
sub getPartyMode { sub getPartyMode {
@ -3922,7 +3932,8 @@ sub getWindMax {
# max:hyst pos # max:hyst pos
$self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{triggermax} = $max; $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{triggermax} = $max;
$self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{triggerhyst} = $hyst; $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{triggerhyst} =
$hyst;
$self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{closedPos} = $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{closedPos} =
( $pos ne 'none' ? $pos : $shutters->getOpenPos ); ( $pos ne 'none' ? $pos : $shutters->getOpenPos );
@ -3980,15 +3991,13 @@ sub getAntiFreeze {
sub getAutoAstroModeMorning { sub getAutoAstroModeMorning {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_AutoAstroModeMorning', return AttrVal( $self->{shuttersDev}, 'ASC_AutoAstroModeMorning', 'none' );
'none' );
} }
sub getAutoAstroModeEvening { sub getAutoAstroModeEvening {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_AutoAstroModeEvening', return AttrVal( $self->{shuttersDev}, 'ASC_AutoAstroModeEvening', 'none' );
'none' );
} }
sub getAutoAstroModeMorningHorizon { sub getAutoAstroModeMorningHorizon {
@ -4044,8 +4053,7 @@ sub getTimeDownLate {
sub getTimeUpWeHoliday { sub getTimeUpWeHoliday {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Time_Up_WE_Holiday', return AttrVal( $self->{shuttersDev}, 'ASC_Time_Up_WE_Holiday', '08:00' );
'08:00' );
} }
sub getBrightnessMinVal { sub getBrightnessMinVal {
@ -4089,7 +4097,7 @@ sub getBrightnessMaxVal {
sub getDriveUpMaxDuration { sub getDriveUpMaxDuration {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_DriveUpMaxDuration',60 ); return AttrVal( $self->{shuttersDev}, 'ASC_DriveUpMaxDuration', 60 );
} }
## Subklasse Readings von ASC_Shutters ## ## Subklasse Readings von ASC_Shutters ##