fix shading in drive after blocking time

This commit is contained in:
Marko Oldenburg 2020-05-21 08:12:13 +02:00
parent 15b186b4c7
commit a61adbef0c

View File

@ -2456,6 +2456,8 @@ sub ShadingProcessing {
if ( if (
IsAfterShuttersTimeBlocking($shuttersDev) IsAfterShuttersTimeBlocking($shuttersDev)
&& !$shutters->getShadingManualDriveStatus && !$shutters->getShadingManualDriveStatus
&& $shutters->getRoommatesStatus ne 'gotosleep'
&& $shutters->getRoommatesStatus ne 'asleep'
&& ( && (
( (
$shutters->getShadingStatus eq 'out' $shutters->getShadingStatus eq 'out'
@ -2464,9 +2466,21 @@ sub ShadingProcessing {
|| ( $shutters->getShadingStatus eq 'in' || ( $shutters->getShadingStatus eq 'in'
&& $shutters->getShadingLastStatus eq 'out' ) && $shutters->getShadingLastStatus eq 'out' )
) )
&& $shutters->getRoommatesStatus ne 'asleep' && ( $shutters->getShadingMode eq 'always'
&& $shutters->getRoommatesStatus ne 'gotosleep' || $shutters->getShadingMode eq $homemode )
&& ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2 && (
$shutters->getModeUp eq 'always'
|| $shutters->getModeUp eq $homemode
|| ( $shutters->getModeUp eq 'home'
&& $homemode ne 'asleep' )
|| $shutters->getModeUp eq 'off'
)
&& (
( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2
|| ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos )
&& $shutters->getIfInShading
&& $shutters->getStatus != $shutters->getShadingPos )
)
); );
return; return;
@ -8419,7 +8433,7 @@ sub getBlockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.29", "version": "v0.8.30",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],