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

new version

Browse Source
This commit is contained in:
Marko Oldenburg 2018-10-31 09:58:23 +01:00
parent 9b088082ca
commit 891d400477
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
73_AutoShuttersControl.pm
View File

@ -1363,9 +1363,10 @@ sub SunSetShuttersAfterTimerFn($) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
if ( $shutters->getModeDown eq $homemode if ( $shutters->getModeDown eq $homemode
or $homemode eq 'none' or $homemode eq 'none'
or $shutters->getModeDown eq 'always' ) { or $shutters->getModeDown eq 'always' )
{
$shutters->setLastDrive('night close'); $shutters->setLastDrive('night close');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
@ -1389,16 +1390,16 @@ sub SunRiseShuttersAfterTimerFn($) {
or $shutters->getModeUp eq 'always' ) or $shutters->getModeUp eq 'always' )
{ {
if ( if (
( (
$shutters->getRoommatesStatus eq 'home' $shutters->getRoommatesStatus eq 'home'
or $shutters->getRoommatesStatus eq 'awoken' or $shutters->getRoommatesStatus eq 'awoken'
or $shutters->getRoommatesStatus eq 'absent' or $shutters->getRoommatesStatus eq 'absent'
or $shutters->getRoommatesStatus eq 'gone' or $shutters->getRoommatesStatus eq 'gone'
or $shutters->getRoommatesStatus eq 'none' or $shutters->getRoommatesStatus eq 'none'
) )
and $ascDev->getSelfDefense eq 'off' and $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
) )
{ {
$shutters->setLastDrive('day open'); $shutters->setLastDrive('day open');
@ -1642,14 +1643,14 @@ sub ShuttersSunrise($$$) {
and $ascDev->getSunriseTimeWeHoliday eq 'on' ) and $ascDev->getSunriseTimeWeHoliday eq 'on' )
{ {
if ( not IsWeTomorrow() ) { if ( not IsWeTomorrow() ) {
if ( IsWe() if (
IsWe()
and int( gettimeofday() / 86400 ) == int( and int( gettimeofday() / 86400 ) == int(
( (
computeAlignTime( computeAlignTime(
'24:00', '24:00',
sunrise_abs( sunrise_abs(
$autoAstroMode, $autoAstroMode, 0,
0,
$shutters->getTimeUpWeHoliday $shutters->getTimeUpWeHoliday
) )
) + 1 ) + 1