fix night detection

This commit is contained in:
Marko Oldenburg 2020-05-15 11:01:25 +02:00
parent 806074325f
commit c1a4c5a470

View File

@ -3684,7 +3684,7 @@ sub _IsDay {
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getDown eq 'brightness' ); ) if ( $shutters->getDown eq 'brightness' );
ASC_Debug( 'FnIsDay: ' ASC_Debug( 'FnIsDay nach Sonnenuntergang / Abends: '
. $shuttersDev . $shuttersDev
. ' getDownBrightness: ' . ' getDownBrightness: '
. $respIsDay . $respIsDay
@ -3693,7 +3693,9 @@ sub _IsDay {
. ' BrightnessMin: ' . ' BrightnessMin: '
. $brightnessMinVal . $brightnessMinVal
. ' Sunset: ' . ' Sunset: '
. $shutters->getSunset ); . $shutters->getSunset
. ' isday: '
. $isday );
##### Nach Sonnenauf / Morgens ##### Nach Sonnenauf / Morgens
$respIsDay = ( $respIsDay = (
@ -3701,14 +3703,14 @@ sub _IsDay {
( (
$shutters->getBrightness > $brightnessMaxVal $shutters->getBrightness > $brightnessMaxVal
&& !$isday && !$isday
&& !$shutters->getSunrise && $shutters->getSunrise
) )
|| $respIsDay || $respIsDay
|| $shutters->getSunrise || $shutters->getSunrise
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getUp eq 'brightness' ); ) if ( $shutters->getUp eq 'brightness' );
ASC_Debug( 'FnIsDay: ' ASC_Debug( 'FnIsDay nach Sonnenaufgang / Morgens: '
. $shuttersDev . $shuttersDev
. ' getUpBrightness: ' . ' getUpBrightness: '
. $respIsDay . $respIsDay
@ -3717,7 +3719,9 @@ sub _IsDay {
. ' BrightnessMax: ' . ' BrightnessMax: '
. $brightnessMaxVal . $brightnessMaxVal
. ' Sunrise: ' . ' Sunrise: '
. $shutters->getSunrise ); . $shutters->getSunrise
. ' isday: '
. $isday );
} }
return $respIsDay; return $respIsDay;
@ -8415,7 +8419,7 @@ sub getBlockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.28", "version": "v0.8.29",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],