fix bug then privacyDownPos and night drive with window open
This commit is contained in:
parent
ce5fb58b34
commit
20191f4565
@ -1142,9 +1142,14 @@ sub EventProcessingWindowRec {
|
|||||||
if (
|
if (
|
||||||
$match =~ m{[Cc]lose|true}xms
|
$match =~ m{[Cc]lose|true}xms
|
||||||
&& IsAfterShuttersTimeBlocking($shuttersDev)
|
&& IsAfterShuttersTimeBlocking($shuttersDev)
|
||||||
&& ( $shutters->getStatus == $shutters->getVentilatePos
|
&& (
|
||||||
|
$shutters->getStatus == $shutters->getVentilatePos
|
||||||
|| $shutters->getStatus == $shutters->getComfortOpenPos
|
|| $shutters->getStatus == $shutters->getComfortOpenPos
|
||||||
|| $shutters->getStatus == $shutters->getOpenPos )
|
|| $shutters->getStatus == $shutters->getOpenPos
|
||||||
|
|| ( $shutters->getStatus == $shutters->getPrivacyDownPos
|
||||||
|
&& $shutters->getPrivacyDownStatus == 0
|
||||||
|
&& !$shutters->getIsDay )
|
||||||
|
)
|
||||||
&& ( $shutters->getVentilateOpen eq 'on'
|
&& ( $shutters->getVentilateOpen eq 'on'
|
||||||
|| $ascDev->getAutoShuttersControlComfort eq 'on' )
|
|| $ascDev->getAutoShuttersControlComfort eq 'on' )
|
||||||
)
|
)
|
||||||
@ -2581,11 +2586,13 @@ sub ShadingProcessing {
|
|||||||
)
|
)
|
||||||
&& ( $shutters->getShadingMode eq 'always'
|
&& ( $shutters->getShadingMode eq 'always'
|
||||||
|| $shutters->getShadingMode eq $homemode )
|
|| $shutters->getShadingMode eq $homemode )
|
||||||
&& ( $shutters->getModeUp eq 'always'
|
&& (
|
||||||
|
$shutters->getModeUp eq 'always'
|
||||||
|| $shutters->getModeUp eq $homemode
|
|| $shutters->getModeUp eq $homemode
|
||||||
|| ( $shutters->getModeUp eq 'home'
|
|| ( $shutters->getModeUp eq 'home'
|
||||||
&& $homemode ne 'asleep' )
|
&& $homemode ne 'asleep' )
|
||||||
|| $shutters->getModeUp eq 'off' )
|
|| $shutters->getModeUp eq 'off'
|
||||||
|
)
|
||||||
&& (
|
&& (
|
||||||
( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2
|
( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2
|
||||||
|| ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos )
|
|| ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user