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

bugfix in IsDayFn and add more Debug Messages

Browse Source
This commit is contained in:
Marko Oldenburg 2019-04-23 12:33:01 +02:00
parent 1e7c01739a
commit 5b9e769648
1 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
73_AutoShuttersControl.pm
View File

@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.5.99.2'; my $version = '0.5.99.3';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -2481,20 +2481,52 @@ sub IsDay($) {
ShuttersSunset( $shuttersDev, 'unix' ) ? 1 : 0 ); ShuttersSunset( $shuttersDev, 'unix' ) ? 1 : 0 );
my $respIsDay = $isday; my $respIsDay = $isday;
$respIsDay = (
( ASC_Debug( 'FnIsDay: '
( . $shuttersDev
$shutters->getBrightness > $shutters->getBrightnessMinVal . ' Allgemein: '
and $isday . $respIsDay );
)
or $shutters->getSunset if ( $shutters->getDown eq 'brightness'
) ? 0 : 1 or $shutters->getUp eq 'brightness' )
) if ( $shutters->getDown eq 'brightness' ); {
my $brightnessMinVal;
if ( $shutters->getBrightnessMinVal > -1 ) {
$brightnessMinVal = $shutters->getBrightnessMinVal;
}
else {
$brightnessMinVal = $ascDev->getBrightnessMinVal;
}
my $brightnessMaxVal;
if ( $shutters->getBrightnessMaxVal > -1 ) {
$brightnessMaxVal = $shutters->getBrightnessMaxVal;
}
else {
$brightnessMaxVal = $ascDev->getBrightnessMaxVal;
}
$respIsDay = ( $respIsDay = (
( (
( (
$shutters->getBrightness > $shutters->getBrightnessMaxVal $shutters->getBrightness > $brightnessMinVal
and $isday
)
or $shutters->getSunset
) ? 1 : 0
) if ( $shutters->getDown eq 'brightness' );
ASC_Debug( 'FnIsDay: '
. $shuttersDev
. ' getDownBrightness: ' . $respIsDay
. ' Brightness: ' . $shutters->getBrightness
. ' BrightnessMin: ' . $brightnessMinVal
. ' Sunset: ' . $shutters->getSunset );
$respIsDay = (
(
(
$shutters->getBrightness > $brightnessMaxVal
and not $isday and not $isday
) )
or $respIsDay or $respIsDay
@ -2502,6 +2534,14 @@ sub IsDay($) {
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getUp eq 'brightness' ); ) if ( $shutters->getUp eq 'brightness' );
ASC_Debug( 'FnIsDay: '
. $shuttersDev
. ' getUpBrightness: ' . $respIsDay
. ' Brightness: ' . $shutters->getBrightness
. ' BrightnessMax: ' . $brightnessMaxVal
. ' Sunset: ' . $shutters->getSunrise );
}
return $respIsDay; return $respIsDay;
} }