Merge branch 'master' into devel

This commit is contained in:
Marko Oldenburg 2019-01-01 18:56:20 +01:00
commit b50a8cf464

View File

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