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

add logic for window open in provacy mode

Browse Source
This commit is contained in:
Marko Oldenburg 2019-11-01 11:18:53 +01:00
parent 2b5bc24fd2
commit ce32256130
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
73_AutoShuttersControl.pm
View File

@ -1022,15 +1022,24 @@ sub EventProcessingWindowRec($@) {
elsif ($shutters->getStatus != $shutters->getOpenPos elsif ($shutters->getStatus != $shutters->getOpenPos
or $shutters->getStatus != $shutters->getLastManPos ) or $shutters->getStatus != $shutters->getLastManPos )
{ {
$shutters->setLastDrive('window closed at day'); if ( $shutters->getPrivacyUpStatus == 2 ) {
$shutters->setNoDelay(1); $shutters->setLastDrive(
$shutters->setDriveCmd( 'window closed at privacy day open');
( $shutters->setNoDelay(1);
$shutters->getVentilatePosAfterDayClosed eq 'open' $shutters->setDriveCmd( $shutters->getPrivacyUpPos );
? $shutters->getOpenPos }
: $shutters->getLastManPos else {
) $shutters->setLastDrive('window closed at day');
); $shutters->setNoDelay(1);
$shutters->setDriveCmd(
(
$shutters->getVentilatePosAfterDayClosed eq
'open'
? $shutters->getOpenPos
: $shutters->getLastManPos
)
);
}
} }
} }
elsif ( elsif (
@ -1044,15 +1053,23 @@ sub EventProcessingWindowRec($@) {
and $ascDev->getAutoShuttersControlEvening eq 'on' and $ascDev->getAutoShuttersControlEvening eq 'on'
) )
{ {
$shutters->setLastDrive('window closed at night'); if ( $shutters->getPrivacyDownStatus == 2 ) {
$shutters->setNoDelay(1); $shutters->setLastDrive(
$shutters->setDriveCmd( 'window closed at privacy night close');
( $shutters->setNoDelay(1);
$shutters->getSleepPos > 0 $shutters->setDriveCmd( $shutters->getPrivacyDownPos );
? $shutters->getSleepPos }
: $shutters->getClosedPos else {
) $shutters->setLastDrive('window closed at night');
); $shutters->setNoDelay(1);
$shutters->setDriveCmd(
(
$shutters->getSleepPos > 0
? $shutters->getSleepPos
: $shutters->getClosedPos
)
);
}
} }
} }
elsif ( elsif (
@ -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>"
], ],