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

Fix little Bugs in Shading and Window open with shading state

Browse Source
This commit is contained in:
Marko Oldenburg
2020-04-11 15:53:21 +02:00
parent 6fa8fa8817
commit 18b6286cbc
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
73_AutoShuttersControl.pm
View File

@ -1117,8 +1117,11 @@ sub EventProcessingWindowRec {
$shutters->setNoDelay(1); $shutters->setNoDelay(1);
$shutters->setDriveCmd( $shutters->getShadingPos ); $shutters->setDriveCmd( $shutters->getShadingPos );
} }
elsif ($shutters->getStatus != $shutters->getOpenPos elsif (
!$shutters->getIfInShading
&& ( $shutters->getStatus != $shutters->getOpenPos
|| $shutters->getStatus != $shutters->getLastManPos ) || $shutters->getStatus != $shutters->getLastManPos )
)
{ {
if ( $shutters->getPrivacyDownStatus == 2 ) { if ( $shutters->getPrivacyDownStatus == 2 ) {
$shutters->setLastDrive( $shutters->setLastDrive(
@ -2463,6 +2466,7 @@ sub ShadingProcessing {
&& $shutters->getShadingLastStatus eq 'out' ) && $shutters->getShadingLastStatus eq 'out' )
) )
&& $shutters->getRoommatesStatus ne 'asleep' && $shutters->getRoommatesStatus ne 'asleep'
&& $shutters->getRoommatesStatus ne 'gotosleep'
); );
return; return;
@ -2486,14 +2490,11 @@ sub ShadingProcessingDriveCommand {
{ {
$shutters->setShadingStatus( $shutters->getShadingStatus ); $shutters->setShadingStatus( $shutters->getShadingStatus );
if ( $shutters->getShadingStatus eq 'in'
&& $getShadingPos != $getStatus )
{
if ( if (
!( $shutters->getShadingStatus eq 'in'
CheckIfShuttersWindowRecOpen($shuttersDev) == 2 && $getShadingPos != $getStatus
&& $shutters->getShuttersPlace eq 'terrace' && ( CheckIfShuttersWindowRecOpen($shuttersDev) != 2
) || $shutters->getShuttersPlace ne 'terrace' )
) )
{ {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
@ -2507,7 +2508,6 @@ sub ShadingProcessingDriveCommand {
. $getShadingPos . $getShadingPos
. ' zum Beschatten gefahren' ); . ' zum Beschatten gefahren' );
} }
}
elsif ($shutters->getShadingStatus eq 'out' elsif ($shutters->getShadingStatus eq 'out'
&& $getShadingPos == $getStatus ) && $getShadingPos == $getStatus )
{ {
@ -2776,14 +2776,12 @@ sub ShuttersCommandSet {
if ( if (
( (
$posValue == $shutters->getShadingPos $posValue == $shutters->getShadingPos
&& ( && CheckIfShuttersWindowRecOpen($shuttersDev) == 2
CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $shutters->getShuttersPlace eq 'terrace' && $shutters->getShuttersPlace eq 'terrace'
&& ( $shutters->getLockOut eq 'soft' && ( $shutters->getLockOut eq 'soft'
|| $shutters->getLockOut eq 'hard' ) || $shutters->getLockOut eq 'hard' )
&& !$shutters->getQueryShuttersPos($posValue) && !$shutters->getQueryShuttersPos($posValue)
) )
)
|| ( || (
$posValue != $shutters->getShadingPos $posValue != $shutters->getShadingPos
&& ( && (