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

fixes: #17

Browse Source
This commit is contained in:
Marko Oldenburg 2020-06-02 11:13:54 +02:00
parent 0fa7dc308c
commit 29e35be498
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
73_AutoShuttersControl.pm
View File

@ -1542,6 +1542,12 @@ sub EventProcessingResidents {
&& $shutters->getSelfDefenseMode ne 'off' && $shutters->getSelfDefenseMode ne 'off'
|| ( $getModeDown eq 'absent' || ( $getModeDown eq 'absent'
|| $getModeDown eq 'always' ) || $getModeDown eq 'always' )
|| ( $shutters->getShadingMode eq 'absent'
&& $shutters->getRoommatesStatus eq 'none'
)
|| ( $shutters->getShadingMode eq 'home'
&& $shutters->getRoommatesStatus eq 'none'
)
) )
{ {
if ( if (
@ -1561,6 +1567,29 @@ sub EventProcessingResidents {
$shutters->setSelfDefenseState(1); $shutters->setSelfDefenseState(1);
$shutters->setDriveCmd( $shutters->getClosedPos ); $shutters->setDriveCmd( $shutters->getClosedPos );
} }
elsif ( $shutters->getIsDay
&& $shutters->getIfInShading
&& $shutters->getShadingMode eq 'absent'
&& $shutters->getRoommatesStatus eq 'none'
)
{
ShadingProcessingDriveCommand( $hash, $shuttersDev );
}
elsif ( $shutters->getShadingMode eq 'home'
&& $shutters->getIsDay
&& $shutters->getIfInShading
&& $shutters->getStatus == $shutters->getShadingPos
&& $shutters->getRoommatesStatus eq 'none'
&& !(
CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $shutters->getShuttersPlace eq 'terrace'
)
&& !$shutters->getSelfDefenseState
)
{
$shutters->setLastDrive('shading out');
$shutters->setDriveCmd( $shutters->getLastPos );
}
elsif (( $getModeDown eq 'absent' || $getModeDown eq 'always' ) elsif (( $getModeDown eq 'absent' || $getModeDown eq 'always' )
&& !$shutters->getIsDay && !$shutters->getIsDay
&& IsAfterShuttersTimeBlocking($shuttersDev) && IsAfterShuttersTimeBlocking($shuttersDev)
@ -1640,8 +1669,7 @@ sub EventProcessingResidents {
&& !$shutters->getSelfDefenseState && !$shutters->getSelfDefenseState
) )
{ {
$shutters->setLastDrive('shading in'); ShadingProcessingDriveCommand( $hash, $shuttersDev );
$shutters->setDriveCmd( $shutters->getShadingPos );
} }
elsif ( elsif (
$shutters->getShadingMode eq 'absent' $shutters->getShadingMode eq 'absent'