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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Marko Oldenburg
2019-01-01 18:56:20 +01:00
parent d39d9725cd 3ee81ecc7c
commit b50a8cf464
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
73_AutoShuttersControl.pm
View File

@ -1144,6 +1144,14 @@ sub EventProcessingBrightness($@) {
else { else {
$brightnessMinVal = $ascDev->getBrightnessMinVal; $brightnessMinVal = $ascDev->getBrightnessMinVal;
} }
my $brightnessMaxVal;
if ( $shutters->getBrightnessMaxVal > -1 ) {
$brightnessMaxVal = $shutters->getBrightnessMaxVal;
}
else {
$brightnessMaxVal = $ascDev->getBrightnessMaxVal;
}
if ( if (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
@ -1152,7 +1160,7 @@ sub EventProcessingBrightness($@) {
and int( gettimeofday() / 86400 ) == int( and int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400 computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400
) )
and $1 > $brightnessMinVal and $1 > $brightnessMaxVal
and $shutters->getUp eq 'brightness' and $shutters->getUp eq 'brightness'
) )
{ {
@ -1162,7 +1170,7 @@ sub EventProcessingBrightness($@) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus $homemode = $ascDev->getResidentsStatus
if ( $homemode eq 'none' ); if ( $homemode eq 'none' );
$shutters->setLastDrive('minimum brightness threshold exceeded'); $shutters->setLastDrive('maximum brightness threshold exceeded');
if ( $shutters->getModeUp eq $homemode if ( $shutters->getModeUp eq $homemode
or $homemode eq 'none' or $homemode eq 'none'