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

fix bug then IsWe or IsWeTomorrow

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-28 08:39:52 +02:00
parent 368fb7faad
commit 7513c3470e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
73_AutoShuttersControl.pm
View File

@ -3130,8 +3130,7 @@ sub ShuttersSunrise($$) {
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if (
IsWe() int( gettimeofday() / 86400 ) == int(
and int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday ) / 86400 $shutters->getTimeUpWeHoliday ) / 86400
) )
@ -3146,11 +3145,12 @@ sub ShuttersSunrise($$) {
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpEarly ) / 86400 $shutters->getTimeUpEarly ) / 86400
) )
and $shutters->getSunrise
) )
{ {
$shuttersSunriseUnixtime = $shuttersSunriseUnixtime =
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday ); $shutters->getTimeUpEarly ) + 86400;
} }
else { else {
$shuttersSunriseUnixtime = $shuttersSunriseUnixtime =
@ -3182,6 +3182,17 @@ sub ShuttersSunrise($$) {
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpEarly ); $shutters->getTimeUpEarly );
} }
elsif (
int( gettimeofday() / 86400 ) != int(
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday ) / 86400
)
)
{
$shuttersSunriseUnixtime =
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday );
}
else { else {
$shuttersSunriseUnixtime = $shuttersSunriseUnixtime =
computeAlignTime( '24:00', computeAlignTime( '24:00',