mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

73_AutoShuttersControl: Checkin last stable version

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23934 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
CoolTux
2021-03-12 12:19:50 +00:00
parent ceecb246e9
commit ac5275172f
3 changed files with 9 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/73_AutoShuttersControl.pm
View File

@@ -1265,7 +1265,7 @@ sub Initialize {
],
"release_status": "testing",
"license": "GPL_2",
"version": "v0.10.11",
"version": "v0.10.12",
"author": [
"Marko Oldenburg <leongaultier@gmail.com>"
],

129
fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm
View File

@@ -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;

9
fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm
View File

@@ -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' ) )