diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 6378d116d..471608c7d 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -1265,7 +1265,7 @@ sub Initialize { ], "release_status": "testing", "license": "GPL_2", - "version": "v0.10.11", + "version": "v0.10.12", "author": [ "Marko Oldenburg " ], diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm b/fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm index 6d0249671..ce9c2a411 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm @@ -806,132 +806,9 @@ sub ShuttersSunrise { elsif ( $FHEM::Automation::ShuttersControl::shutters->getUp eq 'brightness' ) { - if ( ( IsWe() || IsWe('tomorrow') ) - && $FHEM::Automation::ShuttersControl::ascDev - ->getSunriseTimeWeHoliday eq 'on' - && $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday ne '01:25' ) - { - if ( !IsWe('tomorrow') ) { - if ( - IsWe() - && int( gettimeofday() / 86400 ) == int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ) - ) / 86400 - ) - ) - { - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday ); - } - elsif ( - int( gettimeofday() / 86400 ) == int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpLate - ) - ) / 86400 - ) - ) - { - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday ); - } - else { - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpLate ); - } - } - else { - if ( - IsWe() - && ( - int( gettimeofday() / 86400 ) == int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ) - ) / 86400 - ) - || int( gettimeofday() / 86400 ) != int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ) - ) / 86400 - ) - ) - ) - { - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday ); - } - elsif ( - int( gettimeofday() / 86400 ) == int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpLate - ) - ) / 86400 - ) - ) - { - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpLate ); - } - else { - if ( - int( gettimeofday() / 86400 ) == int( - ( - computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ) - ) / 86400 - ) - ) - { - $shuttersSunriseUnixtime = computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ); - } - else { - $shuttersSunriseUnixtime = computeAlignTime( - '24:00', - $FHEM::Automation::ShuttersControl::shutters - ->getTimeUpWeHoliday - ); - } - } - } - } - else { - - $shuttersSunriseUnixtime = computeAlignTime( '24:00', - $FHEM::Automation::ShuttersControl::shutters->getTimeUpLate - ); - } + $shuttersSunriseUnixtime = computeAlignTime( '24:00', + $FHEM::Automation::ShuttersControl::shutters->getTimeUpLate + ); } return $shuttersSunriseUnixtime; diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm b/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm index 3938a090d..a4f242086 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm @@ -878,10 +878,11 @@ sub setShadingStatus { my $self = shift; my $value = shift; ### Werte für value = in, out, in reserved, out reserved - return - if ( defined($value) - && exists( $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} ) - && $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} eq $value ); +# Es wird durch das return die ShadingWaitingTime nicht mehr beachtet, Bugmeldung von Bernd Griemsmann +# return +# if ( defined($value) +# && exists( $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} ) +# && $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} eq $value ); $FHEM::Automation::ShuttersControl::shutters->setShadingLastStatus( ( $value eq 'in' ? 'out' : 'in' ) )