merge Packport from master branch
This commit is contained in:
parent
8fc9bca4c0
commit
1c321ed9d3
@ -41,7 +41,7 @@ package main;
|
|||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
my $version = "0.2.0.6";
|
my $version = "0.2.1dev29";
|
||||||
|
|
||||||
sub AutoShuttersControl_Initialize($) {
|
sub AutoShuttersControl_Initialize($) {
|
||||||
my ($hash) = @_;
|
my ($hash) = @_;
|
||||||
@ -168,15 +168,15 @@ my %userAttrList = (
|
|||||||
'ASC_LockOut:soft,hard,off' => 'off',
|
'ASC_LockOut:soft,hard,off' => 'off',
|
||||||
'ASC_LockOut_Cmd:inhibit,blocked' => 'none',
|
'ASC_LockOut_Cmd:inhibit,blocked' => 'none',
|
||||||
|
|
||||||
# 'ASC_Shading_Direction' => 178,
|
'ASC_Shading_Direction' => 178,
|
||||||
# 'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ],
|
'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ],
|
||||||
# 'ASC_Shading_Mode:on,off,home,absent' => 'off',
|
'ASC_Shading_Mode:on,off,home,absent' => 'off',
|
||||||
# 'ASC_Shading_Angle_Left:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90'
|
'ASC_Shading_Angle_Left:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90'
|
||||||
# => 85,
|
=> 85,
|
||||||
# 'ASC_Shading_Angle_Right:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90'
|
'ASC_Shading_Angle_Right:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90'
|
||||||
# => 85,
|
=> 85,
|
||||||
# 'ASC_Shading_Brightness_Sensor' => 'none',
|
'ASC_Shading_Brightness_Sensor' => 'none',
|
||||||
# 'ASC_Shading_Brightness_Reading' => 'brightness',
|
'ASC_Shading_Brightness_Reading' => 'brightness',
|
||||||
#
|
#
|
||||||
# 'ASC_Shading_StateChange_Sunny' => '6000',
|
# 'ASC_Shading_StateChange_Sunny' => '6000',
|
||||||
# 'ASC_Shading_StateChange_Cloudy' => '4000',
|
# 'ASC_Shading_StateChange_Cloudy' => '4000',
|
||||||
@ -1284,25 +1284,25 @@ sub ShadingProcessing($@) {
|
|||||||
my ($hash,$shuttersDev,$azimuth,$elevation,$brightness,$outTemp,$shuttersDirection,$shuttersShadingAngleLeft,$shuttersShadingAngleRight) = @_;
|
my ($hash,$shuttersDev,$azimuth,$elevation,$brightness,$outTemp,$shuttersDirection,$shuttersShadingAngleLeft,$shuttersShadingAngleRight) = @_;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
# Log3( $name, 1,
|
Log3( $name, 1,
|
||||||
# "AutoShuttersControl ($name) - Shading Processing, Rollladen: " . $shuttersDev . " Azimuth: " . $azimuth . " Elevation: " . $elevation . " Brightness: " . $brightness . " OutTemp: " . $outTemp
|
"AutoShuttersControl ($name) - Shading Processing, Rollladen: " . $shuttersDev . " Azimuth: " . $azimuth . " Elevation: " . $elevation . " Brightness: " . $brightness . " OutTemp: " . $outTemp
|
||||||
# );
|
);
|
||||||
#
|
|
||||||
# return
|
return
|
||||||
# if ( $azimuth == -1 or $elevation == -1 or $brightness == -1 or $outTemp == -100 );
|
if ( $azimuth == -1 or $elevation == -1 or $brightness == -1 or $outTemp == -100 );
|
||||||
#
|
|
||||||
#
|
|
||||||
# # brightness -1
|
# brightness -1
|
||||||
# # outTemp -100
|
# outTemp -100
|
||||||
# # azimuth -1
|
# azimuth -1
|
||||||
# # elevation -1
|
# elevation -1
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Log3( $name, 1,
|
Log3( $name, 1,
|
||||||
# "AutoShuttersControl ($name) - Shading Processing hinter dem return");
|
"AutoShuttersControl ($name) - Shading Processing hinter dem return");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user