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

add condition to shading out drive

Browse Source
This commit is contained in:
Marko Oldenburg 2019-06-27 15:14:56 +02:00
parent cca397c338
commit 88175a7699
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
73_AutoShuttersControl.pm
View File

@ -1283,6 +1283,7 @@ sub EventProcessingResidents($@) {
) )
and not $shutters->getIsDay and not $shutters->getIsDay
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and $shutters->getRoommatesStatus eq 'none'
) )
{ {
$shutters->setLastDrive('residents absent'); $shutters->setLastDrive('residents absent');
@ -1328,6 +1329,7 @@ sub EventProcessingResidents($@) {
and ( $getResidentsLastStatus ne 'asleep' and ( $getResidentsLastStatus ne 'asleep'
or $getResidentsLastStatus ne 'awoken' ) or $getResidentsLastStatus ne 'awoken' )
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and $shutters->getRoommatesStatus eq 'none'
) )
{ {
$shutters->setLastDrive('residents home'); $shutters->setLastDrive('residents home');
@ -1340,6 +1342,7 @@ sub EventProcessingResidents($@) {
) )
and $shutters->getIsDay and $shutters->getIsDay
and $shutters->getIfInShading and $shutters->getIfInShading
and $shutters->getRoommatesStatus eq 'none'
and $shutters->getStatus != $shutters->getShadingPos and $shutters->getStatus != $shutters->getShadingPos
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
@ -1353,6 +1356,7 @@ sub EventProcessingResidents($@) {
and $shutters->getIsDay and $shutters->getIsDay
and $shutters->getIfInShading and $shutters->getIfInShading
and $shutters->getStatus == $shutters->getShadingPos and $shutters->getStatus == $shutters->getShadingPos
and $shutters->getRoommatesStatus eq 'none'
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
) )
@ -1408,6 +1412,7 @@ sub EventProcessingResidents($@) {
and ( $getModeUp eq 'home' and ( $getModeUp eq 'home'
or $getModeUp eq 'always' ) or $getModeUp eq 'always' )
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and $shutters->getRoommatesStatus eq 'none'
and not $shutters->getIfInShading and not $shutters->getIfInShading
) )
{ {
@ -2157,7 +2162,7 @@ sub ShadingProcessingDriveCommand($$) {
and $getShadingPos != $getStatus ) and $getShadingPos != $getStatus )
{ {
if ( if (
not $shutters->getQueryShuttersPos( $shutters->getShadingPos ) not $shutters->getQueryShuttersPos($getShadingPos)
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
) )
@ -2178,17 +2183,16 @@ sub ShadingProcessingDriveCommand($$) {
and $getShadingPos == $getStatus ) and $getShadingPos == $getStatus )
{ {
$shutters->setLastDrive('shading out'); $shutters->setLastDrive('shading out');
ShuttersCommandSet( ShuttersCommandSet(
$hash, $hash,
$shuttersDev, $shuttersDev,
( (
$shutters->getShadingPos == $shutters->getLastPos $getShadingPos == $shutters->getLastPos
? $shutters->getOpenPos ? $shutters->getOpenPos
: ( : ( $shutters->getQueryShuttersPos( $shutters->getLastPos )
not $shutters->getQueryShuttersPos( ? $shutters->getLastPos
$shutters->getLastPos : $shutters->getOpenPos )
) ? $shutters->getLastPos : $shutters->getOpenPos
)
) )
); );
@ -6443,7 +6447,7 @@ sub getblockAscDrivesAfterManual {
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.19", "version": "v0.6.19",
"x_developmentversion": "v0.6.19.24", "x_developmentversion": "v0.6.19.25",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],