add logic for window open in provacy mode

This commit is contained in:
Marko Oldenburg 2019-11-01 11:18:53 +01:00
parent 2b5bc24fd2
commit ce32256130

View File

@ -1022,17 +1022,26 @@ sub EventProcessingWindowRec($@) {
elsif ($shutters->getStatus != $shutters->getOpenPos elsif ($shutters->getStatus != $shutters->getOpenPos
or $shutters->getStatus != $shutters->getLastManPos ) or $shutters->getStatus != $shutters->getLastManPos )
{ {
if ( $shutters->getPrivacyUpStatus == 2 ) {
$shutters->setLastDrive(
'window closed at privacy day open');
$shutters->setNoDelay(1);
$shutters->setDriveCmd( $shutters->getPrivacyUpPos );
}
else {
$shutters->setLastDrive('window closed at day'); $shutters->setLastDrive('window closed at day');
$shutters->setNoDelay(1); $shutters->setNoDelay(1);
$shutters->setDriveCmd( $shutters->setDriveCmd(
( (
$shutters->getVentilatePosAfterDayClosed eq 'open' $shutters->getVentilatePosAfterDayClosed eq
'open'
? $shutters->getOpenPos ? $shutters->getOpenPos
: $shutters->getLastManPos : $shutters->getLastManPos
) )
); );
} }
} }
}
elsif ( elsif (
$shutters->getModeUp ne 'absent' $shutters->getModeUp ne 'absent'
and $shutters->getModeUp ne 'off' and $shutters->getModeUp ne 'off'
@ -1044,6 +1053,13 @@ sub EventProcessingWindowRec($@) {
and $ascDev->getAutoShuttersControlEvening eq 'on' and $ascDev->getAutoShuttersControlEvening eq 'on'
) )
{ {
if ( $shutters->getPrivacyDownStatus == 2 ) {
$shutters->setLastDrive(
'window closed at privacy night close');
$shutters->setNoDelay(1);
$shutters->setDriveCmd( $shutters->getPrivacyDownPos );
}
else {
$shutters->setLastDrive('window closed at night'); $shutters->setLastDrive('window closed at night');
$shutters->setNoDelay(1); $shutters->setNoDelay(1);
$shutters->setDriveCmd( $shutters->setDriveCmd(
@ -1055,6 +1071,7 @@ sub EventProcessingWindowRec($@) {
); );
} }
} }
}
elsif ( elsif (
( (
$match =~ /tilt/ $match =~ /tilt/
@ -7402,7 +7419,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.138", "version": "v0.6.139",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],