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

remove winrec check then privacy drive down

Browse Source
This commit is contained in:
Marko Oldenburg 2019-08-22 06:19:31 +02:00
parent 75437ab202
commit a158862210
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
73_AutoShuttersControl.pm
View File

@ -1061,10 +1061,10 @@ sub EventProcessingRoommate($@) {
"AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events" "AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events"
); );
my $getModeUp = $shutters->getModeUp; my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown; my $getModeDown = $shutters->getModeDown;
my $getRoommatesStatus = $shutters->getRoommatesStatus; my $getRoommatesStatus = $shutters->getRoommatesStatus;
my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus; my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus;
my $posValue; my $posValue;
if ( if (
@ -1207,7 +1207,8 @@ sub EventProcessingRoommate($@) {
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( $1 eq 'absent' elsif (
$1 eq 'absent'
and ( not $shutters->getIsDay and ( not $shutters->getIsDay
or $shutters->getShadingMode eq 'absent' ) or $shutters->getShadingMode eq 'absent' )
) )
@ -1382,8 +1383,8 @@ sub EventProcessingResidents($@) {
and not $shutters->getSelfDefenseAbsent and not $shutters->getSelfDefenseAbsent
and $shutters->getSelfDefenseAbsentTimerrun ); and $shutters->getSelfDefenseAbsentTimerrun );
if ( $shutters->getStatus == $shutters->getClosedPos if ( $shutters->getStatus == $shutters->getClosedPos
and $shutters->getIsDay ) and $shutters->getIsDay )
{ {
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
if ( if (
@ -2601,12 +2602,14 @@ sub SunSetShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeDown eq 'always' or $shutters->getModeDown eq 'always'
) )
and ( $ascDev->getSelfDefense eq 'off' and (
or $shutters->getSelfDefenseExclude eq 'on' $ascDev->getSelfDefense eq 'off'
or ($ascDev->getSelfDefense eq 'on' or $shutters->getSelfDefenseExclude eq 'on'
and ($ascDev->getResidentsStatus ne 'absent' or (
or $ascDev->getResidentsStatus ne 'gone') $ascDev->getSelfDefense eq 'on'
) and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' )
)
) )
) )
{ {
@ -2614,13 +2617,8 @@ sub SunSetShuttersAfterTimerFn($) {
if ( $shutters->getPrivacyDownStatus == 1 ) { if ( $shutters->getPrivacyDownStatus == 1 ) {
$shutters->setPrivacyDownStatus(2); $shutters->setPrivacyDownStatus(2);
$shutters->setLastDrive('privacy position'); $shutters->setLastDrive('privacy position');
ShuttersCommandSet( ShuttersCommandSet( $hash, $shuttersDev,
$hash, $shutters->getPrivacyDownPos );
$shuttersDev,
PositionValueWindowRec(
$shuttersDev, $shutters->getPrivacyDownPos
)
);
} }
else { else {
$shutters->setPrivacyDownStatus(0); $shutters->setPrivacyDownStatus(0);
@ -2655,12 +2653,12 @@ sub SunRiseShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeUp eq 'always' or $shutters->getModeUp eq 'always'
) )
and ( $ascDev->getSelfDefense eq 'off' and (
or $shutters->getSelfDefenseExclude eq 'on' $ascDev->getSelfDefense eq 'off'
or ($ascDev->getSelfDefense eq 'on' or $shutters->getSelfDefenseExclude eq 'on'
and $ascDev->getResidentsStatus ne 'absent' or ( $ascDev->getSelfDefense eq 'on'
and $ascDev->getResidentsStatus ne 'gone' and $ascDev->getResidentsStatus ne 'absent'
) and $ascDev->getResidentsStatus ne 'gone' )
) )
) )
{ {
@ -2677,11 +2675,12 @@ sub SunRiseShuttersAfterTimerFn($) {
$ascDev->getSelfDefense eq 'off' $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
or ( $ascDev->getSelfDefense eq 'on' or (
$ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0 and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
and ( $ascDev->getResidentsStatus ne 'absent' and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' ) or $ascDev->getResidentsStatus ne 'gone' )
) )
) )
) )
{ {
@ -6514,7 +6513,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.28", "version": "v0.6.29",
"x_developmentversion": "v0.6.19.34", "x_developmentversion": "v0.6.19.34",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"