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

after merge conflict

Browse Source
This commit is contained in:
Marko Oldenburg
2018-12-07 20:01:57 +01:00
parent c7181f449f 7c889d7885
commit c39f0b6d78
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
73_AutoShuttersControl.pm
View File

@ -41,7 +41,7 @@ package main;
use strict;
use warnings;
my $version = '0.2.1.42';
my $version = '0.2.1.44';
sub AutoShuttersControl_Initialize($) {
my ($hash) = @_;
@ -174,7 +174,7 @@ my %userAttrList = (
'ASC_Brightness_Reading' => 'brightness',
'ASC_Shading_Direction' => 180,
'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 80, 20 ],
'ASC_Shading_Mode:on,off,home,absent' => 'off',
'ASC_Shading_Mode:absent,always,off,home' => 'off',
'ASC_Shading_Angle_Left' => 75,
'ASC_Shading_Angle_Right' => 75,
'ASC_Shading_StateChange_Sunny' => 35000,
@ -182,7 +182,6 @@ my %userAttrList = (
'ASC_Shading_Min_Elevation' => 25.0,
'ASC_Shading_Min_OutsideTemperature' => 18,
'ASC_Shading_WaitingPeriod' => 1200,
# 'ASC_Shading_Fast_Open:on,off' => 'none',
# 'ASC_Shading_Fast_Close:on,off' => 'none',
'ASC_Drive_Offset' => -1,
@ -1279,13 +1278,10 @@ sub EventProcessingShadingBrightness($@) {
$shutters->getDirection, $shutters->getShadingAngleLeft,
$shutters->getShadingAngleRight
)
if (
(
$shutters->getShadingMode eq 'on'
or $shutters->getShadingMode eq $homemode
)
and IsDay( $hash, $shuttersDev )
);
if ( ( $shutters->getShadingMode eq 'always'
or $shutters->getShadingMode eq $homemode)
and IsDay( $hash, $shuttersDev ) );
}
}
@ -1331,7 +1327,7 @@ sub EventProcessingTwilightDevice($@) {
)
if (
(
$shutters->getShadingMode eq 'on'
$shutters->getShadingMode eq 'always'
or $shutters->getShadingMode eq $homemode
)
and IsDay( $hash, $shuttersDev )