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

fix IsDay and IsWe at new time calculation

Browse Source
This commit is contained in:
Marko Oldenburg
2018-10-31 09:55:49 +01:00
parent c92e592270
commit 9b088082ca
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
73_AutoShuttersControl.pm
View File

@ -38,7 +38,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = "0.1.85"; my $version = "0.1.86";
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -1639,10 +1639,35 @@ sub ShuttersSunrise($$$) {
if ( $tm eq 'unix' ) { if ( $tm eq 'unix' ) {
if ( $shutters->getUpMode eq 'astro' ) { if ( $shutters->getUpMode eq 'astro' ) {
if ( ( IsWe() or IsWeTomorrow() ) if ( ( IsWe() or IsWeTomorrow() )
and $ascDev->getSunriseTimeWeHoliday($name) eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if ( IsWe()
and int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
sunrise_abs(
$autoAstroMode,
0,
$shutters->getTimeUpWeHoliday
)
) + 1
) / 86400
)
)
{
$shuttersSunriseUnixtime = (
computeAlignTime(
'24:00',
sunrise_abs(
$autoAstroMode, 0,
$shutters->getTimeUpWeHoliday
)
) + 1
);
}
elsif (
int( gettimeofday() / 86400 ) == int( int( gettimeofday() / 86400 ) == int(
( (
computeAlignTime( computeAlignTime(
@ -1710,7 +1735,7 @@ sub ShuttersSunrise($$$) {
if ( defined($oldFuncHash) if ( defined($oldFuncHash)
and ref($oldFuncHash) eq 'HASH' and ref($oldFuncHash) eq 'HASH'
and ( IsWe() or IsWeTomorrow() ) and ( IsWe() or IsWeTomorrow() )
and $ascDev->getSunriseTimeWeHoliday($name) eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if (