add selection Adv Date, FirstAdvent or DeadSunday

This commit is contained in:
2020-11-20 11:16:20 +01:00
parent 98529d3c15
commit 07c4755845
4 changed files with 19 additions and 6 deletions

View File

@ -392,6 +392,14 @@ sub getBlockAscDrivesAfterManual {
return AttrVal( $name, 'ASC_blockAscDrivesAfterManual', 0 );
}
sub getAdvDate {
my $self = shift;
my $name = $self->{name};
return AttrVal( $name, 'ASC_advDate', 'FirstAdvent' );
}

View File

@ -1173,7 +1173,11 @@ sub IsAdv {
my $time = HTTP::Date::str2time( $year . '-12-25' );
my $wday = ( localtime($time) )[6];
$wday = $wday ? $wday : 7;
$time -= ( $wday + 21 ) * 86400;
$time -= ( $FHEM::Automation::ShuttersControl::ascDev
->getAdvDate eq 'DeadSunday'
? ($wday + 27) * 86400
: ($wday + 21) * 86400
);
$adv = 1 if ( $time < time );
}