FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: add additional condition for holidyweekend drive Time

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21451 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-03-19 12:21:51 +00:00
parent 208f7db14e
commit 6ef942e884
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 73_AutoShuttersControl: add additional condition
for holidyweekend drive Time
- feature: 98_RandomTimer: Add "variations" parameter to further randomize - feature: 98_RandomTimer: Add "variations" parameter to further randomize
possible switching times possible switching times
- feature: 77_SMAEM: add define option <interface> - feature: 77_SMAEM: add define option <interface>

16
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -3468,6 +3468,7 @@ sub _IsDay($) {
) )
and IsWe() and IsWe()
and $ascDev->getSunriseTimeWeHoliday eq 'on' and $ascDev->getSunriseTimeWeHoliday eq 'on'
and $shutters->getTimeUpWeHoliday ne '01:25'
) )
) )
and int( gettimeofday() / 86400 ) == int( and int( gettimeofday() / 86400 ) == int(
@ -3580,7 +3581,8 @@ sub ShuttersSunrise($$) {
if ( $tm eq 'unix' ) { if ( $tm eq 'unix' ) {
if ( $shutters->getUp eq 'astro' ) { if ( $shutters->getUp eq 'astro' ) {
if ( ( IsWe() or IsWeTomorrow() ) if ( ( IsWe() or IsWeTomorrow() )
and $ascDev->getSunriseTimeWeHoliday eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on'
and $shutters->getTimeUpWeHoliday ne '01:25' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if (
@ -3770,7 +3772,8 @@ 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 eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on'
and $shutters->getTimeUpWeHoliday ne '01:25' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if (
@ -3806,7 +3809,8 @@ sub ShuttersSunrise($$) {
} }
elsif ( $shutters->getUp eq 'time' ) { elsif ( $shutters->getUp eq 'time' ) {
if ( ( IsWe() or IsWeTomorrow() ) if ( ( IsWe() or IsWeTomorrow() )
and $ascDev->getSunriseTimeWeHoliday eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on'
and $shutters->getTimeUpWeHoliday ne '01:25' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( if (
@ -6205,7 +6209,7 @@ sub getTimeDownLate {
sub getTimeUpWeHoliday { sub getTimeUpWeHoliday {
my $self = shift; my $self = shift;
my $val = my $val =
AttrVal( $self->{shuttersDev}, 'ASC_Time_Up_WE_Holiday', '08:00' ); AttrVal( $self->{shuttersDev}, 'ASC_Time_Up_WE_Holiday', '01:25' );
if ( defined( FHEM::AutoShuttersControl::_perlCodeCheck($val) ) ) { if ( defined( FHEM::AutoShuttersControl::_perlCodeCheck($val) ) ) {
$val = FHEM::AutoShuttersControl::_perlCodeCheck($val); $val = FHEM::AutoShuttersControl::_perlCodeCheck($val);
@ -6214,7 +6218,7 @@ sub getTimeUpWeHoliday {
return ( return (
$val =~ /^(?:[01]?\d|2[0-3]):(?:[0-5]\d)(:(?:[0-5]\d))?$/ $val =~ /^(?:[01]?\d|2[0-3]):(?:[0-5]\d)(:(?:[0-5]\d))?$/
? $val ? $val
: '08:00' : '01:25'
); );
} }
@ -7909,7 +7913,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.18", "version": "v0.8.19",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],