Fix little Bugs in Shading and Window open with shading state
This commit is contained in:
parent
6fa8fa8817
commit
18b6286cbc
@ -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->getStatus != $shutters->getLastManPos )
|
!$shutters->getIfInShading
|
||||||
|
&& ( $shutters->getStatus != $shutters->getOpenPos
|
||||||
|
|| $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,27 +2490,23 @@ sub ShadingProcessingDriveCommand {
|
|||||||
{
|
{
|
||||||
$shutters->setShadingStatus( $shutters->getShadingStatus );
|
$shutters->setShadingStatus( $shutters->getShadingStatus );
|
||||||
|
|
||||||
if ( $shutters->getShadingStatus eq 'in'
|
if (
|
||||||
&& $getShadingPos != $getStatus )
|
$shutters->getShadingStatus eq 'in'
|
||||||
|
&& $getShadingPos != $getStatus
|
||||||
|
&& ( CheckIfShuttersWindowRecOpen($shuttersDev) != 2
|
||||||
|
|| $shutters->getShuttersPlace ne 'terrace' )
|
||||||
|
)
|
||||||
{
|
{
|
||||||
if (
|
$shutters->setLastDrive('shading in');
|
||||||
!(
|
ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos );
|
||||||
CheckIfShuttersWindowRecOpen($shuttersDev) == 2
|
|
||||||
&& $shutters->getShuttersPlace eq 'terrace'
|
|
||||||
)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
$shutters->setLastDrive('shading in');
|
|
||||||
ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos );
|
|
||||||
|
|
||||||
ASC_Debug( 'ShadingProcessingDriveCommand: '
|
ASC_Debug( 'ShadingProcessingDriveCommand: '
|
||||||
. $shutters->getShuttersDev
|
. $shutters->getShuttersDev
|
||||||
. ' - Der aktuelle Beschattungsstatus ist: '
|
. ' - Der aktuelle Beschattungsstatus ist: '
|
||||||
. $shutters->getShadingStatus
|
. $shutters->getShadingStatus
|
||||||
. ' und somit wird nun in die Position: '
|
. ' und somit wird nun in die Position: '
|
||||||
. $getShadingPos
|
. $getShadingPos
|
||||||
. ' zum Beschatten gefahren' );
|
. ' zum Beschatten gefahren' );
|
||||||
}
|
|
||||||
}
|
}
|
||||||
elsif ($shutters->getShadingStatus eq 'out'
|
elsif ($shutters->getShadingStatus eq 'out'
|
||||||
&& $getShadingPos == $getStatus )
|
&& $getShadingPos == $getStatus )
|
||||||
@ -2775,14 +2775,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
|
||||||
|
Loading…
Reference in New Issue
Block a user