change code to condition in ResidentsFn for absent

This commit is contained in:
Marko Oldenburg
2019-09-16 13:57:08 +02:00
parent cc16dcf0c5
commit cdb35a98f7

View File

@ -1290,10 +1290,15 @@ sub EventProcessingResidents($@) {
) )
{ {
if ( if (
$shutters->getSelfDefenseMode eq 'absent' $ascDev->getSelfDefense eq 'on'
or (CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and $shutters->getSelfDefenseExclude eq 'off'
and $shutters->getShuttersPlace eq 'terrace') and ( $shutters->getSelfDefenseMode eq 'absent'
) or ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getSelfDefenseMode eq 'gone'
and $shutters->getShuttersPlace eq 'terrace'
)
)
)
{ {
$shutters->setLastDrive('selfDefense active'); $shutters->setLastDrive('selfDefense active');
$shutters->setSelfDefenseAbsent( 0, 1 $shutters->setSelfDefenseAbsent( 0, 1