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

add more condition for shadingManualDriveStatus

Browse Source
This commit is contained in:
Marko Oldenburg
2019-07-01 19:32:49 +02:00
parent 8596983126
commit 7d3a572825
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
73_AutoShuttersControl.pm
View File

@@ -1112,6 +1112,7 @@ sub EventProcessingRoommate($@) {
); );
if ( $shutters->getIfInShading if ( $shutters->getIfInShading
and not $shutters->getShadingManualDriveStatus
and $shutters->getStatus != $shutters->getShadingPos ) and $shutters->getStatus != $shutters->getShadingPos )
{ {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
@@ -1162,6 +1163,7 @@ sub EventProcessingRoommate($@) {
) )
{ {
if ( $shutters->getIfInShading if ( $shutters->getIfInShading
and not $shutters->getShadingManualDriveStatus
and $shutters->getStatus == $shutters->getOpenPos ) and $shutters->getStatus == $shutters->getOpenPos )
{ {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
@@ -1345,6 +1347,7 @@ sub EventProcessingResidents($@) {
and $shutters->getIfInShading and $shutters->getIfInShading
and $shutters->getRoommatesStatus eq 'none' and $shutters->getRoommatesStatus eq 'none'
and $shutters->getStatus != $shutters->getShadingPos and $shutters->getStatus != $shutters->getShadingPos
and not $shutters->getShadingManualDriveStatus
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
) )
@@ -1358,6 +1361,7 @@ sub EventProcessingResidents($@) {
and $shutters->getIfInShading and $shutters->getIfInShading
and $shutters->getStatus == $shutters->getShadingPos and $shutters->getStatus == $shutters->getShadingPos
and $shutters->getRoommatesStatus eq 'none' and $shutters->getRoommatesStatus eq 'none'
and not $shutters->getShadingManualDriveStatus
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' ) and $shutters->getShuttersPlace eq 'terrace' )
) )
@@ -6487,7 +6491,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.30", "x_developmentversion": "v0.6.19.31",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],